Merge pull request #224 from bitberry-dev/master

Fix locale inconsistence and remove redundant template
solidusio · Aug 30, 2022 · bb291bd · bb291bd
2 parents a918b8b + 2a6ca76
commit bb291bd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/lib/controllers/backend/spree/admin/user_passwords_controller.rb b/lib/controllers/backend/spree/admin/user_passwords_controller.rb
@@ -42,4 +42,15 @@ def update
       super
     end
   end
+
+  private
+
+  # NOTE: as soon as this gem stops supporting Solidus 3.1 if-else should be removed and left only include
+  if defined?(::Spree::Admin::SetsUserLanguageLocaleKey)
+    include ::Spree::Admin::SetsUserLanguageLocaleKey
+  else
+    def set_user_language_locale_key
+      :admin_locale
+    end
+  end
 end
diff --git a/lib/controllers/backend/spree/admin/user_sessions_controller.rb b/lib/controllers/backend/spree/admin/user_sessions_controller.rb
@@ -35,6 +35,15 @@ def authorization_failure
 
   private
 
+  # NOTE: as soon as this gem stops supporting Solidus 3.1 if-else should be removed and left only include
+  if defined?(::Spree::Admin::SetsUserLanguageLocaleKey)
+    include ::Spree::Admin::SetsUserLanguageLocaleKey
+  else
+    def set_user_language_locale_key
+      :admin_locale
+    end
+  end
+
   def accurate_title
     I18n.t('spree.login')
   end

diff --git a/lib/views/backend/spree/layouts/admin/_login_nav.html.erb b/lib/views/backend/spree/layouts/admin/_login_nav.html.erb