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
Added support for two part locales such as es-MX
Damian Legawiec700c510c37e9
diff --git a/core/app/services/spree/build_localized_url.rb b/core/app/services/spree/build_localized_url.rbindex 90bbb5eaf2..046420b0bd 100644--- a/core/app/services/spree/build_localized_url.rb+++ b/core/app/services/spree/build_localized_url.rb@@ -4,7 +4,7 @@ module Spreeclass BuildLocalizedUrlprepend Spree::ServiceModule::Base- LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}$/.freeze+ LOCALE_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)/.freezediff --git a/core/spec/services/spree/build_localized_url_spec.rb b/core/spec/services/spree/build_localized_url_spec.rbindex 045e726b15..f5795714d7 100644--- a/core/spec/services/spree/build_localized_url_spec.rb+++ b/core/spec/services/spree/build_localized_url_spec.rb@@ -50,6 +50,28 @@ module Spreeit { expect(result).to eq('https://example.com:3000/de?utm_source=google') }end++ context 'with long locale symbols' do+ let(:locale) { 'es-MX' }++ context 'http with port' do+ let(:url) { 'http://example.com:3000/' }++ it { expect(result).to eq('http://example.com:3000/es-MX') }+ end++ context 'https with no trailing slash' do+ let(:url) { 'https://example.com' }++ it { expect(result).to eq('https://example.com/es-MX') }+ end++ context 'with parameters and port' do+ let(:url) { 'https://example.com:3000/?utm_source=google' }++ it { expect(result).to eq('https://example.com:3000/es-MX?utm_source=google') }+ end+ endendend@@ -74,6 +96,26 @@ module Spreeit { expect(result).to eq('https://example.com:3000/products/some-product?taxon_id=1&utm_source=google') }end++ context 'with long locale symbols' do+ context 'http with port' do+ let(:url) { 'http://example.com:3000/es-MX/products/some-product' }++ it { expect(result).to eq('http://example.com:3000/products/some-product') }+ end++ context 'https with no trailing slash' do+ let(:url) { 'https://example.com/es-MX/products/some-product' }++ it { expect(result).to eq('https://example.com/products/some-product') }+ end++ context 'with parameters and port' do+ let(:url) { 'https://example.com:3000/es-MX/products/some-product?taxon_id=1&utm_source=google' }++ it { expect(result).to eq('https://example.com:3000/products/some-product?taxon_id=1&utm_source=google') }+ end+ endendcontext 'non-default locale' do@@ -96,6 +138,48 @@ module Spreeit { expect(result).to eq('https://example.com:3000/de/products/some-product?taxon_id=1&utm_source=google') }end++ context 'with long locale symbols' do+ context 'http with port' do+ let(:url) { 'http://example.com:3000/es-MX/products/some-product' }++ it { expect(result).to eq('http://example.com:3000/de/products/some-product') }+ end++ context 'https with no trailing slash' do+ let(:url) { 'https://example.com/es-MX/products/some-product' }++ it { expect(result).to eq('https://example.com/de/products/some-product') }+ end++ context 'with parameters and port' do+ let(:url) { 'https://example.com:3000/es-MX/products/some-product?taxon_id=1&utm_source=google' }++ it { expect(result).to eq('https://example.com:3000/de/products/some-product?taxon_id=1&utm_source=google') }+ end+ end+ end++ context 'es-MX' do+ let(:locale) { 'es-MX' }++ context 'http with port' do+ let(:url) { 'http://example.com:3000/fr/products/some-product' }++ it { expect(result).to eq('http://example.com:3000/es-MX/products/some-product') }+ end++ context 'https with no trailing slash' do+ let(:url) { 'https://example.com/fr/products/some-product' }++ it { expect(result).to eq('https://example.com/es-MX/products/some-product') }+ end++ context 'with parameters and port' do+ let(:url) { 'https://example.com:3000/fr/products/some-product?taxon_id=1&utm_source=google' }++ it { expect(result).to eq('https://example.com:3000/es-MX/products/some-product?taxon_id=1&utm_source=google') }+ endendend