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

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

View File

@ -115,8 +115,7 @@ class ApplicationController < ActionController::Base
end end
def respond_with_error(code) def respond_with_error(code)
set_locale do set_locale
render "errors/#{code}", layout: 'error', status: code render "errors/#{code}", layout: 'error', status: code
end end
end end
end

View File

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

View File

@ -49,6 +49,20 @@ RSpec.describe Auth::SessionsController, type: :controller do
expect(controller.current_user).to be_nil expect(controller.current_user).to be_nil
end end
end end
context 'using an unconfirmed password' do
before do
request.headers['Accept-Language'] = accept_language
post :create, params: { user: { email: unconfirmed_user.email, password: unconfirmed_user.password } }
end
let(:unconfirmed_user) { user.tap { |u| u.update!(confirmed_at: nil) } }
let(:accept_language) { 'fr' }
it 'shows a translated login error' do
expect(flash[:alert]).to eq(I18n.t('devise.failure.unconfirmed', locale: accept_language))
end
end
end end
context 'using two-factor authentication' do context 'using two-factor authentication' do