diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-24 17:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 17:06:26 +0200 |
| commit | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (patch) | |
| tree | 89b283a87f3ff82b24148636594c0837aa34b322 /app/controllers/concerns/localized.rb | |
| parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
| parent | 72d193654b9369b43090a4de2e197c21c30f3f31 (diff) | |
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge 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 |