Merge remote-tracking branch 'upstream/pull/1851'

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

diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 0c7e448e86fb459e4ccaf6d0e22b8490993af9af..0847ddaf18743a50b3136cebc363cff2a63b95ed 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -5,25 +5,25 @@
       <% if trace.inserted %>
         <a href="<%= url_for :controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
       <% else %>
-        <span class="trace_pending"><%= t'trace.trace.pending' %></span>
+        <span class="trace_pending"><%= t '.pending' %></span>
       <% end %>
     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
-        (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
+        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
       <% end %>
-      ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
-      <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> /
-      <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
-      <span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
+      ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
+      <%= link_to_if trace.inserted?, t('.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('.view_map')} %> /
+      <%= link_to t('.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('.edit_map')} %>
+      <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
       <br />
       <%= trace.description %>
     <br />
-    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
     <% if !trace.tags.empty? %>
-      <%= t'trace.trace.in' %>
+      <%= t '.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% end %>
   </td>