solidus_core 2.6.0.rc1 → 2.6.0
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.
- checksums.yaml +4 -4
- data/lib/spree/core/controller_helpers/common.rb +5 -1
- data/lib/spree/core/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8a31523e3874a6773f96fd486e8bdfc6595cb8bf5bbef206cb9132bbb6bd14d2
|
|
4
|
+
data.tar.gz: f468e20eefa314539fc495f03cf7d384c0af29d0449250d04f8a893ce5c83c83
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0feccfc066aac21535db10499e51dcb2331747af672fc1d52d397f20f047ddff64572f98e1e5d687d967307f7fbbdbfe708bc841939e0b368f1177d35bad7422
|
|
7
|
+
data.tar.gz: e06cd0ad6f2d2e8b33055ce6c13ba1810c0191c6ad0e29467e330ba482a05a631c12549599a59594aa3483026388976d23827748efaa022504f73d0aa325e9cb
|
|
@@ -47,11 +47,15 @@ module Spree
|
|
|
47
47
|
|
|
48
48
|
private
|
|
49
49
|
|
|
50
|
+
def set_user_language_locale_key
|
|
51
|
+
:locale
|
|
52
|
+
end
|
|
53
|
+
|
|
50
54
|
def set_user_language
|
|
51
55
|
available_locales = Spree.i18n_available_locales
|
|
52
56
|
locale = [
|
|
53
57
|
params[:locale],
|
|
54
|
-
session[
|
|
58
|
+
session[set_user_language_locale_key],
|
|
55
59
|
(config_locale if respond_to?(:config_locale, true)),
|
|
56
60
|
I18n.default_locale
|
|
57
61
|
].detect do |candidate|
|
data/lib/spree/core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: solidus_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.0
|
|
4
|
+
version: 2.6.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Solidus Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-05-
|
|
11
|
+
date: 2018-05-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: actionmailer
|