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.

correct Spree::Theme.available_themes, adjust locales

Łukasz Adamczyk84eb23fdaff5
diff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rb
index fcb2137054..1dbb0f0185 100644
--- a/core/app/models/spree/pages/homepage.rb
+++ b/core/app/models/spree/pages/homepage.rb
@@ -25,7 +25,7 @@ module Spree
if on_sale_collection.present?
sections << Spree::PageSections::FeaturedTaxon.new(
- preferred_heading: Spree.t('pages.homepage.featured_taxon_heading_on_sale'),
+ preferred_heading: Spree.t('pages_defaults.homepage.featured_taxon_heading_on_sale'),
preferred_use_description_from_admin: true,
preferred_taxon_id: on_sale_collection.id
)
@@ -33,7 +33,7 @@ module Spree
if new_arrivals_collection.present?
sections << Spree::PageSections::FeaturedTaxon.new(
- preferred_heading: Spree.t('pages.homepage.featured_taxon_heading_new_arrivals'),
+ preferred_heading: Spree.t('pages_defaults.homepage.featured_taxon_heading_new_arrivals'),
preferred_use_description_from_admin: true,
preferred_taxon_id: new_arrivals_collection.id
)
@@ -44,13 +44,13 @@ module Spree
preferred_background_color: '#F0EFE9', # accent color,
default_blocks: [
Spree::PageBlocks::Heading.new(
- text: Spree.t('pages.homepage.image_with_text_heading'),
+ text: Spree.t('pages_defaults.homepage.image_with_text_heading'),
preferred_text_alignment: 'left',
preferred_bottom_padding: 8,
preferred_top_padding: 24
),
Spree::PageBlocks::Text.new(
- text: Spree.t('pages.homepage.image_with_text_text'),
+ text: Spree.t('pages_defaults.homepage.image_with_text_text'),
preferred_text_alignment: 'left',
preferred_bottom_padding: 16
)
diff --git a/core/app/models/spree/pages/password.rb b/core/app/models/spree/pages/password.rb
index 069862e54f..1b15613370 100644
--- a/core/app/models/spree/pages/password.rb
+++ b/core/app/models/spree/pages/password.rb
@@ -28,14 +28,14 @@ module Spree
Spree::PageSections::Newsletter.new(
default_blocks: [
Spree::PageBlocks::Heading.new(
- text: Spree.t('pages.password.newsletter_heading'),
+ text: Spree.t('pages_defaults.password.newsletter_heading'),
preferred_width_desktop: 50, # in %
preferred_text_alignment: 'center',
preferred_container_alignment: 'center',
preferred_bottom_padding: 8
),
Spree::PageBlocks::Text.new(
- text: Spree.t('pages.password.newsletter_text'),
+ text: Spree.t('pages_defaults.password.newsletter_text'),
preferred_text_alignment: 'center',
preferred_bottom_padding: 32,
preferred_width_desktop: 50,
diff --git a/core/app/models/spree/theme.rb b/core/app/models/spree/theme.rb
index 6b71ec7565..f5e3d37e1f 100644
--- a/core/app/models/spree/theme.rb
+++ b/core/app/models/spree/theme.rb
@@ -60,10 +60,10 @@ module Spree
def self.available_themes
@available_themes ||= begin
# we need to load Page subclasses (not loaded in dev environment!)
- Dir.open(Rails.root.join('app', 'models', 'spree', 'themes')).each do |file|
+ Dir.open(Spree::Core::Engine.root.join('app', 'models', 'spree', 'themes')).each do |file|
next if ['.', '..'].include?(file)
- require_dependency Rails.root.join('app', 'models', 'spree', 'themes', file).to_s
+ require_dependency Spree::Core::Engine.root.join('app', 'models', 'spree', 'themes', file).to_s
end
Spree::Theme.descendants.sort_by(&:display_name)
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 10a663ce4e..e0a73de248 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1284,7 +1284,7 @@ en:
video:
heading_1_default: Why I recommend it?
heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.
- pages:
+ pages_defaults:
homepage:
featured_taxon_heading_on_sale: On sale
featured_taxon_heading_new_arrivals: New arrivals