spree_core 4.8.0 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb9614d2e37d1c4c04ad71985912a54e12c579ba21266bbec33d95d383bf03f4
-  data.tar.gz: 7cc25cd0d5e067d97c30a9932cde2a1e02cc3826ba37d98ec14aa6ad5cd8f6ac
+  metadata.gz: 347d9720ab5b7339d59ea9a0bf03052f1574b3b4acaceb034063afa0c22515a8
+  data.tar.gz: 9de3e8196d36b1131f130360c5fab3f202d9f60af7a31470d94ebbd96b50903b
 SHA512:
-  metadata.gz: 8e15d6b8da8503742847b455d084c6fd067fde3fc613605707f6c576a9e169cd9b410e2d6755554f2eef05fb622f0b5dd01533372bacc4b9d2f57407f45dac8e
-  data.tar.gz: 02e24962d02e6c6665c9d9a8292b9365353fc08170dd7c0697cf6d0234a4d2b22d0b61e0e6d035c2a4ec3f4c6d6b5eb453ae0a5dffae3739e7382ed83c80645d
+  metadata.gz: 075bf6bcf2f617036128adf641e401d22a97942117fc2b1fc553a33456697618a43207454c592ff83bc51ef8eaf585fc7fc55fb62c7092f062366f89b6c8a859
+  data.tar.gz: 24577e9f4781111d8fddb27b9bf7735d5ad67f29d8aea28b1b16e7b6bd17c96490a7a867ffe0be1760ef4932e6b423246362fe884f6b6da33be296d3b1886bc7

data/app/models/spree/option_type.rb

@@ -7,8 +7,13 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
-    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)
+    end
 
     acts_as_list
     auto_strip_attributes :name, :presentation

data/app/models/spree/option_value.rb

@@ -6,8 +6,13 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
-    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)
+    end
 
     belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
 

data/app/models/spree/product.rb

@@ -39,7 +39,7 @@ module Spree
                           purchasable? 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 do
       before_save :set_slug

data/app/models/spree/product_property.rb

@@ -3,8 +3,13 @@ module Spree
     include Spree::FilterParam
     include 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)
+    end
 
     self::Translation.class_eval do
       auto_strip_attributes :value

data/app/models/spree/property.rb

@@ -7,8 +7,13 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
-    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)
+    end
 
     self::Translation.class_eval do
       auto_strip_attributes :presentation

data/app/models/spree/store.rb

@@ -11,7 +11,7 @@ module Spree
     TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebook
                              twitter instagram customer_support_email description
                              address 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 do
       acts_as_paranoid

data/app/models/spree/taxon.rb

@@ -60,7 +60,7 @@ module Spree
     scope :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 do
       alias_attribute :slug, :permalink

data/app/models/spree/taxonomy.rb

@@ -7,7 +7,7 @@ module Spree
     end
 
     TRANSLATABLE_FIELDS = %i[name].freeze
-    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
+    translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
 
     acts_as_list
 

data/config/locales/en.yml

@@ -1038,8 +1038,8 @@ en:
       go_to_previous_menu: Go to previous menu
       log_in: LOG IN
       log_out: LOG OUT
-      my_account: MY ACCOUNT
-      my_orders: MY ORDERS
+      my_account: My Account
+      my_orders: My Orders
       show_menu: Show menu
       show_search: Show search
       show_user_menu: Show user menu
@@ -1234,14 +1234,6 @@ en:
     payment_type: Payment type
     payment_updated: Payment Updated
     payments: Payments
-    pdp:
-      checkout: Checkout
-      description: Description
-      details: Details
-      products_included_in_promotion: Products included in the promotion
-      quantity: Quantity
-      view_cart: View cart
-      you_may_also_like: You may also like
     percent: Percent
     percent_per_item: Percent Per Item
     permalink: Permalink
@@ -1251,32 +1243,6 @@ en:
     place_order: Place Order
     please_define_payment_methods: Please define some payment methods first.
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
-    plp:
-      best_selling: BEST SELLING
-      clear_all: CLEAR ALL
-      collection: COLLECTION
-      color: COLOR
-      done: DONE
-      default: DEFAULT
-      filter_by: FILTER BY
-      newest_first: NEWEST FIRST
-      no_results: No results
-      no_results_found: No results found
-      not_found_filters1: We couldn’t find a match for these filters.
-      not_found_filters2: Please try another choose.
-      not_found_text1: We couldn’t find products for '%{keywords}'.
-      not_found_text2: Please try another search.
-      price: price
-      price_high_to_low: PRICE (HIGH - LOW)
-      price_low_to_high: PRICE (LOW - HIGH)
-      name_a_z: NAME (A-Z)
-      name_z_a: NAME (Z-A)
-      result: RESULT
-      results_for: RESULTS FOR
-      size: SIZE
-      sort_by: SORT BY
-      top_sellers: TOP SELLERS
-      type: TYPE
     populate_get_error: Something went wrong. Please try adding the item again.
     powered_by: Powered by
     pre_tax_refund_amount: Pre-Tax Refund Amount

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.8.0'.freeze
+  VERSION = '4.8.2'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -76,6 +76,10 @@ module Spree
     end
   end
 
+  def self.always_use_translations?
+    Spree::RuntimeConfig.always_use_translations
+  end
+
   def self.use_translations?
     Spree::RuntimeConfig.always_use_translations || I18n.default_locale != I18n.locale
   end
@@ -91,7 +95,9 @@ module Spree
   # This method is defined within the core gem on purpose.
   # Some people may only wish to use the Core part of Spree.
   def self.config
-    yield(Spree::Config)
+    Rails.application.config.after_initialize do
+      yield(Spree::Config)
+    end
   end
 
   # Used to set dependencies for Spree.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -1119,9 +1119,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.8.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.8.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.8.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.8.2
 post_install_message:
 rdoc_options: []
 require_paths: