Introduce helper method for translating public locale names

codevise · Oct 22, 2024 · 0fe130f · 0fe130f
1 parent 97ca969
commit 0fe130f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/helpers/pageflow/admin/entry_translations_helper.rb b/app/helpers/pageflow/admin/entry_translations_helper.rb
@@ -2,11 +2,10 @@ module Pageflow
   module Admin
     # @api private
     module EntryTranslationsHelper
+      include LocalesHelper
+
       def entry_translation_display_locale(entry)
-        display_locale = t(
-          'pageflow.public._language',
-          locale: (entry.published_revision || entry.draft).locale
-        )
+        display_locale = locale_name_for((entry.published_revision || entry.draft).locale)
 
         if entry.default_translation?
           t('pageflow.admin.entry_translations.default_translation', display_locale:)

diff --git a/app/helpers/pageflow/admin/locales_helper.rb b/app/helpers/pageflow/admin/locales_helper.rb
@@ -1,19 +1,23 @@
 module Pageflow
   module Admin
     module LocalesHelper
+      def locale_name_for(locale, i18n_key = 'pageflow.public._language')
+        I18n.t(i18n_key, locale: locale)
+      end
+
       def available_locales_collection
         locales_collection(Pageflow.config.available_locales, 'language')
       end
 
       def available_public_locales_collection
-        locales_collection(Pageflow.config.available_public_locales, 'pageflow.public._language')
+        locales_collection(Pageflow.config.available_public_locales)
       end
 
       private
 
-      def locales_collection(locales, i18n_key)
+      def locales_collection(locales, i18n_key = 'pageflow.public._language')
         locales.map do |locale|
-          [I18n.t(i18n_key, locale: locale), locale.to_s]
+          [locale_name_for(locale, i18n_key), locale.to_s]
         end
       end
     end

diff --git a/...es/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry_translations.json.jbuilder b/...es/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry_translations.json.jbuilder
@@ -1,7 +1,7 @@
 json.entry_translations do
   json.array!(entry.translations(-> { preload(:site) }, include_noindex: true)) do |translation|
     json.(translation, :id, :locale)
-    json.display_locale t('pageflow.public._language', locale: translation.locale)
+    json.display_locale locale_name_for(translation.locale)
 
     if translation.published_revision?
       json.url social_share_entry_url(translation)