X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b62561cdb5162b76864408bd9be1d59720157859..7862c89a92a33077cea66c92c58214ba7bcf84ba:/app/views/trace/_trace.rhtml?ds=sidebyside

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index c335fd414..4e1733148 100644
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -2,28 +2,33 @@
   <% cl = cycle('table0', 'table1') %>
   <td class="<%= cl %>">
     <% 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>
+      <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 style="color:red">PENDING</span>
+      <span style="color:red"><%= t'trace.trace.pending' %></span>
     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
     <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
       <% if trace.inserted %> 
-      (<%= trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> points)
+        (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
       <% end %> 
-      ... <%= time_ago_in_words( trace.timestamp ) %>  ago</span>
-      <%= link_to 'more', {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => 'View Trace Details'} %> /
-      <%= link_to 'map', {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => 'View Map'} %> /
-      <%= link_to 'edit', {:controller => 'site', :action => 'edit', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => 'Edit Map'} %>
+      ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
+      <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
+      <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {: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')} %>
+      <% if trace.public? %>
+        <span style="color:green"><%= t'trace.trace.public' %></span>
+      <% else %>
+        <span style="color:red"><%= t'trace.trace.private' %></span>
+      <% end %>
       <br />
-      <%= escape_once(trace.description) %>
+      <%= h(trace.description) %>
     <br />
-    by <%= link_to trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
-    in 
-    <% if trace.tags %>
+    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <% if !trace.tags.empty? %>
+      <%= t'trace.trace.in' %> 
       <% trace.tags.each do |tag| %>
-        <%= link_to tag.tag, :tag => tag.tag %>
+        <%= link_to_tag tag.tag %>
       <% end %>
     <% end %>
   </td>