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.

Extract Locale URLs logic into LocaleUrls concern

Damian Legawiecba3eaee27da8
diff --git a/frontend/app/controllers/concerns/spree/locale_urls.rb b/frontend/app/controllers/concerns/spree/locale_urls.rb
new file mode 100644
index 0000000000..dda4f9a7b2
--- /dev/null
+++ b/frontend/app/controllers/concerns/spree/locale_urls.rb
@@ -0,0 +1,23 @@
+module Spree
+ module LocaleUrls
+ extend ActiveSupport::Concern
+
+ included do
+ before_action :redirect_to_default_locale
+ end
+
+ private
+
+ def default_url_options
+ return super if locale_param.nil?
+
+ super.merge(locale: locale_param)
+ end
+
+ def redirect_to_default_locale
+ return if params[:locale].blank? || supported_locale?(params[:locale])
+
+ redirect_to url_for(request.parameters.merge(locale: nil))
+ end
+ end
+end
diff --git a/frontend/app/controllers/spree/store_controller.rb b/frontend/app/controllers/spree/store_controller.rb
index e5949c824f..5face1ccce 100644
--- a/frontend/app/controllers/spree/store_controller.rb
+++ b/frontend/app/controllers/spree/store_controller.rb
@@ -1,6 +1,8 @@
module Spree
class StoreController < Spree::BaseController
include Spree::Core::ControllerHelpers::Order
+ include Spree::LocaleUrls
+
helper 'spree/locale'
helper 'spree/currency'
@@ -29,12 +31,6 @@ module Spree
render json: current_order(create_order_if_necessary: true) # force creation of order if doesn't exists
end
- def default_url_options
- return super if locale_param.nil?
-
- super.merge(locale: locale_param)
- end
-
protected
def config_locale
@@ -52,11 +48,5 @@ module Spree
def store_last_modified
(current_store.updated_at || Time.current).utc
end
-
- def redirect_to_default_locale
- return if params[:locale].blank? || supported_locale?(params[:locale])
-
- redirect_to url_for(request.parameters.merge(locale: nil))
- end
end
end