Only strip country code when language not listed in SUPPORTED_LOCALES (#27099)

3 years ago · 156d32689b
1 changed files with 1 additions and 0 deletions
--- 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