summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgunchleoc <fios@foramnagaidhlig.net>2023-09-28 09:13:44 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-12-04 15:28:15 +0100
commit156d32689b3d084a7fe9f0aa6a8788cd4e831f17 (patch)
treeacf516d8fe88c96d248c2e15d59e4f418a0e77fb
parentef149674f093e97ffbeb12910e2ebdd668bed7c2 (diff)
Only strip country code when language not listed in SUPPORTED_LOCALES (#27099)
-rw-r--r--app/helpers/languages_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index a8c66552cf1..c42c4c23efc 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -254,6 +254,7 @@ module LanguagesHelper
def valid_locale_or_nil(str)
return if str.blank?
+ return str if valid_locale?(str)
code, = str.to_s.split(/[_-]/) # Strip out the region from e.g. en_US or ja-JP