i18n-tasks 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1da0127b4f5d5823790e0b3e95609d72bc5d89ce
-  data.tar.gz: 4b3444adf44532e8c4cfa4906658f23f95f385c3
+  metadata.gz: ace77283059f5ec38fb4cf6eb85d51fa72ee175f
+  data.tar.gz: 2a9dc502ce2169a6c0e31a100346ff8ce8602c95
 SHA512:
-  metadata.gz: 7d914cabb6ace1ccf7f1eebf8dd68cd885a8929713edc095aebb7073e771cf06bb0ddcce78e1ff6df51562bc68ee11d8e6b1110f3120ad6d3093f985ae44fcb2
-  data.tar.gz: 2b8add28adae0c70a297e253dd104bc5877f95a68c4b5d16038f99d313b088b6268da15ca6e052e099be69308cfd2b758428ba276e64d94fdfb6e8cad6fbe2af
+  metadata.gz: fbb5e12fdd92b788e8f88fd755195bc7d6040e22221b7d7087d16e5d011bfae89109a6fe425fbcdab4d264955ddcd5c2877f17e66ebd663396f48aa3faeabead
+  data.tar.gz: bcf27a97b3fee099d9c1826f69e892060518e0fcc4d84ae89f64a4f638300e9faa4b6504396ddfe558153a1f689ecb21f6b683c581789354772dc38da275c662

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.7.3
+
+* New task `translate-tree`
+* Bugs fixed: [nil values and Google Translate](https://github.com/glebm/i18n-tasks/issues/85), [config file encoding issue](#82).
+
 ## 0.7.2
 
 * i18n-tasks now analyses itself! `internal_locale` setting has been added, that controls i18n-tasks reporting language.

data/README.md

@@ -25,7 +25,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.2'
+gem 'i18n-tasks', '~> 0.7.3'
 ```
 
 Copy default [configuration file](#configuration) (optional):
@@ -346,6 +346,14 @@ ignore:
 ### Google Translate
 
 `i18n-tasks translate-missing` requires a Google Translate API key, get it at [Google API Console](https://code.google.com/apis/console).
+
+Where this key is depends on your Google API console:
+
+* Old console: API Access -> Simple API Access -> Key for server apps.
+* New console: Project -> APIS & AUTH -> Credentials -> Public API access -> Key for server applications.
+
+In both cases, you may need to create the key if it doesn't exist.
+
 Put the key in `GOOGLE_TRANSLATE_API_KEY` environment variable or in the config file.
 
 ```yaml

data/config/i18n-tasks.yml

@@ -6,7 +6,7 @@ base_locale: en
 # locales: [en, es, fr]
 
 ## i18n-tasks report locale, default: en, available: en, ru
-internal_locale: ru
+internal_locale: en
 
 # Read and write locale data
 data:

data/config/locales/en.yml

@@ -57,6 +57,7 @@ en:
         add_missing: add missing keys to locale data
         remove_unused: remove unused keys
         eq_base: show translations equal to base value
+        tree_translate: Google Translate a tree to root locales
         tree_merge: merge trees
         tree_filter: filter tree by key pattern
         tree_rename_key: rename tree node
@@ -75,8 +76,8 @@ en:
           data_format: 'Data format: %{valid_text}. %{default_text}.'
           keys: List of keys separated by commas (,), spaces, or newlines.
           locales_filter: 'Comma-separated list of locale(s) to process. Default: all. Special: base.'
-          locales_to_translate_from: 'Locale to translate from (default: base)'
           locale: 'Locale. Default: base'
+          locale_to_translate_from: 'Locale to translate from (default: base)'
           confirm: Confirm automatically
           nostdin: Do not read from stdin
           strict: Do not infer dynamic key usage such as `t("category.\#{category.name}")`

data/config/locales/ru.yml

@@ -67,6 +67,7 @@ ru:
         gem_path: "показать путь к ruby gem"
         irb: "начать REPL сессию в контексте i18n-tasks"
         xlsx_report: "сохранить недостающие и неиспользуемые переводы в Excel-файл"
+        tree_translate: "Перевести дерево при помощи Google Translate на язык корневых узлов"
       args:
         default_text: "По умолчанию: %{value}"
         default_all: "По умолчанию: все"
@@ -76,7 +77,7 @@ ru:
           keys: "Список ключей, разделенных запятыми (,), пробелами или символами новой строки."
           locales_filter: "Список языков для обработки, разделенный запятыми (,). По умолчанию: все.
             Специальное значение: base."
-          locales_to_translate_from: "Язык с которого переводить (по умолчанию: base)"
+          locale_to_translate_from: "Язык, с которого переводить (по умолчанию: base)"
           locale: "Язык. По умолчанию: base"
           confirm: "Подтвердить автоматом"
           nostdin: "Не читать дерево из стандартного ввода"

data/lib/i18n/tasks/command/commands/missing.rb

@@ -22,16 +22,11 @@ module I18n::Tasks
         cmd :translate_missing,
             args: '[locale ...]',
             desc: proc { I18n.t('i18n_tasks.cmd.desc.translate_missing') },
-            opt:  [cmd_opt(:locales),
-                   cmd_opt(:locale).merge(short: :f, long: :from=, desc: proc {
-                     I18n.t('i18n_tasks.cmd.args.desc.locales_to_translate_from') }),
-                   cmd_opt(:out_format).except(:short)]
+            opt:  cmd_opts(:locales, :locale_to_translate_from) << cmd_opt(:out_format).except(:short)
 
         def translate_missing(opt = {})
-          from       = opt[:from]
-          translated = (opt[:locales] - [from]).inject i18n.empty_forest do |result, locale|
-            result.merge! i18n.google_translate_forest i18n.missing_tree(locale, from), from, locale
-          end
+          missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
+          translated = i18n.google_translate_forest missing, opt[:from]
           i18n.data.merge! translated
           log_stderr I18n.t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
           print_forest translated, opt

data/lib/i18n/tasks/command/commands/tree.rb

@@ -4,6 +4,18 @@ module I18n::Tasks
       module Tree
         include Command::Collection
 
+        cmd :tree_translate,
+            args: '[tree]',
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_translate') },
+            opt:  cmd_opts(:locale_to_translate_from) << cmd_opt(:data_format).except(:short)
+
+        def tree_translate(opts = {})
+          forest     = opt_forest_arg_or_stdin!(opts)
+          from       = opts[:from]
+          translated = i18n.google_translate_forest(forest, from)
+          print_forest translated, opts
+        end
+
         cmd :tree_merge,
             args: '[tree ...]',
             desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_merge') },

data/lib/i18n/tasks/command/options/locales.rb

@@ -7,7 +7,7 @@ module I18n::Tasks
         cmd_opt :locales, {
             short: :l,
             long:  :locales=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.locales_filter'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.locales_filter') },
             conf:  {as: Array, delimiter: /\s*[+:,]\s*/, default: 'all', argument: true, optional: false},
             parse: :parse_locales
         }
