Skip to content

armgit / spree

Public Imported from GitHub
0

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.

change using user locale to be configurable

wjwitekffab5fc0bc5a
diff --git a/core/lib/spree/core/configuration.rb b/core/lib/spree/core/configuration.rb
index 54278ba283..ec68e89990 100644
--- a/core/lib/spree/core/configuration.rb
+++ b/core/lib/spree/core/configuration.rb
@@ -65,6 +65,7 @@ module Spree
preference :show_raw_product_description, :boolean, deprecated: true
preference :tax_using_ship_address, :boolean, default: true
preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
+ preference :use_user_locale, :boolean, default: true
# Store credits configurations
preference :non_expiring_credit_types, :array, default: []
diff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rb
index 3602c63d36..ad9cba682c 100644
--- a/core/lib/spree/core/controller_helpers/locale.rb
+++ b/core/lib/spree/core/controller_helpers/locale.rb
@@ -22,7 +22,7 @@ module Spree
end
def current_locale
- @current_locale ||= if spree_current_user && supported_locale?(spree_current_user.selected_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]