From de448ab1b5c2aa3f6a631ca9666a1fa0e447ccdd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 19 Feb 2022 03:12:28 +0100
Subject: [PATCH] Change global `locale` param to `lang` to avoid conflicts
(#17592)
---
app/controllers/concerns/localized.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb
index f7b62f09c..173316800 100644
--- a/app/controllers/concerns/localized.rb
+++ b/app/controllers/concerns/localized.rb
@@ -14,7 +14,7 @@ module Localized
private
def requested_locale
- requested_locale_name = available_locale_or_nil(params[:locale])
+ requested_locale_name = available_locale_or_nil(params[:lang])
requested_locale_name ||= available_locale_or_nil(current_user.locale) if respond_to?(:user_signed_in?) && user_signed_in?
requested_locale_name ||= http_accept_language if ENV['DEFAULT_LOCALE'].blank?
requested_locale_name