From 41b970f57fe2110bc1582c7ca71247a5c352a191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Wed, 26 Feb 2025 11:51:23 +0100
Subject: [PATCH 1/2] Fix en.yml key of colors

---
 app/views/colors/_form.html.erb | 2 +-
 config/locales/en.yml           | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/colors/_form.html.erb b/app/views/colors/_form.html.erb
index 4af7f1825b7e..e0196b43082b 100644
--- 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
index ef4b98853b37..61826319d7f7 100644
--- 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"

From a1fa97ce4f41f2c1a275431e428954b9975c7f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Wed, 26 Feb 2025 11:57:16 +0100
Subject: [PATCH 2/2] Fix storage keys

---
 .../storages/admin/forms/oauth_client_form_component.html.erb | 4 +++-
 .../storages/admin/oauth_client_info_component.html.erb       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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
index 9fd7cc5bbbe4..3015a9d2a8d8 100644
--- 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
index a68022e3f111..f09c51e2fb7d 100644
--- 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