spree_backend 4.2.0.rc3 → 4.2.0.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
  3. data/app/controllers/spree/admin/stores_controller.rb +8 -8
  4. data/app/views/spree/admin/general_settings/edit.html.erb +3 -3
  5. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ea801a7a77488cba4283f0bb1d99d237d7a5e9b180c98092837cb39f86ca794
4
- data.tar.gz: 0b2fe5d30019037e6712b7c4cbb19def4ea4096d7b81224cc2d762654b50fd1a
3
+ metadata.gz: b8121bf0a1967bf78b87f0e260a572238140c19948c991f8684693472b69ec15
4
+ data.tar.gz: a740ec1df8fdfb18fa8558487dc413096332ef08339b4dd374c78d19f06bf458
5
5
  SHA512:
6
- metadata.gz: 8ce23c93f231611913fffa2accf3cb5934a53f400d3f5cb03a72db40541502e44a66b64cf6b79e74a15f27e8496fa8e696b1d65d425c95e90f86515b4deb54e2
7
- data.tar.gz: ad48197a9b626b2cfd07d2094e94165b62e01d265054ba12755932efef8cc267071e0c9ef67e04564c14adb61a898ccb6c6ec6be94496ddcb95d02500924df63
6
+ metadata.gz: 1c68a55ff4b579d488d570cf99c49bc082806fb7ef5395cbe6967a38535e4dbd395afdce0929c2916f337086bf979f70e5a5b4fb1f0ac19908d79ebfdd55d2dc
7
+ data.tar.gz: 4d7db3cec1602bf2858f15f322294132522f1a55df6f2fffc4482911583720985592a60f068f3d04304b3533a79f7cfbd8da21509773864d71a2590b5861e079
data/app/controllers/spree/admin/general_settings_controller.rb CHANGED
@@ -27,7 +27,7 @@ module Spree
27
27
  end
28
28
 
29
29
  def render(*args)
30
- @preferences_currency |= [:show_store_currency_selector]
30
+ @preferences_currency |= [:show_store_selector]
31
31
  super
32
32
  end
33
33
 
data/app/controllers/spree/admin/stores_controller.rb CHANGED
@@ -9,10 +9,6 @@ module Spree
9
9
  before_action :load_all_countries, only: [:new, :edit, :update, :create]
10
10
  before_action :load_all_zones, only: %i[new edit]
11
11
 
12
- if defined?(SpreeI18n)
13
- include SpreeI18n::LocaleHelper
14
- end
15
-
16
12
  helper_method :all_locales_options
17
13
 
18
14
  def index
@@ -137,13 +133,17 @@ module Spree
137
133
  @store.default_country_id = Spree::Config[:default_country_id]
138
134
  end
139
135
 
140
- # this method is overriten by spree_i18n to add support for more locales
141
- # in https://github.com/spree-contrib/spree_i18n/blob/master/app/helpers/spree_i18n/locale_helper.rb#L17
142
- unless defined?(SpreeI18n)
143
- def all_locales_options
136
+ def all_locales_options
137
+ if defined?(SpreeI18n)
138
+ SpreeI18n::Locale.all.map { |locale| locale_presentation(locale) }.push(['English (EN)', :en])
139
+ else
144
140
  [['English (EN)', :en]]
145
141
  end
146
142
  end
143
+
144
+ def locale_presentation(locale)
145
+ [Spree.t('i18n.this_file_language', locale: locale), locale]
146
+ end
147
147
  end
148
148
  end
149
149
  end
data/app/views/spree/admin/general_settings/edit.html.erb CHANGED
@@ -84,13 +84,13 @@
84
84
  </div>
85
85
  <div class="card-body">
86
86
  <div class="alert alert-warning col-12">
87
- <%= Spree.t('show_store_currency_selector.long') %>
87
+ <%= Spree.t('show_store_selector.long') %>
88
88
  </div>
89
89
  <div class="form-group">
90
90
  <div class="checkbox">
91
91
  <label>
92
- <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>
93
- <%= Spree.t('show_store_currency_selector.short') %>
92
+ <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
93
+ <%= Spree.t('show_store_selector.short') %>
94
94
  </label>
95
95
  </div>
96
96
  </div>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0.rc3
4
+ version: 4.2.0.rc4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-01-18 00:00:00.000000000 Z
12
+ date: 2021-01-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_api
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 4.2.0.rc3
20
+ version: 4.2.0.rc4
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 4.2.0.rc3
27
+ version: 4.2.0.rc4
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: spree_core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - '='
33
33
  - !ruby/object:Gem::Version
34
- version: 4.2.0.rc3
34
+ version: 4.2.0.rc4
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 4.2.0.rc3
41
+ version: 4.2.0.rc4
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: bootstrap
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -653,9 +653,9 @@ licenses:
653
653
  - BSD-3-Clause
654
654
  metadata:
655
655
  bug_tracker_uri: https://github.com/spree/spree/issues
656
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
656
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
657
657
  documentation_uri: https://guides.spreecommerce.org/
658
- source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
658
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
659
659
  post_install_message:
660
660
  rdoc_options: []
661
661
  require_paths: