diff options
author | fuyu <54523771+mfmfuyu@users.noreply.github.com> | 2020-06-20 20:30:13 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-20 13:30:13 +0200 |
commit | a279acc73071b3fb2f8381fc5051de5b70e879ef (patch) | |
tree | 5d99bdb4c7d428b927ad9f60dc4db1fbbf4c3440 /app/controllers/concerns/localized.rb | |
parent | ac8a788370012656cde08b2aea2bd927f0748422 (diff) |
Fix not working I18n on 2FA and Sign in token page (#14087)
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 |