From: Tom Hughes <tom@compton.nu>
Date: Wed, 4 Dec 2024 18:53:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5378'
X-Git-Tag: live~19
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/12998355a370c5af1302b271a994d27d40b7e731?hp=88d80018b52a4b815b5e140c3cd1dd9326567bae

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

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 998dd248d..4311ba082 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -56,7 +56,8 @@
             </li>
           <% end %>
           <li class="nav-item">
-            <%= link_to t(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
+            <%= link_to t(".traces_from_html", :user => tag.span(@target_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+                        { :controller => "traces", :action => "index", :display_name => @target_user.display_name }, { :class => "nav-link active" } %>
           </li>
         <% end %>
       </ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b190c2ca0..986a30db9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2544,7 +2544,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"