From: Tom Hughes <tom@compton.nu>
Date: Wed, 4 Dec 2024 18:59:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5374'
X-Git-Tag: live~464
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0b97b6bc343d8428367e5fa91ef41e95386880f7?hp=6b55cce25c2ed58c6513ae7f3f5dd24518cb489e

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7ce804ced..fc90e0be7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
 
   def self.allow_thirdparty_images(**options)
     content_security_policy(options) do |policy|
-      policy.img_src("*")
+      policy.img_src("*", :data)
     end
   end
 
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 3511e7f63..fbb1f956c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2543,7 +2543,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"