0
0
Fork 0

Change languages to be listed under standard instead of native name in admin UI (#17485)

This commit is contained in:
Eugen Rochko 2022-02-09 04:15:38 +01:00 committed by GitHub
parent fd3a45e348
commit 3aebe711fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 13 deletions

View file

@ -209,8 +209,8 @@ module LanguagesHelper
'zh-TW': '繁體中文(臺灣)',
}.freeze
def human_locale(locale)
if locale == 'und'
def native_locale_name(locale)
if locale.blank? || locale == 'und'
I18n.t('generic.none')
elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
supported_locale[1]
@ -221,6 +221,16 @@ module LanguagesHelper
end
end
def standard_locale_name(locale)
if locale.blank?
I18n.t('generic.none')
elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
supported_locale[0]
else
locale
end
end
def valid_locale_or_nil(str)
return if str.blank?