From ce79caca4e440e600c9624851a5567819472478f Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Thu, 28 Sep 2023 09:13:44 +0100
Subject: [PATCH] Only strip country code when language not listed in
SUPPORTED_LOCALES (#27099)
---
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 a8c66552c..c42c4c23e 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