i18n-tasks 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc0724b7e7b8840f7043fed0dbe4057f344a81d
-  data.tar.gz: 074fcc2b73960b4f0558c983a43a363831ea76a0
+  metadata.gz: a5b450d463f4c435b2c29cb8625c0fc3b2f1f0fc
+  data.tar.gz: 8f3a640623471a782e3a3321aae671f51bf4c94d
 SHA512:
-  metadata.gz: ee3d14aecdad57a50957879f5b54ca48557f133aacfaa957ac6dc4a9ff118e5e22cafb2fbc511f46250b0003611ac83d8c09d435edbc2e3437bb14cdaa756ddc
-  data.tar.gz: d371fcbb050c80fa44bf3bf9db7fbaba474c30296a24b001f8f91b1e7069778ba904660b8d4ba14d0c075ddcb00dcb9722aedc156587b64a7fc8978c86dde1f9
+  metadata.gz: 6d95d020a9f643480f5e8022b69976355aafe6ed66955eeeb12a25f12c3aa4bce11f3d10e5807c29636690f087f289e089b21fc0634b251b26090f83690037a5
+  data.tar.gz: 0f2186c5897c723eb587af3471214c6b372590ce8f79e615aeb32afb7627aba003772061a44f2165908aeb000bd2067a64d077bbd7395fd85f04ef2d86617b64

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.4.4
+
+* Fix google translate issues with plural keys and translating from non-base locale
+
 ## 0.4.3
 
 * Ruby 1.9 compatibility

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 group :development do
   gem 'coveralls', require: false
-  gem 'byebug', platform: :mri_20, require: false
+  gem 'byebug', platform: :mri_21, require: false
 end

data/README.md

@@ -18,7 +18,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.4.3'
+gem 'i18n-tasks', '~> 0.4.4'
 ```
 
 i18n-tasks does not load or execute any of the application's code but performs static-only analysic.

data/bin/i18n-tasks

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8
 
 require 'i18n/tasks'
 require 'i18n/tasks/commands'

data/lib/i18n/tasks/data.rb

@@ -21,6 +21,12 @@ module I18n::Tasks
       data.t(key, locale)
     end
 
+    def missing_tree(locale, compared_to = base_locale)
+      data[compared_to].select_keys(root: false) { |key, node|
+        !key_value?(key, locale) && !ignore_key?(key, :missing)
+      }
+    end
+
     def tree(locale)
       data[locale][locale].children
     end

data/lib/i18n/tasks/data/tree/nodes.rb

@@ -32,6 +32,10 @@ module I18n::Tasks::Data::Tree
       @hash ||= map(&:to_hash).reduce(:deep_merge!) || {}
     end
 
+    def key_names
+      keys(root: false).map { |key, _node| key }
+    end
+
     delegate :to_json, to: :to_hash
     delegate :to_yaml, to: :to_hash
 

data/lib/i18n/tasks/fill_tasks.rb

@@ -11,8 +11,8 @@ module I18n::Tasks::FillTasks
   def fill_missing_google_translate(opts = {})
     from = opts[:from] || base_locale
     opts = opts.merge(
-        locales: non_base_locales(opts[:locales]),
-        keys:    proc { |locale| keys_to_fill(locale).select(&t_proc(from)).select { |k| t(k).is_a?(String) } },
+        locales: Array(opts[:locales]) - Array(from),
+        keys:    proc { |locale| missing_tree(locale, from).key_names.map(&:to_s) },
         values:  proc { |keys, locale|
           google_translate(keys.zip(keys.map(&t_proc(from))), to: locale, from: from).map(&:last)
         }

data/lib/i18n/tasks/missing_keys.rb

@@ -42,11 +42,7 @@ module I18n::Tasks
       return keys_missing_from_base if locale == base_locale
       @keys_missing_from_locale         ||= {}
       @keys_missing_from_locale[locale] ||= begin
-        keys = data[base_locale].keys(root: false).map { |key, node|
-          key = depluralize_key(key, locale)
-          next if ignore_key?(key, :missing) || key_value?(key, locale)
-          key
-        }.compact.uniq
+        keys = missing_tree(locale).key_names.map { |key| depluralize_key(key, locale) }.uniq
         KeyGroup.new keys, type: :missing_from_locale, locale: locale
       end
     end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis