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
Add handling for locales.
Matthew Kennedy921682fc7689
diff --git a/backend/app/helpers/spree/admin/cms_helper.rb b/backend/app/helpers/spree/admin/cms_helper.rbindex ad347c7860..2cd77d649b 100644--- a/backend/app/helpers/spree/admin/cms_helper.rb+++ b/backend/app/helpers/spree/admin/cms_helper.rb@@ -7,11 +7,13 @@ module Spreeurl = if page.homepage?spree.root_url + page.localeelse- spree.page_url(page.slug)+ spree.page_url(page.locale, page.slug)end- button_link_to(Spree.t('admin.cms.preview_page'), url,- class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank)+ button_link_to(Spree.t('admin.cms.preview_page'), url, class: 'btn-outline-secondary',+ icon: 'view.svg',+ id: 'admin_preview_product',+ target: :blank)enddef preview_url(page)@@ -20,7 +22,7 @@ module Spreeif page.homepage?spree.root_path + page.locale + "?no_cache=#{rand(1...10000)}"else- spree.page_path(page.slug) + "?no_cache=#{rand(1...10000)}"+ "/#{page.locale + spree.page_path(page.slug)}?no_cache=#{rand(1...10000)}"endendenddiff --git a/core/app/services/spree/build_localized_redirect_url.rb b/core/app/services/spree/build_localized_redirect_url.rbindex acc67e0c5f..3b50f814f9 100644--- a/core/app/services/spree/build_localized_redirect_url.rb+++ b/core/app/services/spree/build_localized_redirect_url.rb@@ -6,7 +6,7 @@ module SpreeLOCALE_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}$/.freeze- SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages)/.freeze+ SUPPORTED_PATHS_REGEX = /\/(#{Spree::Config[:storefront_products_path]}|#{Spree::Config[:storefront_taxons_path]}\/|cart|checkout|addresses|content|#{Spree::Config[:storefront_pages_path]})/.freeze# rubocop:disable Lint/UnusedMethodArgumentdef call(url:, locale:, default_locale: nil)diff --git a/frontend/app/controllers/spree/locale_controller.rb b/frontend/app/controllers/spree/locale_controller.rbindex 7e72e3fb7c..62802114d2 100644--- a/frontend/app/controllers/spree/locale_controller.rb+++ b/frontend/app/controllers/spree/locale_controller.rb@@ -1,5 +1,7 @@module Spreeclass LocaleController < Spree::StoreController+ REDIRECT_TO_ROOT = /\/(#{Spree::Config[:storefront_pages_path]})\//.freeze+def indexrender :index, layout: falseend@@ -25,7 +27,11 @@ module Spreeprivatedef should_build_new_url?- request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']+ if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)+ false+ else+ request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']+ endendendenddiff --git a/frontend/spec/features/cms_standard_page_spec.rb b/frontend/spec/features/cms_standard_page_spec.rbindex 53b232530e..0f96cd44a4 100644--- a/frontend/spec/features/cms_standard_page_spec.rb+++ b/frontend/spec/features/cms_standard_page_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe 'cms_page standard page', type: :feature, js: true do- let!(:store) { create(:store, default: true, supported_currencies: 'USD') }+ let!(:store) { create(:store, default: true, supported_currencies: 'USD', supported_locales: 'en,fr') }describe 'page' dolet!(:cms_page) { create(:cms_standard_page, store: store, locale: 'en', content: '<h2>About Us</h2>') }@@ -17,6 +17,13 @@ describe 'cms_page standard page', type: :feature, js: true doit 'displays title as page title if no meta_title is set' doexpect(page).to have_title("#{cms_page.title} - #{store.name}")end++ it 'redirects to homepage when language is changed via locale selector' do+ find('#internationalization-button-desktop').click+ find('#switch_to_locale').find(:xpath, 'option[2]').select_option++ expect(page).to have_text('We Will Be Back')+ endenddescribe 'page has metas' do