@@ -15,11 +15,16 @@ module I18n::Tasks
         cmd_opt :locale, {
             short: :l,
             long:  :locale=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.locale'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.locale') },
             conf:  {default: 'base', argument: true, optional: false},
             parse: :parse_locale
         }
 
+        cmd_opt :locale_to_translate_from, cmd_opt(:locale).merge(
+            short: :f,
+            long: :from=,
+            desc: proc { I18n.t('i18n_tasks.cmd.args.desc.locale_to_translate_from') })
+
         def parse_locales(opt, key = :locales)
           argv    = Array(opt[:arguments]) + Array(opt[key])
           locales = if argv == ['all'] || argv == 'all' || argv.blank?

data/lib/i18n/tasks/google_translation.rb

@@ -4,10 +4,12 @@ require 'i18n/tasks/html_keys'
 
 module I18n::Tasks
   module GoogleTranslation
-    def google_translate_forest(forest, from, to)
-      list   = forest.key_values(root: true)
-      values = google_translate_list(list, to: to, from: from).map(&:last)
-      Data::Tree::Siblings.from_flat_pairs list.map(&:first).zip(values)
+
+    def google_translate_forest(forest, from)
+      forest.inject empty_forest do |result, root|
+        translated = google_translate_list(root.key_values(root: true), to: root.key, from: from)
+        result.merge! Data::Tree::Siblings.from_flat_pairs(translated)
+      end
     end
 
     # @param [Array] list of [key, value] pairs
