lalala 4.0.0.dev.216 → 4.0.0.dev.217
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lalala/engine.rb +6 -0
- data/lib/lalala/ext_i18n.rb +1 -0
- data/lib/lalala/ext_i18n/locale_source.rb +11 -0
- data/lib/lalala/ext_rack/i18n_negotiator.rb +10 -2
- data/lib/lalala/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1fbc493bd1a98fb3e020f9583b0f1015b2c18522
|
4
|
+
data.tar.gz: c774fb2673124caec8932a00433af4c8331e661e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5f3b4e2dd5a7275a121dbed7a281e0067fc8ac0374eaf45557ecb34b078afc6598ea5bbf02dee24a351cfb1a5d5b25149f7d674a1cbe2f0a8b948e57a0ee4c6c
|
7
|
+
data.tar.gz: 754d35365da80bd208fba9ad26a37fcf6ed890414ef7c4c1a26859a06a7d04dcb79b98bf33db72f4c806dc9db1e4b2e56f893ef129bd667df0f2aff9184ca519
|
data/lib/lalala/engine.rb
CHANGED
data/lib/lalala/ext_i18n.rb
CHANGED
@@ -16,7 +16,8 @@ protected
|
|
16
16
|
def _call(env)
|
17
17
|
@env = env
|
18
18
|
|
19
|
-
_locale
|
19
|
+
_locale = I18n.locale
|
20
|
+
_locale_source = I18n.locale_source
|
20
21
|
|
21
22
|
if @adapter.ignored?(env)
|
22
23
|
I18n.locale = locale_for_ignored.to_sym
|
@@ -29,6 +30,7 @@ protected
|
|
29
30
|
return determine_routing_path
|
30
31
|
ensure
|
31
32
|
I18n.locale = _locale
|
33
|
+
I18n.locale_source = _locale_source
|
32
34
|
end
|
33
35
|
|
34
36
|
private
|
@@ -39,6 +41,7 @@ private
|
|
39
41
|
if m = one_available_locale?
|
40
42
|
@env['rack.locale'] = m[0]
|
41
43
|
@env['lalala.cannonical_url'] = nil
|
44
|
+
@env['lalala.locale.source'] = 'default'
|
42
45
|
return action(true)
|
43
46
|
end
|
44
47
|
|
@@ -46,6 +49,7 @@ private
|
|
46
49
|
if m = hostname_with_one_available_locale?
|
47
50
|
@env['rack.locale'] = m[0]
|
48
51
|
@env['lalala.cannonical_url'] = nil
|
52
|
+
@env['lalala.locale.source'] = 'host'
|
49
53
|
return action(true)
|
50
54
|
end
|
51
55
|
|
@@ -55,6 +59,7 @@ private
|
|
55
59
|
@env['SCRIPT_NAME'] = m[1]
|
56
60
|
@env['PATH_INFO'] = m[2]
|
57
61
|
@env['lalala.cannonical_url'] = nil
|
62
|
+
@env['lalala.locale.source'] = 'path'
|
58
63
|
return action(true)
|
59
64
|
end
|
60
65
|
|
@@ -63,10 +68,12 @@ private
|
|
63
68
|
@env['rack.locale'] = m[0]
|
64
69
|
@env['SCRIPT_NAME'] = m[1]
|
65
70
|
@env['lalala.cannonical_url'] = m[2]
|
71
|
+
@env['lalala.locale.source'] = 'header'
|
66
72
|
return action(false)
|
67
73
|
end
|
68
74
|
|
69
75
|
@env['rack.locale'] = default_locale_for_hostname.to_sym
|
76
|
+
@env['lalala.locale.source'] = 'default'
|
70
77
|
return action(true)
|
71
78
|
end
|
72
79
|
|
@@ -76,7 +83,8 @@ private
|
|
76
83
|
case action
|
77
84
|
|
78
85
|
when :call
|
79
|
-
I18n.locale
|
86
|
+
I18n.locale = new_env['rack.locale'].to_sym
|
87
|
+
I18n.locale_source = new_env['lalala.locale.source']
|
80
88
|
|
81
89
|
status, headers, body = @app.call(new_env)
|
82
90
|
headers['Content-Language'] = I18n.locale.to_s
|
data/lib/lalala/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lalala
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.0.dev.
|
4
|
+
version: 4.0.0.dev.217
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon Menke
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2013-10-
|
16
|
+
date: 2013-10-30 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: activeadmin
|
@@ -1419,6 +1419,7 @@ files:
|
|
1419
1419
|
- lib/lalala/ext_active_record/schema/join_table_inverter.rb
|
1420
1420
|
- lib/lalala/ext_i18n.rb
|
1421
1421
|
- lib/lalala/ext_i18n/input_helper.rb
|
1422
|
+
- lib/lalala/ext_i18n/locale_source.rb
|
1422
1423
|
- lib/lalala/ext_i18n/negotiation_adapter.rb
|
1423
1424
|
- lib/lalala/ext_i18n/test_negotiation_adapter.rb
|
1424
1425
|
- lib/lalala/ext_rack.rb
|