i18n-translators-tools 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec3d676d4b73931620ae4f14fda0380befb5e274
-  data.tar.gz: 43843b3512f6d599bff966fef2bc9609d15013c1
+  metadata.gz: 452d7e32ea216d619c8f0d7213a378f8d7caf788
+  data.tar.gz: 3b9958048d471852c791adc90859f810fcaa8e27
 SHA512:
-  metadata.gz: f8e345b907b4a1fd80758e97b279b075c68ff9c207844f6fcc0aa9897b281ce28b7bb385cab864eae1db2f5d0a73c97a04e9346d96e9bcc5d5d45bafff730267
-  data.tar.gz: e371e8bfbf1b3b3b096a17f9f2a6564223bd81af903bd8221b2103efa677a639cffe24c3f99ab0949ca933060081112fe377a3ed672586d8d3b8aa527d9e8e45
+  metadata.gz: 4e110260ed071de344d81cba88dbd2ba59658f577851eb84fec77908478345418c0cfd2b2f0500d03ca896979e1ff852dfe26f1c88ce8f9e5d16ffd10995c044
+  data.tar.gz: c42e9f56269148c3574a7ad10c9b153fa294e54c45b14a5d0e2500af4d9a3d1a68cbd157bba70cec72d591ee28dfa5c7aa15e6c9cdde748f0f30c331720b3477

data/i18n-translators-tools.gemspec

@@ -13,9 +13,9 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'i18n-translators-tools'
-  s.version = '0.2.5'
+  s.version = '0.2.6'
   s.date = Time.now.strftime("%Y-%m-%d")
-  s.add_dependency('i18n', '>= 0.5.0')
+  s.add_dependency('i18n', '>= 0.7.0')
   s.add_dependency('ya2yaml')
   s.require_path = 'lib'
   s.files = ["bin/i18n-translate", "README.md", "i18n-translators-tools.gemspec", "Rakefile"]
@@ -52,6 +52,9 @@ Functions:
   * statistics
 
 Changelog:
+  v0.2.6
+    * compatible with i18n 0.7.0
+    * make it works with rails 4.2
   v0.2.5
     * fix recursive directory scan (-r and --deep options should work now)
     * enables usage require 'i18n-translators-tools'

data/lib/i18n/backend/translate.rb

@@ -18,22 +18,39 @@ module I18n
       # wrapper which can work with both format
       # the simple and the Translator's
       def translate(locale, key, options = {})
-        result = super(locale, key, options)
-        return nil if result.kind_of?(String) and result.empty?
-        return result unless result.kind_of?(Hash)
-        return result unless result[:t] or result[:translation] or result[:default]
-
-        tr = result[:translation] || result[:t]
-        tr = result[:default] if tr.to_s.empty?
-
-        return nil if tr.to_s.empty?
-
-        values = options.except(*RESERVED_KEYS)
+        raise InvalidLocale.new(locale) unless locale
+        entry = key && lookup(locale, key, options[:scope], options)
+        entry = translate_to_i18n(entry)
+
+        if options.empty?
+          entry = resolve(locale, key, entry, options)
+        else
+          count, default = options.values_at(:count, :default)
+          values = options.except(*RESERVED_KEYS)
+          entry = entry.nil? && default ?
+              default(locale, key, default, options) : resolve(locale, key, entry, options)
+        end
+
+        throw(:exception, I18n::MissingTranslation.new(locale, key, options)) if entry.nil?
+        entry = entry.dup if entry.is_a?(String)
+
+        entry = pluralize(locale, entry, count) if count
+        entry = translate_to_i18n(entry) # after pluralization there can be enhanced format
+        entry = entry.dup if entry.is_a?(String)
+        entry = interpolate(locale, entry, values) if values
+
+        #throw(:exception, I18n::MissingTranslation.new(locale, key, options)) if entry.to_s.empty?
+
+        entry
+      end
 
-        tr = resolve(locale, key, tr, options)
-        tr = interpolate(locale, tr, values) if values
+      protected
 
-        tr
+      def translate_to_i18n(entry)
+        if entry.is_a?(Hash) && (entry[:translation] || entry[:t] || entry[:default])
+          entry = entry[:translation] || entry[:t] || entry[:default]
+        end
+        entry
       end
 
     end # module Backend::Translator

data/test/all.rb

@@ -87,6 +87,7 @@ I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 I18n::Backend::Simple.send(:include, I18n::Backend::PO)
 I18n::Backend::Simple.send(:include, I18n::Backend::TS)
 I18n::Backend::Simple.send(:include, I18n::Backend::Properties)
+I18n.config.enforce_available_locales = false
 I18n.default_locale = 'default'
 I18n.locale = 'cze'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-translators-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Petr Kovar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: ya2yaml
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,9 @@ post_install_message: |
     * statistics
 
   Changelog:
+    v0.2.6
+      * compatible with i18n 0.7.0
+      * make it works with rails 4.2
     v0.2.5
       * fix recursive directory scan (-r and --deep options should work now)
       * enables usage require 'i18n-translators-tools'