Skip to content
Snippets Groups Projects
Unverified Commit de448ab1 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Change global `locale` param to `lang` to avoid conflicts (#17592)

parent 2426577a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/concerns/localized.rb
+ 1
− 1
View file @ de448ab1
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment