Use a different session key for admin locale

solidusio · May 16, 2018 · d016d29 · d016d29
1 parent bcc3e95
commit d016d29
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
@@ -10,6 +10,12 @@ class BaseController < Spree::BaseController
 
       private
 
+      # 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
+
       def action
         params[:action].to_sym
       end

diff --git a/core/lib/spree/core/controller_helpers/common.rb b/core/lib/spree/core/controller_helpers/common.rb
@@ -47,11 +47,15 @@ def accurate_title
 
         private
 
+        def set_user_language_locale_key
+          :locale
+        end
+
         def set_user_language
           available_locales = Spree.i18n_available_locales
           locale = [
             params[:locale],
-            session[:locale],
+            session[set_user_language_locale_key],
             (config_locale if respond_to?(:config_locale, true)),
             I18n.default_locale
           ].detect do |candidate|