spree_backend 4.2.0.rc3 → 4.2.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea801a7a77488cba4283f0bb1d99d237d7a5e9b180c98092837cb39f86ca794
-  data.tar.gz: 0b2fe5d30019037e6712b7c4cbb19def4ea4096d7b81224cc2d762654b50fd1a
+  metadata.gz: b8121bf0a1967bf78b87f0e260a572238140c19948c991f8684693472b69ec15
+  data.tar.gz: a740ec1df8fdfb18fa8558487dc413096332ef08339b4dd374c78d19f06bf458
 SHA512:
-  metadata.gz: 8ce23c93f231611913fffa2accf3cb5934a53f400d3f5cb03a72db40541502e44a66b64cf6b79e74a15f27e8496fa8e696b1d65d425c95e90f86515b4deb54e2
-  data.tar.gz: ad48197a9b626b2cfd07d2094e94165b62e01d265054ba12755932efef8cc267071e0c9ef67e04564c14adb61a898ccb6c6ec6be94496ddcb95d02500924df63
+  metadata.gz: 1c68a55ff4b579d488d570cf99c49bc082806fb7ef5395cbe6967a38535e4dbd395afdce0929c2916f337086bf979f70e5a5b4fb1f0ac19908d79ebfdd55d2dc
+  data.tar.gz: 4d7db3cec1602bf2858f15f322294132522f1a55df6f2fffc4482911583720985592a60f068f3d04304b3533a79f7cfbd8da21509773864d71a2590b5861e079

data/app/controllers/spree/admin/general_settings_controller.rb

@@ -27,7 +27,7 @@ module Spree
       end
 
       def render(*args)
-        @preferences_currency |= [:show_store_currency_selector]
+        @preferences_currency |= [:show_store_selector]
         super
       end
 

data/app/controllers/spree/admin/stores_controller.rb

@@ -9,10 +9,6 @@ module Spree
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
       before_action :load_all_zones, only: %i[new edit]
 
-      if defined?(SpreeI18n)
-        include SpreeI18n::LocaleHelper
-      end
-
       helper_method :all_locales_options
 
       def index
@@ -137,13 +133,17 @@ module Spree
         @store.default_country_id = Spree::Config[:default_country_id]
       end
 
-      # this method is overriten by spree_i18n to add support for more locales
-      # in https://github.com/spree-contrib/spree_i18n/blob/master/app/helpers/spree_i18n/locale_helper.rb#L17
-      unless defined?(SpreeI18n)
-        def all_locales_options
+      def all_locales_options
+        if defined?(SpreeI18n)
+          SpreeI18n::Locale.all.map { |locale| locale_presentation(locale) }.push(['English (EN)', :en])
+        else
           [['English (EN)', :en]]
         end
       end
+
+      def locale_presentation(locale)
+        [Spree.t('i18n.this_file_language', locale: locale), locale]
+      end
     end
   end
 end

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -84,13 +84,13 @@
             </div>
             <div class="card-body">
               <div class="alert alert-warning col-12">
-                <%= Spree.t('show_store_currency_selector.long') %>
+                <%= Spree.t('show_store_selector.long') %>
               </div>
               <div class="form-group">
                 <div class="checkbox">
                   <label>
-                    <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>
-                    <%= Spree.t('show_store_currency_selector.short') %>
+                    <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
+                    <%= Spree.t('show_store_selector.short') %>
                   </label>
                 </div>
               </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc3
+  version: 4.2.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0.rc4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0.rc4
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -653,9 +653,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.2.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
 post_install_message:
 rdoc_options: []
 require_paths: