r18n-desktop 1.0.0 → 1.0.1

data/lib/r18n-desktop.rb

@@ -38,8 +38,9 @@ module R18n
     # information and translations from +translations_places+. If user set
     # locale +manual+ put it as last argument.
     def from_env(translations_places = nil, manual = nil)
-      locales = Array(R18n::I18n.system_locale)
-      locales.insert(0, manual) if not manual.nil?
+      locales  = Array(R18n::I18n.system_locale)
+      locales.insert(0, ENV['LANG']) if ENV['LANG']
+      locales.insert(0, manual)      if manual
       self.set I18n.new(locales, translations_places)
     end
   end

data/spec/r18n-desktop_spec.rb

@@ -5,7 +5,7 @@ describe "r18n-desktop" do
   include R18n::Helpers
 
   before(:each) do
-    R18n.reset
+    R18n.reset!
   end
 
   it "should return array of system locales" do
@@ -27,4 +27,11 @@ describe "r18n-desktop" do
     R18n.get.should == r18n
   end
 
+  it "allow to overide autodetect by LANG environment" do
+    R18n::I18n.stub!(:system_locale).and_return('ru')
+    ENV['LANG'] = 'en'
+    R18n.from_env
+    r18n.locale.should == R18n.locale('en')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-desktop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2038291380859406366
+      hash: -3727376546871339480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2038291380859406366
+      hash: -3727376546871339480
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23