Keep the account navigation menu open when changing the locale

admin/app/components/solidus_admin/layout/navigation/account/component.html.erb

@@ -2,6 +2,7 @@
   data-controller="details-click-outside"
   class="relative w-full"
   aria-label="<%= t('.account') %>"
+  <%= :open if params[:account_menu_open] %>
 >
   <summary
     class="

admin/app/controllers/solidus_admin/controller_helpers/locale.rb

@@ -18,7 +18,7 @@ def update_user_locale
       session[set_user_language_locale_key] = requested_locale
 
       flash[:notice] = t('spree.locale_changed')
-      redirect_to url_for(request.params.except(:switch_to_locale))
+      redirect_to params.except(:switch_to_locale).permit!.to_h.merge(account_menu_open: true)
     end
   end
 

admin/spec/features/accounts_spec.rb

@@ -13,4 +13,22 @@
     expect(page).to have_content(user.email)
     expect(current_path).to eq("/admin/users/#{user.id}/edit")
   end
+
+  it "can change locale", :js do
+    I18n.config.available_locales_set << :"en-UK"
+    I18n.config.available_locales_set << "en-UK"
+    I18n.backend.store_translations('en-UK', spree: { i18n: { this_file_language: "English (UK)" } })
+
+    user = create(:admin_user, email: '[email protected]')
+    stub_authorization! user
+    sign_in user
+
+    visit "/admin/products"
+    find('summary', text: user.email).click
+    expect(page).to have_content("English (US)")
+    select "English (UK)", from: "switch_to_locale"
+    expect(page).to have_content("English (UK)")
+    select "English (US)", from: 'switch_to_locale'
+    expect(page).to have_content("English (US)")
+  end
 end