closed-social
/
mastodon
3
0
Fork 2
Code Issues 5 Pull Requests 0 Projects 0 Releases 3 Wiki Activity
Browse Source

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

closed-social-glitch-2
Eugen Rochko 2 years ago
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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/controllers/concerns/localized.rb

+ 1
- 1
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

Write Preview
Loading…
Cancel
Save