From c3e162a6f3f24b3edf9600e4aca7a97c5668950d Mon Sep 17 00:00:00 2001
From: Tomasz Subik <tsubik@gmail.com>
Date: Mon, 23 Feb 2026 12:18:57 +0100
Subject: [PATCH 1/2] refactor locales names in translation file

---
 app/admin/custom_admin_header.rb |  6 +++---
 config/locales/en.yml            | 14 ++++++++++----
 config/locales/es.yml            | 14 ++++++++++----
 config/locales/fr.yml            | 14 ++++++++++----
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app/admin/custom_admin_header.rb b/app/admin/custom_admin_header.rb
index 8cb0bb13..2a699c75 100644
--- a/app/admin/custom_admin_header.rb
+++ b/app/admin/custom_admin_header.rb
@@ -140,9 +140,9 @@ def build(namespace, menu) # rubocop:disable Metrics/AbcSize
           li do
             text_node content_tag "a", t("active_admin.menu.language.language")
             ul do
-              li { link_to t("active_admin.menu.language.english"), admin_dashboard_change_language_path(locale: :en), method: :post }
-              li { link_to t("active_admin.menu.language.french"), admin_dashboard_change_language_path(locale: :fr), method: :post }
-              li { link_to t("active_admin.menu.language.spanish"), admin_dashboard_change_language_path(locale: :es), method: :post }
+              li { link_to t("locales.en"), admin_dashboard_change_language_path(locale: :en), method: :post }
+              li { link_to t("locales.fr"), admin_dashboard_change_language_path(locale: :fr), method: :post }
+              li { link_to t("locales.es"), admin_dashboard_change_language_path(locale: :es), method: :post }
             end
           end
         end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9f09b71a..dced0219 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,5 @@
 ---
 en:
-  locale_name: "English"
   attributes:
     name: Name
     description: Description
@@ -256,9 +255,6 @@ en:
           notification_groups: 'Notification groups'
       language:
         language: 'Language'
-        english: 'English'
-        french: 'French'
-        spanish: 'Spanish'
       logout: 'Logout'
     dashboard_page:
       columns:
@@ -1721,3 +1717,13 @@ en:
     types: 'observation-type'
     info: 'observation-info'
     attachments: 'observation-attachments'
+
+  locales:
+    en: 'English'
+    fr: 'French'
+    pt: 'Portuguese'
+    es: 'Spanish'
+    zh-CN: 'Chinese (Simplified)'
+    ja: 'Japanese'
+    ko: 'Korean'
+    vi: 'Vietnamese'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4a6c8429..b8e0362d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,5 +1,4 @@
 es:
-  locale_name: "Español"
   attributes:
     name: Nombre
     description: Descripción
@@ -270,9 +269,6 @@ es:
           notification_groups: 'Grupos de notificación'
       language:
         language: 'Idioma'
-        english: 'Inglés'
-        french: 'Francés'
-        spanish: 'Español'
       logout: 'Cerrar sesión'
     dashboard_page:
       columns:
@@ -1722,3 +1718,13 @@ es:
     types: 'tipo-de-observación'
     info: 'información-de-observación'
     attachments: 'archivos-adjuntos-de-observación'
+
+  locales:
+    en: 'Inglés'
+    fr: 'Francés'
+    pt: 'Portugués'
+    es: 'Español'
+    zh-CN: 'Chino (simplificado)'
+    ja: 'Japonés'
+    ko: 'Coreano'
+    vi: 'Vietnamita'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a75cd1ef..3b41c688 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,6 +1,5 @@
 ---
 fr:
-  locale_name: "Français"
   attributes:
     name: Nom
     description: Description
@@ -263,9 +262,6 @@ fr:
           notification_groups: 'Groupes de notifications'
       language:
         language: 'Langue'
-        english: 'Anglais'
-        french: 'Français'
-        spanish: 'Espagnol'
       logout: 'Se déconnecter'
     dashboard_page:
       columns:
@@ -1624,3 +1620,13 @@ fr:
     types: 'observation-type'
     info: 'observation-info'
     attachments: 'observation-attachments'
+
+  locales:
+    en: 'Anglais'
+    fr: 'Français'
+    pt: 'Portugais'
+    es: 'Espagnol'
+    zh-CN: 'Chinois (simplifié)'
+    ja: 'Japonais'
+    ko: 'Coréen'
+    vi: 'Vietnamien'

From 8e3e75b50a242d6eec19692d0fbd1bd012378fb6 Mon Sep 17 00:00:00 2001
From: Tomasz Subik <tsubik@gmail.com>
Date: Mon, 23 Feb 2026 12:22:33 +0100
Subject: [PATCH 2/2] improve force translation dropdowns

---
 app/admin/newsletter.rb  | 2 +-
 app/admin/observation.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/newsletter.rb b/app/admin/newsletter.rb
index 3691cf60..085e11eb 100644
--- a/app/admin/newsletter.rb
+++ b/app/admin/newsletter.rb
@@ -22,7 +22,7 @@ def scoped_collection
   action_item :force_translations, only: :show do
     dropdown_menu I18n.t("active_admin.shared.force_translations") do
       I18n.available_locales.sort.each do |locale|
-        item locale, force_translations_admin_newsletter_path(newsletter, translate_from: locale)
+        item I18n.t("locales.#{locale}"), force_translations_admin_newsletter_path(newsletter, translate_from: locale)
       end
     end
   end
diff --git a/app/admin/observation.rb b/app/admin/observation.rb
index bea72683..c4c6314b 100644
--- a/app/admin/observation.rb
+++ b/app/admin/observation.rb
@@ -64,7 +64,7 @@ def scoped_collection
   action_item :force_translations, only: :show do
     dropdown_menu I18n.t("active_admin.shared.force_translations") do
       I18n.available_locales.sort.each do |locale|
-        item locale, force_translations_admin_observation_path(observation, translate_from: locale)
+        item I18n.t("locales.#{locale}"), force_translations_admin_observation_path(observation, translate_from: locale)
       end
     end
   end