diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-02-19 03:12:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 03:12:28 +0100 |
| commit | de448ab1b5c2aa3f6a631ca9666a1fa0e447ccdd (patch) | |
| tree | 7f9839d1decc2a821c7270ecb671113d273076c9 | |
| parent | 2426577a914af7e0de906620b1f9fda3af48bc8a (diff) | |
Change global `locale` param to `lang` to avoid conflicts (#17592)
| -rw-r--r-- | app/controllers/concerns/localized.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |