From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Dec 2024 15:00:45 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5366'
X-Git-Tag: live~529
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc70cae711fb6947233d6a750cb33f115aa7a01b?hp=c4988a69b4cd7b342d2828148eb20eca0d9a205f

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4bedf42b6..b179ec5ad 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -938,7 +938,11 @@ div.secondary-actions {
   max-width: 20em;
 }
 
-/* Rules for tabs inside secondary background sections */
+/* Rules for navigation tabs */
+
+.nav-tabs .username {
+  max-width: 20em;
+}
 
 .bg-body-secondary .nav-tabs {
   --bs-border-color: var(--bs-secondary-border-subtle);
diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index 061989586..0770e331f 100644
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -14,7 +14,7 @@
   <% on_user = @user || @user_block&.user %>
   <% if on_user != current_user && on_user&.blocks&.exists? %>
     <li class="nav-item">
-      <%= link_to t(".blocks_on_user", :user => on_user.display_name),
+      <%= link_to t(".blocks_on_user_html", :user => tag.span(on_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
                   user_blocks_on_path(on_user),
                   :class => ["nav-link", { :active => action_name == "blocks_on" }] %>
     </li>
@@ -29,7 +29,7 @@
   <% by_user = @user || @user_block&.creator %>
   <% if by_user != current_user && by_user&.blocks_created&.exists? %>
     <li class="nav-item">
-      <%= link_to t(".blocks_by_user", :user => by_user.display_name),
+      <%= link_to t(".blocks_by_user_html", :user => tag.span(by_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
                   user_blocks_by_path(by_user),
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2a92fbb63..b190c2ca0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2925,9 +2925,9 @@ en:
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
-      blocks_on_user: "Blocks on %{user}"
+      blocks_on_user_html: "Blocks on %{user}"
       blocks_by_me: "Blocks by Me"
-      blocks_by_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"
       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes: