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.

Add back in image

Matthew Kennedy021f98115246
diff --git a/core/app/services/spree/build_localized_redirect_url.rb b/core/app/services/spree/build_localized_redirect_url.rb
index 72c3bd77d3..acc67e0c5f 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 Spree
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}$/.freeze
- SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content)/.freeze
+ SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages)/.freeze
# rubocop:disable Lint/UnusedMethodArgument
def call(url:, locale:, default_locale: nil)
diff --git a/frontend/app/assets/images/homepage/products.jpg b/frontend/app/assets/images/homepage/products.jpg
new file mode 100755
index 0000000000..12f3f044f4
Binary files /dev/null and b/frontend/app/assets/images/homepage/products.jpg differ
diff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rb
index aa5052880e..8eceeb4c60 100644
--- a/frontend/app/controllers/spree/cms_pages_controller.rb
+++ b/frontend/app/controllers/spree/cms_pages_controller.rb
@@ -23,7 +23,7 @@ module Spree
end
def load_cms_page
- @page = Spree::CmsPage.by_store(current_store).find_by(slug: params[:slug])
+ @page = Spree::CmsPage.by_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
end
end
end