i18n-tasks 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03263ddf669098e8580e4656d41e7b15d2ba5721
-  data.tar.gz: ae4bcf9dee99a2e6cb19e6ee2d52cc34b281e335
+  metadata.gz: 334c00605d3e55a82e36c72359bdf31a17bd54f2
+  data.tar.gz: f0240ff3e7452b1509c18cc0b5c33f6eecd8b7ec
 SHA512:
-  metadata.gz: 69aff7e4e6369e2fe1c622255bfda9290a3141eeb28be0fa368af1be3f568e1934d65ee77e66d180025bd2c9279ca4a0aff73e7135fa21b538b1a00941e26540
-  data.tar.gz: e21ca15833a7a7822ce166599863e3d6184cdc7a9535740554cf7e7b29a10e7c013cb34a3be4b54d6a8be4a5d53fb18a1038a9d3a2ce4bbeef06664e2d5f8a1e
+  metadata.gz: 53a6c2668b4a31bc8049b2c0b08ea4c76aa0e30e6740c83a70878820965a77efa8d47f2639407b21e8b306ea6a9e581c344933b484f737a650dd4f3df0991392
+  data.tar.gz: 9a50045d591c8aa773e31e2223739eb814ab9010e8a7d6f9b603c76fe0bbd791c643ebbbd8acc1954eec3b241febefaf652a4f67a7514b59552dacaf68d2f9fb

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.6.1
+
+* Fix Google Translate issue with plural keys and missing billing info error
+
 ## 0.6.0
 
 * New output format options for reports: yaml, json, and inspect.

data/README.md

@@ -127,7 +127,7 @@ Inspect configuration with `i18n-tasks config`.
 Install the default config file with:
 
 ```bash
-cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml spec/
+cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
 ```
 
 ### Locales

data/lib/i18n/tasks/fill_tasks.rb

@@ -20,7 +20,7 @@ module I18n::Tasks
       from    = opts[:from] || base_locale
       locales = (Array(opts[:locales]).presence || self.locales) - [from]
       locales.each do |locale|
-        keys   = missing_tree(locale, from).key_names.map(&:to_s)
+        keys   = missing_tree(locale, from, false).key_names.map(&:to_s)
         values = google_translate(keys.zip(keys.map(&t_proc(from))), to: locale, from: from).map(&:last)
 
         data[locale] = data[locale].merge! Data::Tree::Node.new(

data/lib/i18n/tasks/google_translation.rb

@@ -1,51 +1,54 @@
 # coding: utf-8
 require 'easy_translate'
 
-module I18n::Tasks::GoogleTranslation
-  # @param [Array] list of [key, value] pairs
-  def google_translate(list, opts)
-    return [] if list.empty?
-    opts = opts.dup
-    if !opts[:key] && (key = translation_config[:api_key]).present?
-      opts[:key] = key
-    end
-    if opts[:key].blank?
-      warn_missing_api_key
-      return []
+module I18n::Tasks
+  module GoogleTranslation
+    # @param [Array] list of [key, value] pairs
+    def google_translate(list, opts)
+      return [] if list.empty?
+      opts = opts.dup
+      if !opts[:key] && (key = translation_config[:api_key]).present?
+        opts[:key] = key
+      end
+      if opts[:key].blank?
+        warn_missing_api_key
+        return []
+      end
+      key_idx = {}
+      list.each_with_index { |k_v, i| key_idx[k_v[0]] = i }
+      list.group_by { |k_v|
+        k_v[0].end_with?('_html'.freeze)
+      }.map do |html, slice|
+        t_opts = opts.merge(html ? {html: true} : {format: 'text'})
+        fetch_google_translations slice, t_opts
+      end.reduce(:+).tap { |l|
+        l.sort! { |a, b| key_idx[a[0]] <=> key_idx[b[0]] }
+      }
     end
-    key_idx = {}
-    list.each_with_index { |k_v, i| key_idx[k_v[0]] = i}
-    list.group_by { |k_v|
-      k_v[0].end_with?('_html'.freeze)
-    }.map do |html, slice|
-      t_opts = opts.merge(html ? {html: true} : {format: 'text'})
-      fetch_google_translations slice, t_opts
-    end.reduce(:+).tap { |l|
-      l.sort! { |a, b| key_idx[a[0]] <=> key_idx[b[0]] }
-    }
-  end
 
-  INTERPOLATION_KEY_RE = /%\{[^}]+\}/
-  UNTRANSLATABLE_STRING = 'zxzxzx'
+    INTERPOLATION_KEY_RE  = /%\{[^}]+\}/
+    UNTRANSLATABLE_STRING = 'zxzxzx'
 
