Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Introduce admin locale preference
Damian Legawiec92df868653db
diff --git a/backend/engines/admin/app/controllers/spree/admin/base_controller.rb b/backend/engines/admin/app/controllers/spree/admin/base_controller.rbindex 6d7977768d..81ff7fda1f 100644--- a/backend/engines/admin/app/controllers/spree/admin/base_controller.rb+++ b/backend/engines/admin/app/controllers/spree/admin/base_controller.rb@@ -80,8 +80,8 @@ module SpreeSpree.t(event_sym, resource: resource_desc)end- def config_locale- I18n.default_locale+ def default_locale+ @default_locale ||= current_store&.preferred_admin_locale.presence || superenddef current_timezonediff --git a/backend/engines/admin/app/views/spree/admin/stores/form/_basic.html.erb b/backend/engines/admin/app/views/spree/admin/stores/form/_basic.html.erbindex 0704f3c63b..69ddd2366e 100644--- a/backend/engines/admin/app/views/spree/admin/stores/form/_basic.html.erb+++ b/backend/engines/admin/app/views/spree/admin/stores/form/_basic.html.erb@@ -38,6 +38,9 @@<p class="text-gray-600 mb-3"><%= Spree.t(:standards_and_formats_help) %></p>+ <%= f.spree_select :preferred_admin_locale,+ options_from_collection_for_select(all_locales_options, :last, :first, @store.preferred_admin_locale || I18n.default_locale),+ { label: Spree.t(:admin_locale), help_bubble: Spree.t(:admin_locale_help), autocomplete: true } %><div class="form-group mb-6"><%= label_tag :preferred_timezone, raw(Spree.t(:timezone) + required_span_tag) %><%= time_zone_select :store, :preferred_timezone, nil, {}, { data: { controller: 'autocomplete-select' } } %>diff --git a/backend/engines/admin/config/locales/en.yml b/backend/engines/admin/config/locales/en.ymlindex 22bd96bb7e..30c3d5d943 100644--- a/backend/engines/admin/config/locales/en.yml+++ b/backend/engines/admin/config/locales/en.yml@@ -126,11 +126,6 @@ en:code_help_text: If you leave it blank, we will generate code for youredeemed: Redeemedusage: Usage- markets:- list: Markets- new: New Market- edit: Edit Market- supported_locales_hint: Comma-separated list of additional locale codes (e.g. fr,de,es)imports:all_required_columns_mapped: Good job, all required columns are mapped!field_required: Field required@@ -148,6 +143,11 @@ en:manage_stock_locations: Manage Stock Locationsmanage_taxons: Manage Taxonsmanage_zones: Manage Zones+ markets:+ edit: Edit Market+ list: Markets+ new: New Market+ supported_locales_hint: Comma-separated list of additional locale codes (e.g. fr,de,es)metafield_definitions:edit_warning: You can't change the resource type or metafield type after the definition has been used.used_in: Used indiff --git a/backend/engines/admin/spec/controllers/spree/admin/base_controller_spec.rb b/backend/engines/admin/spec/controllers/spree/admin/base_controller_spec.rbindex 4f7e8ed7ff..b64a306cc3 100644--- a/backend/engines/admin/spec/controllers/spree/admin/base_controller_spec.rb+++ b/backend/engines/admin/spec/controllers/spree/admin/base_controller_spec.rb@@ -14,6 +14,46 @@ describe Spree::Admin::BaseController, type: :controller doendend+ describe '#default_locale' do+ stub_authorization!++ let(:store) { Spree::Store.default }++ before do+ allow(controller).to receive(:current_store).and_return(store)+ end++ context 'when preferred_admin_locale is set' do+ before { allow(store).to receive(:preferred_admin_locale).and_return('de') }++ it 'uses the admin locale' do+ get :index+ expect(I18n.default_locale).to eq(:de)+ end+ end++ context 'when preferred_admin_locale is not set' do+ before { allow(store).to receive(:preferred_admin_locale).and_return(nil) }++ it 'falls back to store default_locale' do+ get :index+ expect(I18n.default_locale.to_s).to eq(store.default_locale)+ end+ end++ context 'when preferred_admin_locale is set and store has markets' do+ before do+ allow(store).to receive(:preferred_admin_locale).and_return('en')+ allow(store).to receive(:default_locale).and_return('fr')+ end++ it 'uses admin locale instead of market locale' do+ get :index+ expect(I18n.default_locale).to eq(:en)+ end+ end+ end+describe '#redirect_unauthorized_access' docontroller(AdminFakesController) dodef indexdiff --git a/backend/engines/core/app/models/spree/store.rb b/backend/engines/core/app/models/spree/store.rbindex 1493f0d6df..4ed8d564ee 100644--- a/backend/engines/core/app/models/spree/store.rb+++ b/backend/engines/core/app/models/spree/store.rb@@ -37,6 +37,7 @@ module Spree# Preferences## general preferences+ preference :admin_locale, :stringpreference :timezone, :string, default: Time.zone.namepreference :weight_unit, :string, default: 'lb'preference :unit_system, :string, default: 'imperial'diff --git a/backend/engines/core/config/locales/en.yml b/backend/engines/core/config/locales/en.ymlindex 1255c25dd5..8e31fb8f46 100644--- a/backend/engines/core/config/locales/en.yml+++ b/backend/engines/core/config/locales/en.yml@@ -722,6 +722,8 @@ en:adjustment_total: Adjustment Totaladjustments: Adjustmentsadjustments_deleted: Adjustments Deleted+ admin_locale: Admin locale+ admin_locale_help: The language used for the admin dashboard. If not set, defaults to the application locale.administration: Administrationadvertise: Advertiseagree_to_privacy_policy: Agree to Privacy Policydiff --git a/backend/engines/core/lib/spree/permitted_attributes.rb b/backend/engines/core/lib/spree/permitted_attributes.rbindex 1e61a8d359..e4fa1686b1 100644--- a/backend/engines/core/lib/spree/permitted_attributes.rb+++ b/backend/engines/core/lib/spree/permitted_attributes.rb@@ -279,7 +279,7 @@ module Spree:customer_support_email, :description, :address, :contact_phone,:supported_locales, :default_locale, :default_country_id, :supported_currencies,:new_order_notifications_email, :checkout_zone_id, :seo_robots,- :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,+ :preferred_admin_locale, :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,:preferred_digital_asset_authorized_clicks, :preferred_digital_asset_authorized_days,:preferred_limit_digital_download_count, :preferred_limit_digital_download_days,:preferred_digital_asset_link_expire_time,