Merge branch 'release/15.2' into dev

Eric-Guo · Feb 1, 2025 · 70acee7 · 70acee7
2 parents 93ccb0c + f033ef9
commit 70acee7
Show file tree

Hide file tree

Showing 84 changed files with 148 additions and 213 deletions.
diff --git a/app/components/attribute_help_texts/index_page_header_component.rb b/app/components/attribute_help_texts/index_page_header_component.rb
@@ -39,9 +39,11 @@ def initialize(tabs: nil)
   end
 
   def breadcrumb_items
-    [{ href: admin_index_path, text: t("label_administration") },
-     I18n.t("menus.breadcrumb.nested_element", section_header: t(:"attribute_help_texts.label_plural"),
-                                               title: I18n.t(currently_selected_tab[:label].to_s)).html_safe]
+    [
+      { href: admin_index_path, text: t("label_administration") },
+      helpers.nested_breadcrumb_element(t(:"attribute_help_texts.label_plural"),
+                                        I18n.t(currently_selected_tab[:label].to_s))
+    ]
   end
 
   def currently_selected_tab

diff --git a/app/components/custom_fields/index_page_header_component.rb b/app/components/custom_fields/index_page_header_component.rb
@@ -39,9 +39,11 @@ def initialize(tabs: nil)
   end
 
   def breadcrumb_items
-    [{ href: admin_index_path, text: t("label_administration") },
-     I18n.t("menus.breadcrumb.nested_element", section_header: t(:label_custom_field_plural),
-                                               title: I18n.t(currently_selected_tab[:label].to_s)).html_safe]
+    [
+      { href: admin_index_path, text: t("label_administration") },
+      helpers.nested_breadcrumb_element(t(:label_custom_field_plural),
+                                        I18n.t(currently_selected_tab[:label].to_s))
+    ]
   end
 
   def currently_selected_tab

diff --git a/app/components/members/index_page_header_component.rb b/app/components/members/index_page_header_component.rb
@@ -63,7 +63,7 @@ def current_breadcrumb_element
 
     if @query && query_name
       if menu_header.present?
-        I18n.t("menus.breadcrumb.nested_element", section_header: menu_header, title: query_name).html_safe
+        helpers.nested_breadcrumb_element(menu_header, query_name)
       else
         query_name
       end

diff --git a/app/components/notifications/index_page_header_component.rb b/app/components/notifications/index_page_header_component.rb
@@ -53,7 +53,7 @@ def breadcrumb_items
 
     def current_breadcrumb_element
       if current_section && current_section.header.present?
-        I18n.t("menus.breadcrumb.nested_element", section_header: current_section.header, title: page_title).html_safe
+        helpers.nested_breadcrumb_element(current_section.header, page_title)
       else
         page_title
       end

diff --git a/app/components/projects/index_page_header_component.rb b/app/components/projects/index_page_header_component.rb
@@ -122,7 +122,7 @@ def current_breadcrumb_element
     return page_title if query.name.blank?
 
     if current_section && current_section.header.present?
-      I18n.t("menus.breadcrumb.nested_element", section_header: current_section.header, title: query.name).html_safe
+      helpers.nested_breadcrumb_element(current_section.header, query.name)
     else
       page_title
     end

diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
@@ -41,6 +41,14 @@ def full_breadcrumbs
     end
   end
 
+  def nested_breadcrumb_element(section_header, title)
+    output = "".html_safe
+    output << "#{section_header}: "
+    output << content_tag(:strong, title)
+
+    output
+  end
+
   def breadcrumb_paths(*args)
     if args.empty?
       @breadcrumb_paths ||= [default_breadcrumb]

diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb
@@ -32,10 +32,14 @@ See COPYRIGHT and LICENSE files for more details.
 <%=
   render(Primer::OpenProject::PageHeader.new) do |header|
     header.with_title { h @enumeration.name }
-    header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
-                             { href: enumerations_path, text: t(:label_enumerations) },
-                             I18n.t("menus.breadcrumb.nested_element", section_header: t(@enumeration.option_name), title: h(@enumeration.name)).html_safe],
-                            selected_item_font_weight: :normal)
+    header.with_breadcrumbs(
+      [
+        { href: admin_index_path, text: t(:label_administration) },
+        { href: enumerations_path, text: t(:label_enumerations) },
+        nested_breadcrumb_element(t(@enumeration.option_name), @enumeration.name)
+      ],
+      selected_item_font_weight: :normal
+    )
   end
 %>
 

diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb
@@ -32,10 +32,13 @@ See COPYRIGHT and LICENSE files for more details.
 <%=
   render(Primer::OpenProject::PageHeader.new) do |header|
     header.with_title { t(:label_enumeration_new) }
