diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 19:48:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 19:48:05 +0100 |
| commit | d602c92b310545eb733a58caed49717341abe27c (patch) | |
| tree | 59b020274695be37d47d0a4c98962c2677e621e6 /app/helpers | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | d90da7d080d25355290e5d5e86c2c918d685add7 (diff) | |
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/languages_helper.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index f3ed7b314..3a65af686 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -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? |