From 9317ec8eb185659b687dec2ba84c3f7463d7b61d Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 25 Apr 2017 22:06:41 +0900 Subject: [PATCH] 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. --- app/controllers/application_controller.rb | 5 ++--- app/controllers/concerns/localized.rb | 19 +++++-------------- .../auth/sessions_controller_spec.rb | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2918954576..0c324762df 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -115,8 +115,7 @@ class ApplicationController < ActionController::Base end def respond_with_error(code) - set_locale do - render "errors/#{code}", layout: 'error', status: code - end + set_locale + render "errors/#{code}", layout: 'error', status: code end end diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index d9a7a7227b..44762df2af 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -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 diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb index 0ec0b8f2f3..2b68b4c5a7 100644 --- a/spec/controllers/auth/sessions_controller_spec.rb +++ b/spec/controllers/auth/sessions_controller_spec.rb @@ -49,6 +49,20 @@ RSpec.describe Auth::SessionsController, type: :controller do expect(controller.current_user).to be_nil 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 context 'using two-factor authentication' do