Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}

[rails.git] / app / views / trace / view.rhtml

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml
index 60f71b7c7482eec5b0fb1c8cd2be5e8a7eaf2f9f..381a2fc973c2c7612c871f270e8e51e117d3e753 100644 (file)
--- a/app/views/trace/view.rhtml
+++ b/app/views/trace/view.rhtml
@@ -1,42 +1,46 @@
-<h2><%= @title %></h2>
+<h2><%= h(@title) %></h2>

 
 

-<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% if @trace.inserted %>
+    <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% else %>
+    <span style="color:red"><%= t'trace.view.pending' %></span>
+  <% end %>

 
 <table border="0">
   <tr>
 
 <table border="0">
   <tr>

-    <td>Filename:</td>
-    <td><%= @trace.name %> (<%= link_to 'download', :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
+    <td><%= t'trace.view.filename' %></td>
+    <td><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>

   </tr> 
   <tr>
   </tr> 
   <tr>

-    <td>Uploaded at:</td>
+    <td><%= t'trace.view.uploaded' %></td>

     <td><%= @trace.timestamp %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
     <td><%= @trace.timestamp %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>

-    <td>Points:</td>
+    <td><%= t'trace.view.points' %></td>

     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>

-    <td>Start coordinate:</td>
-    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>
+    <td><%= t'trace.view.start_coordinates' %></td>
+    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>

   </tr>
   <% end %>
   <tr>
   </tr>
   <% end %>
   <tr>

-    <td>Owner:</td>
-    <td><%= link_to @trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
+    <td><%= t'trace.view.owner' %></td>
+    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>

   </tr>
   <tr>
   </tr>
   <tr>

-    <td>Description:</td>
-    <td><%= @trace.description %></td>
+    <td><%= t'trace.view.description' %></td>
+    <td><%= h(@trace.description) %></td>

   </tr>
   <tr>
   </tr>
   <tr>

-    <td>Tags:</td>
+    <td><%= t'trace.view.tags' %></td>

     <td>
     <% if @trace.tags %>
       <% @trace.tags.each do |tag| %>
         <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
       <% end %>
     <% else %>
     <td>
     <% if @trace.tags %>
       <% @trace.tags.each do |tag| %>
         <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
       <% end %>
     <% else %>

-      None
+      <%= t'trace.view.none' %>

     <% end %>
     </td>
   </tr>
     <% end %>
     </td>
   </tr>


@@ -47,10 +51,13 @@
 <table>
   <tr>
     <% unless @trace.public? %>
 <table>
   <tr>
     <% unless @trace.public? %>

-    <td><%= button_to 'Make this track public permanently', :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
+    <td><%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
+    <% end %>
+    <% if @trace.user == @user %>
+    <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>

     <% end %>
     <% end %>

-    <% if @trace.user.id == @user.id %>
-    <td><%= button_to 'Delete this track', :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
+    <% if @trace.user == @user %>
+    <td><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %></td>

     <% end %>
   </tr>
 </table>
     <% end %>
   </tr>
 </table>