Merge 15165:15373 from trunk.

[rails.git] / app / views / changeset / _changeset.rhtml

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index 67f3e72bb5a29c6f502af56246ba2ad42d51dff4..75b94b4eff2f38946a56d89826960eedc8defc20 100644 (file)
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -3,42 +3,53 @@
 
   <td class="<%= cl %>">
     #<%= changeset.id %>
+  </td>
 
-  <td class="<%= cl %>">
-    <% if changeset.closed_at > DateTime.now %> (still editing)
+  <td class="<%= cl %> date">
+    <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
     <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
+  </td>
 
     
-  <%if showusername==true %>  
-         <td class="<%= cl %>">
-         <% if changeset.user.data_public? %>
-               <%= link_to h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name %>
-         <% else %>
-               <i>annon</i>
-         <% end %>
+  <%if showusername %>  
+    <td class="<%= cl %> user">
+    <% if changeset.user.data_public? %>
+      <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
+    <% else %>
+      <i><%= t'changeset.changeset.anonymous' %></i>
+    <% end %>
+    </td>
   <% end %>
     
-  <td class="<%= cl %>">
+  <td class="<%= cl %> comment">
     <% if changeset.tags['comment'] %>
       <%= h(changeset.tags['comment']) %>
     <% else %>
-      (none)
+      <%= t'changeset.changeset.no_comment' %>
     <% end %>
+  </td>
 
-  <td class="<%= cl %>">
+  <td class="<%= cl %> area">
     <% if changeset.min_lat.nil? %>
-      (no edits)
+      <%= t'changeset.changeset.no_edits' %>
     <% else 
-      lat1 = changeset.min_lat/GeoRecord::SCALE.to_f
-      lat2 = changeset.max_lat/GeoRecord::SCALE.to_f
-      lon1 = changeset.min_lon/GeoRecord::SCALE.to_f
-      lon2 = changeset.max_lon/GeoRecord::SCALE.to_f
+      minlon = changeset.min_lon/GeoRecord::SCALE.to_f
+      minlat = changeset.min_lat/GeoRecord::SCALE.to_f
+      maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
+      maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
     %>
-      (<a href='/?lat=<%= lat1 %>&lon=<%= lon1 %>&zoom=14'><%= format("%0.3f",lat1) -%>,<%= format("%0.3f",lon1) -%></a>) to 
-      (<a href='/?lat=<%= lat2 %>&lon=<%= lon2 %>&zoom=14'><%= format("%0.3f",lat2) -%>,<%= format("%0.3f",lon2) -%></a>) 
-  <% end %>
+      <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.changset.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
+      <!--<%=changeset.area%>-->
+    <%   if changeset.area > 1500000000000 %>
+      <% t'changeset.changeset.big_area' %>
+    <%
+         end
+       end
+    %>
+  </td>
 
   <td class="<%= cl %>">
-    <%= link_to 'more', {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => 'View changeset details'} %> 
+    <%= link_to t('changeset.changeset.more'), {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')} %> 
+  </td>
 
 </tr>