@@ -42,7 +44,7 @@ Get the key at https://code.google.com/apis/console.')
     end
 
     def to_values(list)
-      list.map { |l| dump_value l[1] }.flatten
+      list.map { |l| dump_value l[1] }.flatten.compact
     end
 
     def from_values(list, translated_values)
@@ -52,21 +54,28 @@ Get the key at https://code.google.com/apis/console.')
     end
 
     def dump_value(value)
-      if value.is_a?(Array)
-        # dump recursively
-        value.map { |v| dump_value v }
-      else
-        replace_interpolations value
+      case value
+        when Array
+          # dump recursively
+          value.map { |v| dump_value v }
+        when String
+          replace_interpolations value
+        else
+          value
       end
     end
 
     def parse_value(untranslated, each_translated)
-      if untranslated.is_a?(Array)
-        # implode array
-        untranslated.map { |from| parse_value(from, each_translated) }
-      else
-        value = each_translated.next
-        restore_interpolations untranslated, value
+      case untranslated
+        when Array
+          # implode array
+          untranslated.map { |from| parse_value(from, each_translated) }
+        when String
+          restore_interpolations untranslated, each_translated.next
+        when NilClass
+          nil
+        else
+          each_translated.next
       end
     end
 

data/lib/i18n/tasks/version.rb

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

data/spec/google_translate_spec.rb

@@ -6,12 +6,12 @@ describe 'Google Translation' do
   include I18n::Tasks::GoogleTranslation
 
   tests = [
-      text_test = ['key', "Hello - %{user} O'neill!", "Hola - %{user} O'neill!"],
-      html_test = ['html-key.html', "Hello - <b>%{user} O'neill</b>", "Hola - <b>%{user} O'neill</b>"],
-      array_test = ['array-key', ['Hello.', 'Goodbye.'], ['Hola.', 'Adiós.']]
+      nil_value_test = ['nil-value-key', nil, nil],
+      text_test      = ['key', "Hello - %{user} O'neill!", "Hola - %{user} O'neill!"],
+      html_test      = ['html-key.html', "Hello - <b>%{user} O'neill</b>", "Hola - <b>%{user} O'neill</b>"],
+      array_test     = ['array-key', ['Hello.', nil, '', 'Goodbye.'], ['Hola.', nil, '', 'Adiós.']]
   ]
 
-
   if ENV['GOOGLE_TRANSLATE_API_KEY']
     describe 'real world test' do
       delegate :i18n_cmd, :i18n_task, :in_test_app_dir, to: :TestCodebase
@@ -41,13 +41,14 @@ describe 'Google Translation' do
           in_test_app_dir do
             task.data[:en] = build_tree('en' => {
                 'common' => {
-                    'a' => 'λ',
-                    'hello' => text_test[1],
-                    'hello_html' => html_test[1],
-                    'array_key' => array_test[1]
+                    'a'             => 'λ',
+                    'hello'         => text_test[1],
+                    'hello_html'    => html_test[1],
+                    'array_key'     => array_test[1],
+                    'nil-value-key' => nil_value_test[1]
                 }
             })
-            task.data[:es] = build_tree('es' =>{
+            task.data[:es] = build_tree('es' => {
                 'common' => {
                     'a' => 'λ',
                 }
@@ -57,6 +58,7 @@ describe 'Google Translation' do
             expect(task.t('common.hello', 'es')).to eq(text_test[2])
             expect(task.t('common.hello_html', 'es')).to eq(html_test[2])
             expect(task.t('common.array_key', 'es')).to eq(array_test[2])
+            expect(task.t('nil-value-key', 'es')).to eq(nil_value_test[2])
             expect(task.t('common.a', 'es')).to eq('λ')
           end
         end

data/templates/config/i18n-tasks.yml

@@ -1,4 +1,4 @@
-# i18n-tasks finds and manages missing and unused translations ⚙ https://github.com/glebm/i18n-tasks
+# i18n-tasks finds and manages missing and unused translations https://github.com/glebm/i18n-tasks
 
 base_locale: en
 ## i18n-tasks detects locales automatically from the existing locale files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis