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
Rename BuildLocalizedUrl to BuildLocalizedRedirectUrl
Damian Legawiec90a103ac3bdc
diff --git a/core/app/services/spree/build_localized_url.rb b/core/app/services/spree/build_localized_redirect_url.rbsimilarity index 95%rename from core/app/services/spree/build_localized_url.rbrename to core/app/services/spree/build_localized_redirect_url.rbindex 046420b0bd..72c3bd77d3 100644--- a/core/app/services/spree/build_localized_url.rb+++ b/core/app/services/spree/build_localized_redirect_url.rb@@ -1,19 +1,21 @@require 'uri'module Spree- class BuildLocalizedUrl+ class BuildLocalizedRedirectUrlprepend Spree::ServiceModule::BaseLOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freezeSUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content)/.freeze+ # rubocop:disable Lint/UnusedMethodArgumentdef call(url:, locale:, default_locale: nil)run :initialize_url_objectrun :generate_new_pathrun :append_locale_paramrun :build_urlend+ # rubocop:enable Lint/UnusedMethodArgumentprotecteddiff --git a/core/spec/services/spree/build_localized_url_spec.rb b/core/spec/services/spree/build_localized_redirect_url_spec.rbsimilarity index 99%rename from core/spec/services/spree/build_localized_url_spec.rbrename to core/spec/services/spree/build_localized_redirect_url_spec.rbindex f5795714d7..3036404e50 100644--- a/core/spec/services/spree/build_localized_url_spec.rb+++ b/core/spec/services/spree/build_localized_redirect_url_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'module Spree- describe BuildLocalizedUrl do+ describe BuildLocalizedRedirectUrl dosubject { described_class.call(url: url, locale: locale, default_locale: default_locale) }let(:result) { subject.value }diff --git a/frontend/app/controllers/spree/locale_controller.rb b/frontend/app/controllers/spree/locale_controller.rbindex 2a5dc1c9c3..7e72e3fb7c 100644--- a/frontend/app/controllers/spree/locale_controller.rb+++ b/frontend/app/controllers/spree/locale_controller.rb@@ -9,7 +9,7 @@ module Spreeif new_locale.present? && supported_locale?(new_locale)if should_build_new_url?- redirect_to BuildLocalizedUrl.call(+ redirect_to BuildLocalizedRedirectUrl.call(url: request.env['HTTP_REFERER'],locale: new_locale,default_locale: current_store.default_locale