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

[rails.git] / app / views / browse / _common_details.html.erb

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 593215f2953ed7a653b60c2e35f7bd10eb0045e1..683cf6d70ed46c9cf253a395a00ce0abd66f24df 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,32 +1,31 @@
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>
-    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
-    (no comment)
+    <%= t "browse.no_comment" %>
   <% end %>
 </h4>
 
 <div class="details">
-  <% if common_details.visible? %>
-    <%= t 'browse.common_details.edited' %>
-  <% else %>
-    <%= t 'browse.common_details.deleted' %>
-  <% end %>
-
-  <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
-
-  <% if common_details.changeset.user.data_public? %>
-    <%= t 'browse.common_details.by' %>
-    <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
-  <% end %>
+  <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+        :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'),
+        :user => changeset_user_link(common_details.changeset),
+        :title => l(common_details.timestamp) %>
 </div>
 
 <div class="details">
-  <%= t 'browse.common_details.version' %>
-  #<%= h(common_details.version) %>
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
   &middot;
-  <%= t 'browse.common_details.in_changeset' %>
+  <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 
+<% if @type == "node" and common_details.visible? %>
+<div class="details geo">
+  <%= t "browse.location" %>
+  <%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(common_details.lon), :class => "longitude"), root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
+</div>
+<% end %>
+
 <%= render :partial => "tag_details", :object => common_details.tags %>