-  def fetch_google_translations(list, opts)
-    translated = EasyTranslate.translate(list.map { |l| l[1].gsub(INTERPOLATION_KEY_RE, UNTRANSLATABLE_STRING) }, opts)
-    if translated.blank?
-      raise CommandError.new('Google Translate returned no results. Make sure billing information is set at https://code.google.com/apis/console.')
-    end
-    translated.each_with_index { |translation, i|
-      if (original = list[i][1]) =~ INTERPOLATION_KEY_RE
-        interpolation_keys = original.scan(INTERPOLATION_KEY_RE)
-        i = -1; translation.gsub!(Regexp.new(UNTRANSLATABLE_STRING, Regexp::IGNORECASE)) { interpolation_keys[i += 1] }
+    def fetch_google_translations(list, opts)
+      translated = EasyTranslate.translate(list.map { |l| l[1].gsub(INTERPOLATION_KEY_RE, UNTRANSLATABLE_STRING) }, opts)
+      if translated.blank?
+        raise CommandError.new('Google Translate returned no results. Make sure billing information is set at https://code.google.com/apis/console.')
       end
-    }
-    list.map(&:first).zip(translated)
-  end
+      translated.each_with_index { |translation, i|
+        if (original = list[i][1]) =~ INTERPOLATION_KEY_RE
+          interpolation_keys = original.scan(INTERPOLATION_KEY_RE)
+          i                  = -1
+          translation.gsub!(Regexp.new(UNTRANSLATABLE_STRING, Regexp::IGNORECASE)) { interpolation_keys[i += 1] }
+        end
+      }
+      list.map(&:first).zip(translated)
+    end
 
-  private
+    private
 
-  def warn_missing_api_key
-    $stderr.puts Term::ANSIColor.red Term::ANSIColor.yellow 'Set Google API key via GOOGLE_TRANSLATE_API_KEY environmnet variable or translation.api_key in config/i18n-tasks.yml.
+    def warn_missing_api_key
+      $stderr.puts Term::ANSIColor.red Term::ANSIColor.yellow 'Set Google API key via GOOGLE_TRANSLATE_API_KEY environmnet variable or translation.api_key in config/i18n-tasks.yml.
 Get the key at https://code.google.com/apis/console.'
+    end
   end
 end

data/lib/i18n/tasks/missing_keys.rb

@@ -50,19 +50,19 @@ module I18n::Tasks
       end
     end
 
-    def missing_tree(locale, compared_to)
+    def missing_tree(locale, compared_to, collapse_plural = true)
       if locale == compared_to
         missing_used_tree locale
       else
-        missing_diff_tree locale, compared_to
+        missing_diff_tree locale, compared_to, collapse_plural
       end
     end
 
     # keys present in compared_to, but not in locale
-    def missing_diff_tree(locale, compared_to = base_locale)
+    def missing_diff_tree(locale, compared_to = base_locale, collapse_plural = true)
       data[compared_to].select_keys { |key, _node|
         locale_key_missing?(locale, key)
-      }.set_root_key(locale, type: :missing_diff).tap { |t| collapse_plural_nodes!(t) }
+      }.set_root_key(locale, type: :missing_diff).tap { |t| collapse_plural_nodes!(t) if collapse_plural }
     end
 
     # keys used in the code missing translations in locale

data/lib/i18n/tasks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis