Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix not working I18n on 2FA and Sign in token page (#14087)

Browse source
This commit is contained in:
fuyu 2020-06-20 20:30:13 +09:00 • committed by GitHub
parent ac8a788370
commit a279acc730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/concerns/localized.rb
View file

@ -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