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
Use localized routes when switching Locale
Damian Legawiec068a2c7d0c9f
diff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex ed56bc4166..5daaf221ef 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -12,6 +12,7 @@ module Spreehelper_method :current_localehelper_method :supported_locale?helper_method :available_locales+ helper_method :locale_paramenddef set_locale@@ -19,9 +20,7 @@ module Spreeenddef current_locale- @current_locale ||= if defined?(session) && session.key?(:locale) && supported_locale?(session[:locale])- session[:locale]- elsif params[:locale].present? && supported_locale?(params[:locale])+ @current_locale ||= if params[:locale].present? && supported_locale?(params[:locale])params[:locale]elsif respond_to?(:config_locale, true) && config_locale.present?config_locale@@ -51,6 +50,12 @@ module Spreedef available_localesSpree::Store.available_localesend++ def locale_param+ return if I18n.locale.to_s == current_store.default_locale || current_store.default_locale.nil?++ I18n.locale.to_s+ endendendenddiff --git a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb b/core/spec/lib/spree/core/controller_helpers/locale_spec.rbindex 24982bc28a..80e76008f7 100644--- a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/locale_spec.rb@@ -68,4 +68,20 @@ describe Spree::Core::ControllerHelpers::Locale, type: :controller doexpect(controller.supported_locales.to_s).to include('de')endend++ describe '#locale_param' do+ let!(:store) { create :store, default: true, default_locale: 'en', supported_locales: 'en,de,fr' }++ context 'same as store default locale' do+ before { I18n.locale = :en }++ it { expect(controller.locale_param).to eq(nil) }+ end++ context 'different than store locale' do+ before { I18n.locale = :de }++ it { expect(controller.locale_param).to eq('de') }+ end+ endenddiff --git a/frontend/app/controllers/spree/store_controller.rb b/frontend/app/controllers/spree/store_controller.rbindex 1febbb8a21..ee85a894fb 100644--- a/frontend/app/controllers/spree/store_controller.rb+++ b/frontend/app/controllers/spree/store_controller.rb@@ -27,6 +27,12 @@ module Spreerender json: current_order(create_order_if_necessary: true) # force creation of order if doesn't existsend+ def default_url_options+ return super if locale_param.nil?++ super.merge(locale: locale_param)+ end+protecteddef config_localediff --git a/frontend/config/routes.rb b/frontend/config/routes.rbindex 778b2d21b7..06c2933e9e 100644--- a/frontend/config/routes.rb+++ b/frontend/config/routes.rb@@ -1,39 +1,36 @@Spree::Core::Engine.add_routes do- root to: 'home#index'+ scope '(:locale)', locale: /#{I18n.available_locales.join('|')}/, defaults: { locale: nil } do+ root to: 'home#index'- resources :products, only: [:index, :show]+ resources :products, only: [:index, :show]+ get '/products/:id/related', to: 'products#related'+ # route globbing for pretty nested taxon and product paths+ get '/t/*id', to: 'taxons#show', as: :nested_taxons+ get '/product_carousel/:id', to: 'taxons#product_carousel'- get '/locales', to: 'locale#index', as: :locales- get '/locale/set', to: 'locale#set', as: :set_locale- get '/currency/set', to: 'currency#set', as: :set_currency+ # non-restful checkout stuff+ patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout+ get '/checkout/:state', to: 'checkout#edit', as: :checkout_state+ get '/checkout', to: 'checkout#edit', as: :checkout- # non-restful checkout stuff- patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout- get '/checkout/:state', to: 'checkout#edit', as: :checkout_state- get '/checkout', to: 'checkout#edit', as: :checkout+ resources :orders, except: [:index, :new, :create, :destroy]- get '/orders/populate', to: 'orders#populate_redirect'+ resources :addresses, except: [:show]- resources :orders, except: [:index, :new, :create, :destroy] do- post :populate, on: :collection- end-- resources :addresses, except: [:show]+ get '/cart', to: 'orders#edit', as: :cart+ patch '/cart', to: 'orders#update', as: :update_cart+ put '/cart/empty', to: 'orders#empty', as: :empty_cart- get '/cart', to: 'orders#edit', as: :cart- patch '/cart', to: 'orders#update', as: :update_cart- put '/cart/empty', to: 'orders#empty', as: :empty_cart+ get '/content/cvv', to: 'content#cvv', as: :cvv+ get '/content/test', to: 'content#test'+ get '/cart_link', to: 'store#cart_link', as: :cart_link+ get '/account_link', to: 'store#account_link', as: :account_link- # route globbing for pretty nested taxon and product paths- get '/t/*id', to: 'taxons#show', as: :nested_taxons- get '/product_carousel/:id', to: 'taxons#product_carousel'+ get '/locales', to: 'locale#index', as: :locales+ get '/locale/set', to: 'locale#set', as: :set_locale+ get '/currency/set', to: 'currency#set', as: :set_currency- get '/content/cvv', to: 'content#cvv', as: :cvv- get '/content/test', to: 'content#test'- get '/cart_link', to: 'store#cart_link', as: :cart_link- get '/account_link', to: 'store#account_link', as: :account_link-- get '/api_tokens', to: 'store#api_tokens'- post '/ensure_cart', to: 'store#ensure_cart'- get '/products/:id/related', to: 'products#related'+ get '/api_tokens', to: 'store#api_tokens'+ post '/ensure_cart', to: 'store#ensure_cart'+ endend