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

[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 a4b8b264269e16835b6fcac9c0966137e9fde1f8..9eb6b5bfe55988f76d99e1487012cb9c3b619158 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -3,7 +3,7 @@
   #<%= common_details.version %>
 </h4>
 
   #<%= common_details.version %>
 </h4>
 

-<p class="font-italic">
+<p class="fst-italic">

   <% if common_details.changeset.tags["comment"].present? %>
     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
   <% if common_details.changeset.tags["comment"].present? %>
     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>


@@ -13,10 +13,10 @@
 
 <ul class="list-unstyled">
   <li>
 
 <ul class="list-unstyled">
   <li>

-    <%= 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) %>
+    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_ago_by_html",
+          :time_ago => tag.abbr(time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
+                                :title => l(common_details.timestamp)),
+          :user => changeset_user_link(common_details.changeset) %>

   </li>
   <li>
     <%= t "browse.in_changeset" %>
   </li>
   <li>
     <%= t "browse.in_changeset" %>