Merge pull request #4493 from gsmendoza/gsmendoza/eng-436-changing-th…

…e-locale-in-the-admin-login Provide support to fix locale selection in admin login page
solidusio · Aug 8, 2022 · 4e9b6f3 · 4e9b6f3
2 parents 3025373 + d18443f
commit 4e9b6f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/backend/app/concerns/spree/admin/sets_user_language_locale_key.rb b/backend/app/concerns/spree/admin/sets_user_language_locale_key.rb
@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module SetsUserLanguageLocaleKey
+      def set_user_language_locale_key
+        :admin_locale
+      end
+    end
+  end
+end
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
@@ -12,9 +12,7 @@ class BaseController < Spree::BaseController
 
       # Overrides ControllerHelpers::Common
       # We want the admin's locale selection to be different than that on the frontend
-      def set_user_language_locale_key
-        :admin_locale
-      end
+      include SetsUserLanguageLocaleKey
 
       def action
         params[:action].to_sym

diff --git a/backend/app/controllers/spree/admin/locale_controller.rb b/backend/app/controllers/spree/admin/locale_controller.rb
@@ -3,6 +3,8 @@
 module Spree
   module Admin
     class LocaleController < Spree::Admin::BaseController
+      skip_before_action :authorize_admin, only: [:set]
+
       def set
         requested_locale = params[:switch_to_locale].to_s.presence