Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...

[rails.git] / app / views / trace / list.html.erb

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index 1e89e963ddf7372b5afd9caae1da65bc4cdd77fe..376fc5511da3db8a0e6734c9e56a0a7130222c47 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -1,18 +1,18 @@
 <% content_for :heading do %>
   <h1><%= h(@title) %></h1>
   <ul class='secondary-actions clearfix'>
 <% content_for :heading do %>
   <h1><%= h(@title) %></h1>
   <ul class='secondary-actions clearfix'>

-    <li><%= t('trace.list.description') %></li>
+    <li><%= t('.description') %></li>

     <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
     <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
     <% if @tag %>
       <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
     <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
     <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
     <% if @tag %>
       <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>

-      <li><%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+      <li><%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>

     <% else %>
       <% if @display_name %>
         <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <%= unless_user(@target_user, :li) do %>
     <% else %>
       <% if @display_name %>
         <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <%= unless_user(@target_user, :li) do %>

-        <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+        <%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %>

       <% end %>
     <% end %>
   </ul>
       <% end %>
     <% end %>
   </ul>


@@ -39,7 +39,7 @@
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>

-  <h4><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></h4>
+  <h4><%= t '.empty_html', :upload_link => trace_create_path %></h4>

 <% end %>
 
 <%= render :partial => 'trace_optionals' %>
 <% end %>
 
 <%= render :partial => 'trace_optionals' %>