Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Localize with i18n for Devise::FailureApp (#2309)

Browse source 
This PR fixes I18n.locale for rake middlewares. Mastodon uses Devise that depends on Warden.
Warden::Manager can be found in rake middleware. It is outside of the controller.

In the case of authentication failed, warden calls throw(:warden). At the time Warden::Manager
delegates request to failure_app to generate response and flash[:alert] after catching it.
Unfortunately, I18n.locale is already reset then because I18n.with_locale is enabled only
inside the controller. If we used I18n.locale=, Devise::FailureApp could get the current locale.
This commit is contained in:
alpaca-tc 2017-04-25 22:06:41 +09:00 • committed by Eugen Rochko
parent 1b9447853b
commit 9317ec8eb1
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,25 +4,16 @@ module Localized
extend ActiveSupport::Concern
included do
around_action :set_locale
before_action :set_locale
end
private
def set_locale
locale = default_locale
if user_signed_in?
begin
locale = current_user.try(:locale) || default_locale
rescue I18n::InvalidLocale
locale = default_locale
end
end
I18n.with_locale(locale) do
yield
end
I18n.locale = default_locale
I18n.locale = current_user.locale if user_signed_in?
rescue I18n::InvalidLocale
I18n.locale = default_locale
end
def default_locale