i18n-tasks 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49fa662d252e8f812eedc6b79d0ecdf4e55b6979
-  data.tar.gz: 97deaf64038b50772fa22ea2c997f8997550fe3f
+  metadata.gz: 760bba77247fae6727219b0e36b605c01f760dff
+  data.tar.gz: 12e5076cdf6279ae466e8137c84ea7f08f155eb7
 SHA512:
-  metadata.gz: 0edb92a5f181c337826b617ca8d4d2d6d7d8a7299d6ba1fd7580eb2bf304e6789f69c842dcb8ddfbab57aa44b267e6bbf9d0852be18fb1fc33a683e8bb93dd9f
-  data.tar.gz: 576b66877ab863f4c06f2dffb351d11968e7ea73593c87390108227ba319b3618317f5c63b84697f94d057c4276b76771d20bc92018c9d03eddfdba26a43f347
+  metadata.gz: 739772e09dde3095da37f5e0e47e53ce03564448479867de3b6b4bc7300d1aad9c331b7182ce28f942e29032b6ba30524e398b627ae04d6ce2a05373c09a321c
+  data.tar.gz: 39e7fad91f6269ab0aff4e60ef9d44a6e48baa34c134b177e21974a2aaf2828382af8b640817e6a53efd482531742bcb788a1ce0d8727cb6d0f661b526acccb1

data/CHANGES.md

@@ -1,3 +1,12 @@
+## v0.2.14.
+
+* Google Translate fixes: preserve interpolations, set correct format based on the key (text or html).
+
+## v0.2.13
+
+* New setting relative_roots for relative key resolution (default: %w(app/views))
+* fix google translation attempts to translate non-string keys
+
 ## v0.2.11 .. v0.2.12
 
 * New task: `i18n:remove_unused`

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-#gem 'byebug'
+
 # Specify your gem's dependencies in i18n-tasks.gemspec
 gemspec
 

data/lib/i18n/tasks/configuration.rb

@@ -38,7 +38,6 @@ module I18n::Tasks::Configuration
       search_config = (config[:search] || {}).with_indifferent_access
       search_config.tap do |conf|
         conf[:paths]   = %w(app/) if conf[:paths].blank?
-        conf[:relative_roots] = %w( app/views ) if conf[:relative_roots].blank?
         conf[:include] = Array(conf[:include]) if conf[:include].present?
         conf[:exclude] = Array(conf[:exclude])
         conf[:pattern] = conf[:pattern].present? ? Regexp.new(conf[:pattern]) : DEFAULT_PATTERN

data/lib/i18n/tasks/fill_tasks.rb

@@ -27,8 +27,9 @@ module I18n::Tasks::FillTasks
         tr.present? && tr.is_a?(String)
       }
       if blank_keys.present?
-        translated   = blank_keys.zip google_translate(blank_keys.map { |k| t(k) }, to: locale, from: base_locale)
-        data[locale] = data[locale].deep_merge(list_to_tree translated)
+        data[locale] = data[locale].deep_merge(
+          list_to_tree google_translate(blank_keys.zip(blank_keys.map { |k| t(k) }), to: locale, from: base_locale)
+        )
       end
     end
   end

data/lib/i18n/tasks/google_translation.rb

@@ -1,16 +1,33 @@
 require 'easy_translate'
 
 module I18n::Tasks::GoogleTranslation
-  def google_translate(strings, opts)
-    return [] if strings.empty?
+  # @param [Array] list of [key, value] pairs
+  def google_translate(list, opts)
+    return [] if list.empty?
     opts = opts.dup
-    if (key = translation_config[:api_key]).present?
-      opts[:key] ||= key
+    if !opts[:key] && (key = translation_config[:api_key]).present?
+      opts[:key] = key
     end
     if opts[:key].blank?
       $stderr.puts(Term::ANSIColor.red Term::ANSIColor.yellow 'You may need to provide Google API key as GOOGLE_TRANSLATE_API_KEY or in config/i18n-tasks.yml.
 You can obtain the key at https://code.google.com/apis/console.')
     end
-    EasyTranslate.translate strings, opts
+    list.group_by { |k_v| k_v[0].end_with?('_html'.freeze) ? opts.merge(html: true) : opts.merge(format: 'text') }.map do |opts, strings|
+      fetch_google_translations(strings, opts)
+    end.reduce(:+)
+  end
+
+  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)
+    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!(UNTRANSLATABLE_STRING) { interpolation_keys[i += 1] }
+      end
+    }
+    list.map(&:first).zip(translated)
   end
 end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.2.13'
+    VERSION = '0.2.14'
   end
 end

data/spec/google_translate_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'Google Translation' do
+  include I18n::Tasks::GoogleTranslation
+
+  if ENV['GOOGLE_TRANSLATE_API_KEY']
+    context 'real world test' do
+      it 'works' do
+        google_translate(
+            [['common.hello', "Hello, %{user}!"]], from: :en, to: :es, key: ENV['GOOGLE_TRANSLATE_API_KEY']
+        ).should == [['common.hello', 'Hola, %{user}!']]
+      end
+    end
+  end
+end

data/spec/relative_keys_spec.rb

@@ -12,8 +12,7 @@ describe 'Relative keys' do
 
     context 'custom roots' do
       it 'works' do
-        task.relative_roots = %w(app/views-mobile)
-        task.absolutize_key('.title', 'app/views-mobile/movies/show.html.slim').should == 'movies.show.title'
+        task.absolutize_key('.title', 'app/views-mobile/movies/show.html.slim', %w(app/views-mobile)).should == 'movies.show.title'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -224,6 +224,7 @@ files:
 - spec/fixtures/app/views/index.html.slim
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/config/i18n-tasks.yml
+- spec/google_translate_spec.rb
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/readme_spec.rb
@@ -268,6 +269,7 @@ test_files:
 - spec/fixtures/app/views/index.html.slim
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/config/i18n-tasks.yml
+- spec/google_translate_spec.rb
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/readme_spec.rb