Only strip country code when language not listed in SUPPORTED_LOCALES (#27099)
parent
ef149674f0
commit
156d32689b
|
@ -254,6 +254,7 @@ module LanguagesHelper
|
||||||
|
|
||||||
def valid_locale_or_nil(str)
|
def valid_locale_or_nil(str)
|
||||||
return if str.blank?
|
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
|
code, = str.to_s.split(/[_-]/) # Strip out the region from e.g. en_US or ja-JP
|
||||||
|
|
||||||
|
|
Reference in New Issue