Change global locale
param to lang
to avoid conflicts (#17592)
This commit is contained in:
parent
22f110a892
commit
e3d08a9e28
1 changed files with 1 additions and 1 deletions
|
@ -14,7 +14,7 @@ module Localized
|
||||||
private
|
private
|
||||||
|
|
||||||
def requested_locale
|
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 ||= 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 ||= http_accept_language if ENV['DEFAULT_LOCALE'].blank?
|
||||||
requested_locale_name
|
requested_locale_name
|
||||||
|
|
Loading…
Reference in a new issue