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
Fix backwards compatibility for translations (#12049)
Łukasz Adamczyk0d2d44e3d206
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rbindex 09b20857c5..42d5aadff2 100644--- a/core/app/models/spree/option_type.rb+++ b/core/app/models/spree/option_type.rb@@ -7,8 +7,13 @@ module Spreeinclude Spree::Webhooks::HasWebhooksend- TRANSLATABLE_FIELDS = %i[presentation].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ if Spree.always_use_translations?+ TRANSLATABLE_FIELDS = %i[name presentation].freeze+ translates(*TRANSLATABLE_FIELDS)+ else+ TRANSLATABLE_FIELDS = %i[presentation].freeze+ translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ endacts_as_listauto_strip_attributes :name, :presentationdiff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rbindex d01b46d2e4..7a18d6150d 100644--- a/core/app/models/spree/option_value.rb+++ b/core/app/models/spree/option_value.rb@@ -6,8 +6,13 @@ module Spreeinclude Spree::Webhooks::HasWebhooksend- TRANSLATABLE_FIELDS = %i[presentation].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ if Spree.always_use_translations?+ TRANSLATABLE_FIELDS = %i[name presentation].freeze+ translates(*TRANSLATABLE_FIELDS)+ else+ TRANSLATABLE_FIELDS = %i[presentation].freeze+ translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ endbelongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_valuesdiff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex b2cd1a6ff6..168adde4d5 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -39,7 +39,7 @@ module Spreepurchasable? in_stock? backorderable?]TRANSLATABLE_FIELDS = %i[name description slug meta_description meta_keywords meta_title].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)self::Translation.class_eval dobefore_save :set_slugdiff --git a/core/app/models/spree/product_property.rb b/core/app/models/spree/product_property.rbindex 23c69d3721..81494a36ef 100644--- a/core/app/models/spree/product_property.rb+++ b/core/app/models/spree/product_property.rb@@ -3,8 +3,13 @@ module Spreeinclude Spree::FilterParaminclude Spree::TranslatableResource- TRANSLATABLE_FIELDS = %i[value].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ if Spree.always_use_translations?+ TRANSLATABLE_FIELDS = %i[value filter_param].freeze+ translates(*TRANSLATABLE_FIELDS)+ else+ TRANSLATABLE_FIELDS = %i[value].freeze+ translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ endself::Translation.class_eval doauto_strip_attributes :valuediff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rbindex 91ac2c8952..3b7bfb01b2 100644--- a/core/app/models/spree/property.rb+++ b/core/app/models/spree/property.rb@@ -7,8 +7,13 @@ module Spreeinclude Spree::Webhooks::HasWebhooksend- TRANSLATABLE_FIELDS = %i[presentation].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ if Spree.always_use_translations?+ TRANSLATABLE_FIELDS = %i[name presentation filter_param].freeze+ translates(*TRANSLATABLE_FIELDS)+ else+ TRANSLATABLE_FIELDS = %i[presentation].freeze+ translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ endself::Translation.class_eval doauto_strip_attributes :presentationdiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex e9e1681af7..535e9454a5 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -11,7 +11,7 @@ module SpreeTRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebooktwitter instagram customer_support_email descriptionaddress contact_phone new_order_notifications_email].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)self::Translation.class_eval doacts_as_paranoiddiff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rbindex 9cdb89f9db..092a08b93a 100644--- a/core/app/models/spree/taxon.rb+++ b/core/app/models/spree/taxon.rb@@ -60,7 +60,7 @@ module Spreescope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }TRANSLATABLE_FIELDS = %i[name description permalink].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)self::Translation.class_eval doalias_attribute :slug, :permalinkdiff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rbindex 4e48c46d49..3ce1a5858b 100644--- a/core/app/models/spree/taxonomy.rb+++ b/core/app/models/spree/taxonomy.rb@@ -7,7 +7,7 @@ module SpreeendTRANSLATABLE_FIELDS = %i[name].freeze- translates(*TRANSLATABLE_FIELDS, column_fallback: true)+ translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)acts_as_listdiff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex fa52c845af..9a8f7a5acd 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -76,6 +76,10 @@ module Spreeendend+ def self.always_use_translations?+ Spree::RuntimeConfig.always_use_translations+ end+def self.use_translations?Spree::RuntimeConfig.always_use_translations || I18n.default_locale != I18n.localeend