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
Set default locale in the ControllerHelpers::Locale when using column_fallback for translations (#12054)
Łukasz Adamczyk6cce2fc6f9bc
diff --git a/backend b/backendindex 4f7b341e87..07054bbca8 160000--- a/backend+++ b/backend@@ -1 +1 @@-Subproject commit 4f7b341e879da2fa67e5b90cb75c03aaff54a519+Subproject commit 07054bbca823110dcdaad9744aeaac0795350f0adiff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex f0388145b4..634aa50213 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -19,6 +19,7 @@ module Spreeenddef set_locale+ I18n.default_locale = default_locale unless Spree.always_use_translations?I18n.locale = current_localeenddiff --git a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb b/core/spec/lib/spree/core/controller_helpers/locale_spec.rbindex 5796d8c789..7afdde5128 100644--- a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/locale_spec.rb@@ -110,4 +110,40 @@ describe Spree::Core::ControllerHelpers::Locale, type: :controller doit { expect(controller.locale_param).to eq('de') }endend++ describe '#set_locale' do+ subject(:set_locale) { controller.set_locale }++ let!(:store) { create :store, default: true, default_locale: 'de', supported_locales: 'en,pl,de' }++ before do+ I18n.default_locale = :en+ I18n.locale = :en+ end++ after do+ I18n.default_locale = :en+ I18n.locale = :en+ end++ it 'sets the default and the current locale' do+ set_locale++ expect(I18n.default_locale).to eq(:de)+ expect(I18n.locale).to eq(:pl)+ end++ context 'when always using translations' do+ before do+ allow(Spree::RuntimeConfig).to receive(:always_use_translations).and_return(true)+ end++ it 'sets only the current locale' do+ set_locale++ expect(I18n.default_locale).to eq(:en)+ expect(I18n.locale).to eq(:pl)+ end+ end+ endend