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

[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 3f235959974cfec95fb86790657626318036459f..1c8f1c5da4293105c06200e2b29647b8395a7d05 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -7,12 +7,10 @@
 </h4>
 
 <div class="details">
 </h4>
 
 <div class="details">

-  <%=
-      t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
-        :time => distance_of_time_in_words_to_now(common_details.timestamp),
+  <%= 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),
         :user => changeset_user_link(common_details.changeset),

-        :title => l(common_details.timestamp)
-  %>
+        :title => l(common_details.timestamp) %>

 </div>
 
 <div class="details">
 </div>
 
 <div class="details">