From 5309f57e8185d5da8ef502e41492e5b71132fa76 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 24 Sep 2023 11:56:29 +0100 Subject: [PATCH] Only strip country code when language not listed in SUPPORTED_LOCALES --- app/helpers/languages_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index a8c66552cf14e..c42c4c23efc44 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -254,6 +254,7 @@ def standard_locale_name(locale) 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