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

[rails.git] / app / views / traces / _trace.html.erb

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index f72671e37adb9c6afb95be72e85b9a77922d8b5d..184570499dbca6228b01c1b6f031949d11f1de64 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -29,11 +29,13 @@
       </li>
     </ul>
     <p class="text-muted mb-0">
       </li>
     </ul>
     <p class="text-muted mb-0">

-      <%= friendly_date_ago(trace.timestamp) %>
-      <%= t ".by" %> <%= link_to trace.user.display_name, trace.user %>
-      <% if !trace.tags.empty? %>
-        <%= t ".in" %>
-        <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
+      <% if trace.tags.empty? %>
+        <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
+                                            :user => link_to(trace.user.display_name, trace.user) %>
+      <% else %>
+        <%= t ".details_with_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
+                                         :user => link_to(trace.user.display_name, trace.user),
+                                         :tags => safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>

       <% end %>
     </p>
     <p class="fst-italic mb-0">
       <% end %>
     </p>
     <p class="fst-italic mb-0">