r18n-desktop 1.0.0 → 1.0.1
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.
- data/lib/r18n-desktop.rb +3 -2
- data/spec/r18n-desktop_spec.rb +8 -1
- metadata +6 -6
data/lib/r18n-desktop.rb
CHANGED
|
@@ -38,8 +38,9 @@ module R18n
|
|
|
38
38
|
# information and translations from +translations_places+. If user set
|
|
39
39
|
# locale +manual+ put it as last argument.
|
|
40
40
|
def from_env(translations_places = nil, manual = nil)
|
|
41
|
-
locales
|
|
42
|
-
locales.insert(0,
|
|
41
|
+
locales = Array(R18n::I18n.system_locale)
|
|
42
|
+
locales.insert(0, ENV['LANG']) if ENV['LANG']
|
|
43
|
+
locales.insert(0, manual) if manual
|
|
43
44
|
self.set I18n.new(locales, translations_places)
|
|
44
45
|
end
|
|
45
46
|
end
|
data/spec/r18n-desktop_spec.rb
CHANGED
|
@@ -5,7 +5,7 @@ describe "r18n-desktop" do
|
|
|
5
5
|
include R18n::Helpers
|
|
6
6
|
|
|
7
7
|
before(:each) do
|
|
8
|
-
R18n.reset
|
|
8
|
+
R18n.reset!
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
it "should return array of system locales" do
|
|
@@ -27,4 +27,11 @@ describe "r18n-desktop" do
|
|
|
27
27
|
R18n.get.should == r18n
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
+
it "allow to overide autodetect by LANG environment" do
|
|
31
|
+
R18n::I18n.stub!(:system_locale).and_return('ru')
|
|
32
|
+
ENV['LANG'] = 'en'
|
|
33
|
+
R18n.from_env
|
|
34
|
+
r18n.locale.should == R18n.locale('en')
|
|
35
|
+
end
|
|
36
|
+
|
|
30
37
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: r18n-desktop
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-06-
|
|
12
|
+
date: 2012-06-30 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: r18n-core
|
|
@@ -18,7 +18,7 @@ dependencies:
|
|
|
18
18
|
requirements:
|
|
19
19
|
- - '='
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: 1.0.
|
|
21
|
+
version: 1.0.1
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -26,7 +26,7 @@ dependencies:
|
|
|
26
26
|
requirements:
|
|
27
27
|
- - '='
|
|
28
28
|
- !ruby/object:Gem::Version
|
|
29
|
-
version: 1.0.
|
|
29
|
+
version: 1.0.1
|
|
30
30
|
- !ruby/object:Gem::Dependency
|
|
31
31
|
name: bundler
|
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
184
184
|
version: '0'
|
|
185
185
|
segments:
|
|
186
186
|
- 0
|
|
187
|
-
hash: -
|
|
187
|
+
hash: -3727376546871339480
|
|
188
188
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
189
189
|
none: false
|
|
190
190
|
requirements:
|
|
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
193
193
|
version: '0'
|
|
194
194
|
segments:
|
|
195
195
|
- 0
|
|
196
|
-
hash: -
|
|
196
|
+
hash: -3727376546871339480
|
|
197
197
|
requirements: []
|
|
198
198
|
rubyforge_project:
|
|
199
199
|
rubygems_version: 1.8.23
|