i18n_plus 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d846b4e2848b9aef2c957d8340029b9a870f3600
-  data.tar.gz: a92afb665d7632541e89ab72b352c7820c9e71f5
+  metadata.gz: bfe521e9da818def80a2e4ee4161ff31b8c17c6e
+  data.tar.gz: a702755030ac27e0231b471a705c500da3c28eee
 SHA512:
-  metadata.gz: cfe55a4be97a2b84b09709e85b7e437410699199f5ca74bf6296e713197cc092200f57e5946e49d29207b4afedf235b6a58776e1048121e6f966866f292e68d1
-  data.tar.gz: 4cfb12ea8cd0012aea8131e0337e1b9b3acc2dc412632e990390cfa15399217bd714aba3afad5ef1607651aed51ebb8c756c3efbdaaf4d11bf752a3e14bdf0b0
+  metadata.gz: 4973ac195f0de5848838712a0f68195a00102468563cee8b7ba358094f98119464110aba445a7602049aa255a84cb4f3ab2f3d92e67b9af099e5d98c466ec637
+  data.tar.gz: 3eede5bf87259a4cb577c9162d0a456a7ab8085969bdf204710127622167486283aa332498238ac7d065ac3bca25f8e5ca0c773a7d8e3a56232aa048b19ca050

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Oliver Eilhard
+Copyright (c) 2010-present Oliver Eilhard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/i18n_plus/country.rb

@@ -6,7 +6,9 @@ module I18nPlus
 
   def self.countries(*args)
     options = args.extract_options!
-    locale = (options[:locale] || I18n.locale || I18n.default_locale).to_s.downcase
+    locale = (options[:locale] || I18n.locale || I18n.default_locale || :en).to_s[0..1].downcase
+    # Fallback to English if we don't use English or German
+    locale = 'en' unless ['de', 'en'].include?(locale)
     COUNTRIES[locale]
   end
 

data/lib/i18n_plus/currency.rb

@@ -6,7 +6,9 @@ module I18nPlus
 
   def self.currencies(*args)
     options = args.extract_options!
-    locale = (options[:locale] || I18n.locale || I18n.default_locale).to_s.downcase
+    locale = (options[:locale] || I18n.locale || I18n.default_locale || :en).to_s[0..1].downcase
+    # Fallback to English if we don't use English or German
+    locale = 'en' unless ['de', 'en'].include?(locale)
     CURRENCIES[locale]
   end
 

data/lib/i18n_plus/language.rb

@@ -6,7 +6,9 @@ module I18nPlus
 
   def self.languages(*args)
     options = args.extract_options!
-    locale = (options[:locale] || I18n.locale || I18n.default_locale).to_s.downcase
+    locale = (options[:locale] || I18n.locale || I18n.default_locale || :en).to_s[0..1].downcase
+    # Fallback to English if we don't use English or German
+    locale = 'en' unless ['de', 'en'].include?(locale)
     LANGUAGES[locale]
   end
 

data/lib/i18n_plus/locale.rb

@@ -6,7 +6,9 @@ module I18nPlus
 
   def self.locales(*args)
     options = args.extract_options!
-    locale = (options[:locale] || I18n.locale || I18n.default_locale).to_s.downcase
+    locale = (options[:locale] || I18n.locale || I18n.default_locale || :en).to_s[0..1].downcase
+    # Fallback to English if we don't use English or German
+    locale = 'en' unless ['de', 'en'].include?(locale)
     LOCALES[locale]
   end
 

data/lib/i18n_plus/state.rb

@@ -6,7 +6,9 @@ module I18nPlus
 
   def self.states(country_code, *args)
     options = args.extract_options!
-    locale = (options[:locale] || I18n.locale || I18n.default_locale).to_s.downcase
+    locale = (options[:locale] || I18n.locale || I18n.default_locale || :en).to_s[0..1].downcase
+    # Fallback to English if we don't use English or German
+    locale = 'en' unless ['de', 'en'].include?(locale)
     STATES[locale][country_code.to_s.upcase]
   end
 

data/lib/i18n_plus/version.rb

@@ -1,3 +1,3 @@
 module I18nPlus
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/state_test.rb

@@ -38,11 +38,11 @@ class StateTest < ActiveSupport::TestCase
     assert_not_nil results = state_select(@account, :state, 'DE').gsub(/\n/, '')
 
     if ActiveSupport::VERSION::STRING < '4.0'
-      assert_match /<select id="account_state" name="account\[state\]">/, results
-      assert_match /<option value="BY" selected="selected">Bavaria<\/option>/, results
+      assert_match(/<select id="account_state" name="account\[state\]">/, results)
+      assert_match(/<option value="BY" selected="selected">Bavaria<\/option>/, results)
     else
-      assert_match /<select name="account\[state\]" id="account_state">/, results
-      assert_match /<option selected="selected" value="BY">Bavaria<\/option>/, results
+      assert_match(/<select name="account\[state\]" id="account_state">/, results)
+      assert_match(/<option selected="selected" value="BY">Bavaria<\/option>/, results)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_plus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Oliver Eilhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -76,70 +76,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.5
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.5
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
 description: A library for i18n of countries, states, currencies, and locales.
 email:
 - oliver.eilhard@gmail.com
@@ -171,7 +171,8 @@ files:
 - test/locale_test.rb
 - test/state_test.rb
 homepage: http://github.com/olivere/i18n_plus
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -190,10 +191,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A library for i18n of countries, states, currencies, and locales.
+summary: Internally used for working with countries, currencies, and locales. Only
+  supports English and German.
 test_files:
 - test/country_test.rb
 - test/currency_test.rb