diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-19 13:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 13:54:53 +0100 |
| commit | 23a548d794b1cb5005428c6bcf73819c1944339e (patch) | |
| tree | 5e5e43faa68f1b6320f48d8d5c724d91873ae962 /app/controllers/concerns/localized.rb | |
| parent | c8ef003c6b40e9b7212f43f1b5706b0967fcfe8a (diff) | |
| parent | dc121b609f25dcfd39b10dfcc69da95a3a63ff12 (diff) | |
Merge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/concerns/localized.rb')
| -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 |