-    header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
-                             { href: enumerations_path, text: t(:label_enumerations) },
-                             I18n.t("menus.breadcrumb.nested_element", section_header: t(@enumeration.option_name), title: t(:label_enumeration_new)).html_safe],
-                            selected_item_font_weight: :normal)
+    header.with_breadcrumbs(
+      [{ href: admin_index_path, text: t(:label_administration) },
+       { href: enumerations_path, text: t(:label_enumerations) },
+       nested_breadcrumb_element(t(@enumeration.option_name), t(:label_enumeration_new))
+      ],
+      selected_item_font_weight: :normal
+    )
   end
 %>
 

diff --git a/config/locales/crowdin/af.yml b/config/locales/crowdin/af.yml
@@ -2108,8 +2108,6 @@ af:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml
@@ -2260,8 +2260,6 @@ ar:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/az.yml b/config/locales/crowdin/az.yml
@@ -2108,8 +2108,6 @@ az:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/be.yml b/config/locales/crowdin/be.yml
@@ -2184,8 +2184,6 @@ be:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml
@@ -2108,8 +2108,6 @@ bg:
       api_and_webhooks: "API и уеб куки"
     quick_add:
       label: "Отворете менюто за бързо добавяне"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml
@@ -2105,8 +2105,6 @@ ca:
       api_and_webhooks: "API i webhooks"
     quick_add:
       label: "Obre el menú d'afegir ràpidament"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ckb-IR.yml b/config/locales/crowdin/ckb-IR.yml
@@ -2108,8 +2108,6 @@ ckb-IR:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml
@@ -2184,8 +2184,6 @@ cs:
       api_and_webhooks: "API & Webhooky"
     quick_add:
       label: "Otevřít nabídku rychlého přidání"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml
@@ -2106,8 +2106,6 @@ da:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Åbn hurtig-tilføj menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
@@ -2101,8 +2101,6 @@ de:
       api_and_webhooks: "API und Webhooks"
     quick_add:
       label: "Schnellmenue öffnen"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml
@@ -2104,8 +2104,6 @@ el:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Άνοιγμα μενού γρήγορης προσθήκης"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/eo.yml b/config/locales/crowdin/eo.yml
@@ -2108,8 +2108,6 @@ eo:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml
@@ -2105,8 +2105,6 @@ es:
       api_and_webhooks: "API y webhooks"
     quick_add:
       label: "Abrir menú de adición rápida"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/et.yml b/config/locales/crowdin/et.yml
@@ -2108,8 +2108,6 @@ et:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/eu.yml b/config/locales/crowdin/eu.yml
@@ -2108,8 +2108,6 @@ eu:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/fa.yml b/config/locales/crowdin/fa.yml
@@ -2108,8 +2108,6 @@ fa:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml
@@ -2108,8 +2108,6 @@ fi:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml
@@ -2108,8 +2108,6 @@ fil:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml
@@ -2106,8 +2106,6 @@ fr:
       api_and_webhooks: "API et webhooks"
     quick_add:
       label: "Ouvrir le menu d'ajout rapide"
-    breadcrumb:
-      nested_element: "%{section_header} : <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/he.yml b/config/locales/crowdin/he.yml
@@ -2184,8 +2184,6 @@ he:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/hi.yml b/config/locales/crowdin/hi.yml
@@ -2106,8 +2106,6 @@ hi:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml
@@ -2146,8 +2146,6 @@ hr:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml
@@ -2106,8 +2106,6 @@ hu:
       api_and_webhooks: "API és webhookok"
     quick_add:
       label: "Gyorsmenü megnyitása"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml
@@ -2064,8 +2064,6 @@ id:
       api_and_webhooks: "API dan webhook"
     quick_add:
       label: "Buka cepat tambah menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml
@@ -2104,8 +2104,6 @@ it:
       api_and_webhooks: "API e webhooks"
     quick_add:
       label: "Apri menu di aggiunta rapida"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml
@@ -2066,8 +2066,6 @@ ja:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "クイック追加メニューを開く"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ka.yml b/config/locales/crowdin/ka.yml
@@ -2108,8 +2108,6 @@ ka:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/kk.yml b/config/locales/crowdin/kk.yml
@@ -2108,8 +2108,6 @@ kk:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml
@@ -2069,8 +2069,6 @@ ko:
       api_and_webhooks: "API 및 webhook"
     quick_add:
       label: "빠른 추가 메뉴 열기"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml
@@ -2181,8 +2181,6 @@ lt:
       api_and_webhooks: "API ir tinklo jungtys"
     quick_add:
       label: "Atidaryti greitą pridėjimo meniu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/lv.yml b/config/locales/crowdin/lv.yml
@@ -2146,8 +2146,6 @@ lv:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results:

diff --git a/config/locales/crowdin/mn.yml b/config/locales/crowdin/mn.yml
@@ -2108,8 +2108,6 @@ mn:
       api_and_webhooks: "API and webhooks"
     quick_add:
       label: "Open quick add menu"
-    breadcrumb:
-      nested_element: "%{section_header}: <b>%{title}</b>"
   my_account:
     access_tokens:
       no_results: