From 7a00a3ba1ed914795dbe119aba17424c335a5082 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 3 Jul 2020 11:52:21 +0200 Subject: [PATCH] Rename method and add explanatory comment --- app/controllers/spree/user_sessions_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index 44fb56a312..d48f700581 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -12,7 +12,7 @@ module Spree ssl_allowed :login_bar before_action :set_checkout_redirect, only: :create - after_action :ensure_valid_locale, only: :create + after_action :ensure_valid_locale_persisted, only: :create def create authenticate_spree_user! @@ -51,7 +51,9 @@ module Spree session["spree_user_return_to"] = nil end - def ensure_valid_locale + def ensure_valid_locale_persisted + # When creating a new user session we have to wait until after a successful + # login to be able to persist a locale on the current user return unless spree_current_user && !available_locale?(spree_current_user.locale) spree_current_user.update!(locale: I18n.default_locale)