Merge branch 'dev' into chore/csp-strict-dynamic

opf · Feb 26, 2025 · 426a58f · 426a58f
2 parents e739238 + 3559ee8
commit 426a58f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/views/colors/_form.html.erb b/app/views/colors/_form.html.erb
@@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details.
     <%= f.text_field :name, required: true, container_class: "-slim" %>
   </div>
   <div class="form--field -required">
-    <label class="form--label"><%= t("activerecord.attributes.color.hexcode") %></label>
+    <label class="form--label"><%= Color.human_attribute_name(:hexcode) %></label>
     <span class="form--field-container">
       <span class="form--text-field-container -xslim">
         <%= text_field_tag "color_hexcode",

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -949,8 +949,6 @@ en:
         resource: "Resource"
       oauth_client:
         client: "Client ID"
-      planning_element_type_color:
-        hexcode: Hex code
       project:
         active_value:
           true: "unarchived"

diff --git a/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.html.erb b/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.html.erb
@@ -9,7 +9,9 @@
       ) do |form|
         flex_layout do |oauth_client_row|
           oauth_client_row.with_row(mb: 3) do
-            render(Primer::Beta::Text.new(font_weight: :bold)) { I18n.t("storages.file_storage_view.#{storage}_oauth") }
+            render(Primer::Beta::Text.new(font_weight: :bold)) do
+              I18n.t("storages.file_storage_view.#{storage}_oauth", default: t("storages.file_storage_view.storage_oauth"))
+            end
           end
 
           oauth_client_row.with_row(mb: 3) do

diff --git a/modules/storages/app/components/storages/admin/oauth_client_info_component.html.erb b/modules/storages/app/components/storages/admin/oauth_client_info_component.html.erb
@@ -5,7 +5,7 @@
         concat(
           render(
             Primer::Beta::Text.new(font_weight: :bold, mr: 1, test_selector: "storage-oauth-client-label")
-          ) { I18n.t("storages.file_storage_view.#{storage}_oauth") }
+          ) { I18n.t("storages.file_storage_view.#{storage}_oauth", default: t("storages.file_storage_view.storage_oauth")) }
         )
         concat(configuration_check_label_for(:storage_oauth_client_configured))
       end