vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2022-02-19 03:12:28 +01:00 committed by GitHub
parent 2426577a91
commit de448ab1b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/localized.rb
View file

@ -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