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.

Remove locale from the page builder urls (#12349)

Łukasz Adamczyk2e9b3ecba66e
diff --git a/core/app/models/action_text/rich_text_decorator.rb b/core/app/models/action_text/rich_text_decorator.rb
index cb8c2a9562..28586a9a5a 100644
--- a/core/app/models/action_text/rich_text_decorator.rb
+++ b/core/app/models/action_text/rich_text_decorator.rb
@@ -3,7 +3,7 @@ module ActionText
def page_builder_url
return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:policy_path)
- Spree::Core::Engine.routes.url_helpers.policy_path(name.gsub(/customer_/, ''), locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.policy_path(name.gsub(/customer_/, ''))
end
end
diff --git a/core/app/models/spree/pages/account.rb b/core/app/models/spree/pages/account.rb
index 2f5075d433..9cc7ab4398 100644
--- a/core/app/models/spree/pages/account.rb
+++ b/core/app/models/spree/pages/account.rb
@@ -4,7 +4,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:account_path)
- Spree::Core::Engine.routes.url_helpers.account_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.account_path
end
def icon_name
diff --git a/core/app/models/spree/pages/custom.rb b/core/app/models/spree/pages/custom.rb
index a72d55a96e..60a803a7d5 100644
--- a/core/app/models/spree/pages/custom.rb
+++ b/core/app/models/spree/pages/custom.rb
@@ -8,7 +8,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:page_path)
- Spree::Core::Engine.routes.url_helpers.page_path(self, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.page_path(self)
end
def default_sections
diff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rb
index 8eb7a05593..d04db74592 100644
--- a/core/app/models/spree/pages/homepage.rb
+++ b/core/app/models/spree/pages/homepage.rb
@@ -4,7 +4,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:root_path)
- Spree::Core::Engine.routes.url_helpers.root_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.root_path
end
def icon_name
diff --git a/core/app/models/spree/pages/login.rb b/core/app/models/spree/pages/login.rb
index 28cf7f5998..7036c37066 100644
--- a/core/app/models/spree/pages/login.rb
+++ b/core/app/models/spree/pages/login.rb
@@ -8,7 +8,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:login_path)
- Spree::Core::Engine.routes.url_helpers.login_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.login_path
end
end
end
diff --git a/core/app/models/spree/pages/password.rb b/core/app/models/spree/pages/password.rb
index 7e143287d2..5cece0b7c8 100644
--- a/core/app/models/spree/pages/password.rb
+++ b/core/app/models/spree/pages/password.rb
@@ -2,7 +2,7 @@ module Spree
module Pages
class Password < Spree::Page
def page_builder_url
- Spree::Core::Engine.routes.url_helpers.password_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.password_path
end
def preview_url(theme_preview = nil, page_preview = nil)
diff --git a/core/app/models/spree/pages/post.rb b/core/app/models/spree/pages/post.rb
index 2892a074ba..2aa073854d 100644
--- a/core/app/models/spree/pages/post.rb
+++ b/core/app/models/spree/pages/post.rb
@@ -6,7 +6,7 @@ module Spree
post = store.posts.published.last || store.posts.last
return if post.nil?
- Spree::Core::Engine.routes.url_helpers.post_path(post, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.post_path(post)
end
def icon_name
diff --git a/core/app/models/spree/pages/post_list.rb b/core/app/models/spree/pages/post_list.rb
index 1cef217c5a..184619096f 100644
--- a/core/app/models/spree/pages/post_list.rb
+++ b/core/app/models/spree/pages/post_list.rb
@@ -6,7 +6,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:posts_path)
- Spree::Core::Engine.routes.url_helpers.posts_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.posts_path
end
def icon_name
diff --git a/core/app/models/spree/pages/product_details.rb b/core/app/models/spree/pages/product_details.rb
index 4bfe8c2921..716b8dc0d8 100644
--- a/core/app/models/spree/pages/product_details.rb
+++ b/core/app/models/spree/pages/product_details.rb
@@ -7,7 +7,7 @@ module Spree
product = store.products.active.first || store.products.first
return if product.nil?
- Spree::Core::Engine.routes.url_helpers.product_path(product, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.product_path(product)
end
def icon_name
diff --git a/core/app/models/spree/pages/shop_all.rb b/core/app/models/spree/pages/shop_all.rb
index cf1d6181ed..01b816875a 100644
--- a/core/app/models/spree/pages/shop_all.rb
+++ b/core/app/models/spree/pages/shop_all.rb
@@ -8,7 +8,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:products_path)
- Spree::Core::Engine.routes.url_helpers.products_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.products_path
end
def preview_url(theme_preview = nil, page_preview = nil)
diff --git a/core/app/models/spree/pages/taxon.rb b/core/app/models/spree/pages/taxon.rb
index 54d801a1ea..bf9d71501f 100644
--- a/core/app/models/spree/pages/taxon.rb
+++ b/core/app/models/spree/pages/taxon.rb
@@ -11,7 +11,7 @@ module Spree
taxon = Spree::Taxon.first
return if taxon.nil?
- Spree::Core::Engine.routes.url_helpers.nested_taxons_path(taxon, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(taxon)
end
def default_sections
diff --git a/core/app/models/spree/pages/taxon_list.rb b/core/app/models/spree/pages/taxon_list.rb
index a13072a345..054972f337 100644
--- a/core/app/models/spree/pages/taxon_list.rb
+++ b/core/app/models/spree/pages/taxon_list.rb
@@ -7,7 +7,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:taxonomy_path)
- Spree::Core::Engine.routes.url_helpers.taxonomy_path(taxonomy.id, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.taxonomy_path(taxonomy.id)
end
def icon_name
diff --git a/core/app/models/spree/pages/wishlist.rb b/core/app/models/spree/pages/wishlist.rb
index 6502931311..c3ba8546f5 100644
--- a/core/app/models/spree/pages/wishlist.rb
+++ b/core/app/models/spree/pages/wishlist.rb
@@ -4,7 +4,7 @@ module Spree
def page_builder_url
return unless page_builder_url_exists?(:account_wishlist_path)
- Spree::Core::Engine.routes.url_helpers.account_wishlist_path(locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.account_wishlist_path
end
end
end
diff --git a/core/app/models/spree/post.rb b/core/app/models/spree/post.rb
index 5f19601db1..699f90fe5f 100644
--- a/core/app/models/spree/post.rb
+++ b/core/app/models/spree/post.rb
@@ -76,7 +76,7 @@ module Spree
def page_builder_url
return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:post_path)
- Spree::Core::Engine.routes.url_helpers.post_path(self, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.post_path(self)
end
def publish(date = nil)
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 21d19f6e24..2a9a4b65b4 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -647,7 +647,7 @@ module Spree
def page_builder_url
return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:product_path)
- Spree::Core::Engine.routes.url_helpers.product_path(self, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.product_path(self)
end
private
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index 10bb6114cc..08320e454c 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -381,7 +381,7 @@ module Spree
def page_builder_url
return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:nested_taxons_path)
- Spree::Core::Engine.routes.url_helpers.nested_taxons_path(self, locale: I18n.locale)
+ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(self)
end
private