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
reduce complexity
wjwitekeaef3b38e578
diff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex ad9cba682c..9b356e0505 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -22,15 +22,19 @@ module Spreeenddef current_locale- @current_locale ||= if Spree::Config.use_user_locale && spree_current_user && supported_locale?(spree_current_user.selected_locale)- spree_current_user.selected_locale- elsif params[:locale].present? && supported_locale?(params[:locale])- params[:locale]- elsif respond_to?(:config_locale, true) && config_locale.present?- config_locale- else- current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale- end+ if Spree::Config.use_user_locale && spree_current_user && supported_locale?(spree_current_user.selected_locale)+ @current_locale ||= spree_current_user.selected_locale+ else+ @current_locale ||= if Spree::Config.use_user_locale && spree_current_user && supported_locale?(spree_current_user.selected_locale)+ spree_current_user.selected_locale+ elsif params[:locale].present? && supported_locale?(params[:locale])+ params[:locale]+ elsif respond_to?(:config_locale, true) && config_locale.present?+ config_locale+ else+ current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale+ end+ endenddef supported_locales