r18n-desktop 3.0.5 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8656b7b17ee3e8a89261a757af67b415159b8f72f23a10f04f68147187f2fe0
-  data.tar.gz: 7b9601a0756ab35a7d67e7df5df250575ffb7b317d20aa4b524d2bb69dfc7ec2
+  metadata.gz: b206f4abe8aa4141218e817caef754d30ba014fb666f6d28b02c0c1b9955070b
+  data.tar.gz: e6d95a142f538f6bbcd6ce206846e6c7d371130d1d1020b69126bb8c8ba4c248
 SHA512:
-  metadata.gz: 90dbdde2b7a07ed4d83f603aafa8977b106becbd298d81cfcc6ddf203bca71460311b295d698025abd2afacb8317aaadd2ea7e5d37e4430b67556033cfe89f4f
-  data.tar.gz: 0f501902d2839896ed57ea4f5ff3bb66b0981fab26c4d2ef6c14d43f268424bbee2323a5d2b295625004d999f2701fcbd1d321706e69c35316ff9cab379c8ba0
+  metadata.gz: 89ebf8e4c5243d23b8bea63668084e90ff1ae1d3fdb458bc5cde51b0c1af311c09c7fbb2332466ad48eef624caa99502e5602ab71e3afe1555387eedee411940
+  data.tar.gz: d360382108586959d966eb095148c30281685f01f086d4a79624fa69bb52879008fa60537585e24c0adc2bcdde072e5e55071ccabe2966e951f1a684295acbb6

data/lib/r18n-desktop.rb

@@ -35,10 +35,11 @@ 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)
+      ::R18n.default_places { translations_places }
       locales = Array(R18n::I18n.system_locale)
-      locales.insert(0, ENV['LANG']) if ENV['LANG']
-      locales.insert(0, manual)      if manual
-      set I18n.new(locales, translations_places)
+      locales.unshift(ENV['LANG']) if ENV['LANG']
+      locales.unshift(manual)      if manual
+      set ::R18n::I18n.new(locales, translations_places)
     end
   end
 end

data/r18n-desktop.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.author   = 'Andrey Sitnik'
   s.email    = 'andrey@sitnik.ru'
   s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-desktop'
-  s.license  = 'LGPL-3'
+  s.license  = 'LGPL-3.0'
 
   s.add_dependency 'r18n-core', "= #{R18n::VERSION}"
 end

data/spec/i18n/en.yml

@@ -0,0 +1,2 @@
+account:
+  balance: Balance for account

data/spec/r18n-desktop_spec.rb

@@ -13,23 +13,31 @@ describe 'r18n-desktop' do
     expect(locale).not_to be_empty
   end
 
-  it 'loads I18n from system environment' do
-    R18n.from_env
-    expect(r18n.class).to eq R18n::I18n
-    expect(r18n.locale).not_to be_empty if String == r18n.locale.class
-    expect(R18n.get).to eq r18n
-  end
+  describe '.from_env' do
+    it 'loads I18n from system environment' do
+      R18n.from_env
+      expect(r18n.class).to eq R18n::I18n
+      expect(r18n.locale).not_to be_empty if String == r18n.locale.class
+      expect(R18n.get).to eq r18n
+    end
 
-  it 'loads i18n from system environment using specified order' do
-    R18n.from_env(nil, 'en')
-    expect(r18n.locale).to eq R18n.locale('en')
-    expect(R18n.get).to eq r18n
-  end
+    it 'loads i18n from system environment using specified order' do
+      R18n.from_env(nil, 'en')
+      expect(r18n.locale).to eq R18n.locale('en')
+      expect(R18n.get).to eq r18n
+    end
+
+    it 'allows to overide autodetect by LANG environment' do
+      allow(R18n::I18n).to receive(:system_locale) { 'ru' }
+      ENV['LANG'] = 'en'
+      R18n.from_env
+      expect(r18n.locale).to eq R18n.locale('en')
+    end
 
-  it 'allows to overide autodetect by LANG environment' do
-    allow(R18n::I18n).to receive(:system_locale) { 'ru' }
-    ENV['LANG'] = 'en'
-    R18n.from_env
-    expect(r18n.locale).to eq R18n.locale('en')
+    it 'works with following `R18n.set`' do
+      R18n.from_env 'spec/i18n/'
+      R18n.set 'en'
+      expect(t.account.balance).to eq 'Balance for account'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-desktop
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.1
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.1
 description: |2
       A i18n tool to translate your desktop application in several languages.
       It is just a wrapper for R18n core library.
@@ -48,11 +48,12 @@ files:
 - lib/r18n-desktop/posix.rb
 - lib/r18n-desktop/win32.rb
 - r18n-desktop.gemspec
+- spec/i18n/en.yml
 - spec/r18n-desktop_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ai/r18n/tree/master/r18n-desktop
 licenses:
-- LGPL-3
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -75,5 +76,6 @@ signing_key:
 specification_version: 4
 summary: A i18n tool to translate your Ruby desktop application.
 test_files:
+- spec/i18n/en.yml
 - spec/r18n-desktop_spec.rb
 - spec/spec_helper.rb