Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide support to fix locale selection in admin login page #4493

Merged
merged 2 commits into from
Aug 8, 2022
Merged

Provide support to fix locale selection in admin login page #4493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
737fb76
Extract Spree::Admin::SetsUserLanguageLocaleKey
gsmendoza Aug 5, 2022
d18443f
Skip admin authorization for Admin::LocaleController#set
gsmendoza Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions backend/app/concerns/spree/admin/sets_user_language_locale_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module Spree
module Admin
module SetsUserLanguageLocaleKey
def set_user_language_locale_key
:admin_locale
end
end
end
end
4 changes: 1 addition & 3 deletions backend/app/controllers/spree/admin/base_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions backend/app/controllers/spree/admin/locale_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down