diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
commit | aae60a2366d6dadbcc4a0197d4dd17afc931c8a0 (patch) | |
tree | 0bbbc278809d9990365a2d79abeaf02891990d51 /app/controllers/concerns/localized.rb | |
parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
parent | bb9ca8a587ee5a3ec8778e72828aca0ba8871327 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.
Diffstat (limited to 'app/controllers/concerns/localized.rb')
-rw-r--r-- | app/controllers/concerns/localized.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index d1384ed56..fe1142f34 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -7,8 +7,6 @@ module Localized around_action :set_locale end - private - def set_locale locale = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in? locale ||= session[:locale] ||= default_locale @@ -19,6 +17,8 @@ module Localized end end + private + def default_locale if ENV['DEFAULT_LOCALE'].present? I18n.default_locale |