i18n-tasks 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1ad82cbc7ebc20ec9373f5061a16cd99f1f9ae8
-  data.tar.gz: e2804767ad2cecf501e3797b5aadbec8b5be4817
+SHA256:
+  metadata.gz: 84b3720d5321c4996a0cebe6b17a734445434d5aa549ebcc6771c09e1856bf6b
+  data.tar.gz: d966fc1e803e5cf34fe1dc61ddd37a10f56f5457b2749142511a38fb377e38ba
 SHA512:
-  metadata.gz: 6db5a8794c92840f1714bd1e929e4b955e19a05b23de45c8ebc760498d084d687e1702a332a584d215b619b9a36900bba192f16e1f31e936c7eb29a055a88c74
-  data.tar.gz: 6258135c86f6305493acea59754646426af11a1c1e2c657c4c95ea4010d80b24aad4276826ff69acfb52e4092fbcb346a01a57de135cc8df5d63d150a08f469a
+  metadata.gz: 2f90d7edb7ca9f661d0d5f8d36f25a19c14d58fdac1a540389f1b3e19c01e12835df8d1478619b8a45bddb42fd4852c91ea59b4a92c0f66ed696432202b331a9
+  data.tar.gz: 1407da83477f63875c56708aef038ac96d005897e5457b990bcc195d8738dbe1a857490939c2e7530cdb41380374c5291a3b55892cd80442af6ad3eda695a197

data/README.md

@@ -7,7 +7,7 @@ i18n-tasks helps you find and manage missing and unused translations.
 This gem analyses code statically for key usages, such as `I18n.t('some.key')`, in order to:
 
 * Report keys that are missing or unused.
-* Pre-fill missing keys, optionally from Google Translate.
+* Pre-fill missing keys, optionally from Google Translate or DeepL Pro.
 * Remove unused keys.
 
 Thus addressing the two main problems of [i18n gem][i18n-gem] design:
@@ -22,7 +22,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.9.21'
+gem 'i18n-tasks', '~> 0.9.22'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -83,7 +83,7 @@ Usage: i18n-tasks add-missing [options] [locale ...]
 
 ### Google Translate missing keys
 
-Translate missing values with Google Translate ([more below on the API key](#translation-config)).
+Translate missing values with Google Translate ([more below on the API key](#google-translation-config)).
 
 ```console
 $ i18n-tasks translate-missing
@@ -91,6 +91,16 @@ $ i18n-tasks translate-missing
 $ i18n-tasks translate-missing --from base es fr
 ```
 
+### DeepL Pro Translate missing keys
+
+Translate missing values with DeepL Pro Translate ([more below on the API key](#deepl-translation-config)).
+
+```console
+$ i18n-tasks translate-missing
+# accepts from and locales options:
+$ i18n-tasks translate-missing --backend deepl --from en
+```
+
 ### Find usages
 
 See where the keys are used with `i18n-tasks find`:
@@ -295,7 +305,7 @@ data:
     - 'config/locales/%{locale}.yml'
 ```
 
-If you want to have i18n-tasks reorganize your existing keys using `data.write`, either set the router to 
+If you want to have i18n-tasks reorganize your existing keys using `data.write`, either set the router to
 `pattern_router` as above, or run `i18n-tasks normalize -p` (forcing the use of the pattern router for that run).
 
 ##### Key pattern syntax
@@ -340,7 +350,7 @@ For more complex cases, you can implement a [custom scanner][custom-scanner-docs
 
 See the [config file][config] to find out more.
 
-<a name="translation-config"></a>
+<a name="google-translation-config"></a>
 ### Google Translate
 
 `i18n-tasks translate-missing` requires a Google Translate API key, get it at [Google API Console](https://code.google.com/apis/console).
@@ -357,7 +367,18 @@ Put the key in `GOOGLE_TRANSLATE_API_KEY` environment variable or in the config
 ```yaml
 # config/i18n-tasks.yml
 translation:
-  api_key: <Google Translate API key>
+  google_translate_api_key: <Google Translate API key>
+```
+
+<a name="deepl-translation-config"></a>
+### DeepL Pro Translate
+
+`i18n-tasks translate-missing` requires a DeepL Pro API key, get it at [DeepL](https://www.deepl.com/pro).
+
+```yaml
+# config/i18n-tasks.yml
+translation:
+  deepl_api_key: <Deep Pro API key>
 ```
 
 ## Interactive console

data/config/locales/en.yml

@@ -26,6 +26,7 @@ en:
           strict: >-
             Avoid inferring dynamic key usages such as t("cats.#{cat}.name"). Takes precedence over
             the config setting if set.
+          translation_backend: Translation backend (google or deepl)
           value: >-
             Value. Interpolates: %{value}, %{human_key}, %{key}, %{default}, %{value_or_human_key},
             %{value_or_default_or_human_key}
@@ -47,7 +48,7 @@ en:
         normalize: 'normalize translation data: sort and move to the right files'
         remove_unused: remove unused keys
         rm: remove the keys in locale data that match the given pattern
-        translate_missing: translate missing keys with Google Translate
+        translate_missing: translate missing keys with Google Translate or DeepL Pro
         tree_convert: convert tree between formats
         tree_filter: filter tree by key pattern
         tree_merge: merge trees
@@ -89,10 +90,16 @@ en:
         has %{key_count} keys in total. On average, values are %{value_chars_avg} characters long,
         keys have %{key_segments_avg} segments.
       title: Forest (%{locales})
+    deepl_translate:
+      errors:
+        no_api_key: >-
+          Setup DeepL Pro API key via DEEPL_AUTH_KEY environment variable or translation.deepl_api_key
+          in config/i18n-tasks.yml. Get the key at https://www.deepl.com/pro.
+        no_results: DeepL returned no results.
     google_translate:
       errors:
         no_api_key: >-
-          Set Google API key via GOOGLE_TRANSLATE_API_KEY environment variable or translation.api_key
+          Set Google API key via GOOGLE_TRANSLATE_API_KEY environment variable or translation.google_translate_api_key
           in config/i18n-tasks.yml. Get the key at https://code.google.com/apis/console.
         no_results: >-
           Google Translate returned no results. Make sure billing information is set at https://code.google.com/apis/console.

data/config/locales/ru.yml

@@ -23,6 +23,7 @@ ru:
           out_format: 'Формат вывода: %{valid_text}. %{default_text}.'
           pattern_router: 'Использовать pattern_router: ключи распределятся по файлам согласно data.write'
           strict: Не угадывать динамические использования ключей, например `t("category.#{category.key}")`
+          translation_backend: Движок перевода (google или deepl)
           value: >-
             Значение, интерполируется с %{value}, %{human_key}, %{key}, %{default}, %{value_or_human_key},
             %{value_or_default_or_human_key}
@@ -44,7 +45,7 @@ ru:
         normalize: нормализовать файлы переводов (сортировка и распределение)
         remove_unused: удалить неиспользуемые ключи
         rm: удалить ключи, которые соответствуют заданному шаблону
-        translate_missing: перевести недостающие переводы с Google Translate
+        translate_missing: перевести недостающие переводы с Google Translate / DeepL Pro
         tree_convert: преобразовать дерево между форматами
         tree_filter: фильтровать дерево по ключу
         tree_merge: объединенить деревья
@@ -85,10 +86,16 @@ ru:
       text_single_locale: >-
         %{key_count} ключей. В среднем, длина строки: %{value_chars_avg}, сегменты ключей: %{key_segments_avg}.
       title: 'Данные (%{locales}):'
+    deepl_translate:
+      errors:
+        no_api_key: >-
+          Задайте ключ API DeepL через переменную окружения DEEPL_AUTH_KEY или translation.deepl_api_key
+          Получите ключ через https://www.deepl.com/pro.
+        no_results: DeepL не дал результатов.
     google_translate:
       errors:
         no_api_key: >-
-          Задайте ключ API Google через переменную окружения GOOGLE_TRANSLATE_API_KEY или translation.api_key
+          Задайте ключ API Google через переменную окружения GOOGLE_TRANSLATE_API_KEY или translation.google_translate_api_key
           в config/i18n-tasks.yml. Получите ключ через https://code.google.com/apis/console.
         no_results: >-
           Google Translate не дал результатов. Убедитесь в том, что платежная информация добавлена

data/i18n-tasks.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'i18n/tasks/version'
 
@@ -37,6 +37,7 @@ TEXT
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.1.0'
+  s.add_dependency 'deepl-rb', '>= 2.1.0'
   s.add_dependency 'easy_translate', '>= 0.5.1'
   s.add_dependency 'erubi'
   s.add_dependency 'highline', '>= 1.7.3'
@@ -48,9 +49,7 @@ TEXT
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
-  s.add_development_dependency 'rubocop'
-  # Newer versions of SimpleCov do not work with the codeclimate-test-reporter gem, see:
-  # https://github.com/codeclimate/ruby-test-reporter/pull/181
-  s.add_development_dependency 'simplecov', '~> 0.13.0'
+  s.add_development_dependency 'rubocop', '~> 0.53.0'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
 end

data/lib/i18n/tasks/base_task.rb

@@ -11,6 +11,7 @@ require 'i18n/tasks/used_keys'
 require 'i18n/tasks/ignore_keys'
 require 'i18n/tasks/missing_keys'
 require 'i18n/tasks/unused_keys'
+require 'i18n/tasks/deepl_translation'
 require 'i18n/tasks/google_translation'
 require 'i18n/tasks/locale_pathname'
 require 'i18n/tasks/locale_list'
@@ -31,6 +32,7 @@ module I18n
       include IgnoreKeys
       include MissingKeys
       include UnusedKeys
+      include DeeplTranslation
       include GoogleTranslation
       include Logging
       include Configuration

data/lib/i18n/tasks/base_translator.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+module I18n::Tasks
+  class BaseTranslator
+    # @param [I18n::Tasks::BaseTask] i18n_tasks
+    def initialize(i18n_tasks)
+      @i18n_tasks = i18n_tasks
+    end
+
+    # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
+    # @param [String] from locale
+    # @return [I18n::Tasks::Tree::Siblings] translated forest
+    def translate_forest(forest, from)
+      forest.inject @i18n_tasks.empty_forest do |result, root|
+        translated = translate_pairs(root.key_values(root: true), to: root.key, from: from)
+        result.merge! Data::Tree::Siblings.from_flat_pairs(translated)
+      end
+    end
+
+    protected
+
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<[String, Object]>] translated list
+    def translate_pairs(list, opts)
+      return [] if list.empty?
+      opts = opts.dup
+      key_pos = list.each_with_index.inject({}) { |idx, ((k, _v), i)| idx.update(k => i) }
+      # copy reference keys as is, instead of translating
+      reference_key_vals = list.select { |_k, v| v.is_a? Symbol } || []
+      list -= reference_key_vals
+      result = list.group_by { |k_v| @i18n_tasks.html_key? k_v[0], opts[:from] }.map do |is_html, list_slice|
+        fetch_translations list_slice, opts.merge(is_html ? options_for_html : options_for_plain)
+      end.reduce(:+) || []
+      result.concat(reference_key_vals)
+      result.sort! { |a, b| key_pos[a[0]] <=> key_pos[b[0]] }
+      result
+    end
+
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<[String, Object]>] translated list
+    def fetch_translations(list, opts)
+      from_values(list, translate_values(to_values(list), **options_for_translate_values(**opts))).tap do |result|
+        fail CommandError, no_results_error_message if result.blank?
+      end
+    end
+
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<String>] values for translation extracted from list
+    def to_values(list)
+      list.map { |l| dump_value l[1] }.flatten.compact
+    end
+
+    # @param [Array<[String, Object]>] list
+    # @param [Array<String>] translated_values
+    # @return [Array<[String, Object]>] translated key-value pairs
+    def from_values(list, translated_values)
+      keys                = list.map(&:first)
+      untranslated_values = list.map(&:last)
+      keys.zip parse_value(untranslated_values, translated_values.to_enum)
+    end
+
+    # Prepare value for translation.
+    # @return [String, Array<String, nil>, nil] value for Google Translate or nil for non-string values
+    def dump_value(value)
+      case value
+      when Array
+        # dump recursively
+        value.map { |v| dump_value v }
+      when String
+        replace_interpolations value
+      end
+    end
+
+    # Parse translated value from the each_translated enumerator
+    # @param [Object] untranslated
+    # @param [Enumerator] each_translated
+    # @return [Object] final translated value
+    def parse_value(untranslated, each_translated)
+      case untranslated
+      when Array
+        # implode array
+        untranslated.map { |from| parse_value(from, each_translated) }
+      when String
+        restore_interpolations untranslated, each_translated.next
+      else
+        untranslated
+      end
+    end
+
+    INTERPOLATION_KEY_RE  = /%\{[^}]+}/
+    UNTRANSLATABLE_STRING = 'zxzxzx'
+
+    # @param [String] value
+    # @return [String] 'hello, %{name}' => 'hello, <round-trippable string>'
+    def replace_interpolations(value)
+      i = -1
+      value.gsub INTERPOLATION_KEY_RE do
+        i += 1
+        "#{UNTRANSLATABLE_STRING}#{i}"
+      end
+    end
+
+    # @param [String] untranslated
+    # @param [String] translated
+    # @return [String] 'hello, <round-trippable string>' => 'hello, %{name}'
+    def restore_interpolations(untranslated, translated)
+      return translated if untranslated !~ INTERPOLATION_KEY_RE
+      values = untranslated.scan(INTERPOLATION_KEY_RE)
+      translated.gsub(/#{Regexp.escape(UNTRANSLATABLE_STRING)}\d+/i) do |m|
+        values[m[UNTRANSLATABLE_STRING.length..-1].to_i]
+      end
+    rescue StandardError => e
+      raise_interpolation_error(untranslated, translated, e)
+    end
+
+    def raise_interpolation_error(untranslated, translated, e)
+      fail CommandError.new(e, <<-TEXT.strip)
+Error when restoring interpolations:
+  original: "#{untranslated}"
+  response: "#{translated}"
+  error: #{e.message} (#{e.class.name})
+      TEXT
+    end
+
+    # @param [Array<String>] list
+    # @param [Hash] options
+    # @return [Array<String>]
+    # @abstract
+    def translate_values(list, **options); end
+
+    # @param [Hash] options
+    # @return [Hash]
+    # @abstract
+    def options_for_translate_values(options); end
+
+    # @return [Hash]
+    # @abstract
+    def options_for_html; end
+
+    # @return [Hash]
+    # @abstract
+    def options_for_plain; end
+
+    # @return [String]
+    # @abstract
+    def no_results_error_message; end
+  end
+end

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

@@ -36,11 +36,16 @@ module I18n::Tasks
         cmd :translate_missing,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.translate_missing'),
-            args: [:locales, :locale_to_translate_from, arg(:out_format).from(1)]
+            args: [:locales, :locale_to_translate_from, arg(:out_format).from(1), :translation_backend]
 
         def translate_missing(opt = {})
           missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
-          translated = i18n.google_translate_forest missing, opt[:from]
+          translated = case opt[:backend]
+                       when 'deepl'
+                         i18n.deepl_translate_forest missing, opt[:from]
+                       when 'google'
+                         i18n.google_translate_forest missing, opt[:from]
+                       end
           i18n.data.merge! translated
           log_stderr t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
           print_forest translated, opt

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

@@ -30,6 +30,14 @@ module I18n::Tasks
             t('i18n_tasks.cmd.args.desc.locale_to_translate_from'),
             parser:  OptionParsers::Locale::Parser,
             default: 'base'
+
+        TRANSLATION_BACKENDS = %w[google deepl].freeze
+        arg :translation_backend,
+            '-b',
+            '--backend BACKEND',
+            t('i18n_tasks.cmd.args.desc.translation_backend'),
+            parser:  OptionParsers::Locale::Parser,
+            default: TRANSLATION_BACKENDS[0]
       end
     end
   end

data/lib/i18n/tasks/configuration.rb

@@ -57,7 +57,8 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   def translation_config
     @config_sections[:translation] ||= begin
       conf = (config[:translation] || {}).with_indifferent_access
-      conf[:api_key] ||= ENV['GOOGLE_TRANSLATE_API_KEY'] if ENV.key?('GOOGLE_TRANSLATE_API_KEY')
+      conf[:google_translate_api_key] = ENV['GOOGLE_TRANSLATE_API_KEY'] if ENV.key?('GOOGLE_TRANSLATE_API_KEY')
+      conf[:deepl_api_key] = ENV['DEEPL_AUTH_KEY'] if ENV.key?('DEEPL_AUTH_KEY')
       conf
     end
   end

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

@@ -179,7 +179,7 @@ module I18n::Tasks
           )
         end
         pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern) if key_pattern.present?
-        keys.each do |key, node| # rubocop:disable Performance/HashEachMethods
+        keys.each do |key, node|
           next if pattern_re && key !~ pattern_re
           node.value = value_proc.call(node)
         end

data/lib/i18n/tasks/deepl_translation.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'deepl'
+require 'i18n/tasks/html_keys'
+require 'i18n/tasks/base_translator'
+
+module I18n::Tasks
+  module DeeplTranslation
+    # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
+    # @param [String] from locale
+    # @return [I18n::Tasks::Tree::Siblings] translated forest
+    def deepl_translate_forest(forest, from)
+      DeeplTranslator.new(self).translate_forest(forest, from)
+    end
+  end
+
+  class DeeplTranslator < BaseTranslator
+    def initialize(*)
+      super
+      configure_api_key!
+    end
+
+    def translate_values(list, from:, to:, **options)
+      DeepL.translate(list, from, to, options).map(&:text)
+    end
+
+    def options_for_translate_values(**options)
+      { ignore_tags: %w[i18n] }.merge(options)
+    end
+
+    def options_for_html
+      { tag_handling: 'xml' }
+    end
+
+    def options_for_plain
+      { preserve_formatting: true }
+    end
+
+    # @param [String] value
+    # @return [String] 'hello, %{name}' => 'hello, <i18n>%{name}</i18n>'
+    def replace_interpolations(value)
+      value.gsub(INTERPOLATION_KEY_RE, '<i18n>\0</i18n>')
+    end
+
+    # @param [String] untranslated
+    # @param [String] translated
+    # @return [String] 'hello, <i18n>%{name}</i18n>' => 'hello, %{name}'
+    def restore_interpolations(untranslated, translated)
+      return translated if untranslated !~ INTERPOLATION_KEY_RE
+      translated.gsub(%r{<\/?i18n>}, '')
+    rescue StandardError => e
+      raise_interpolation_error(untranslated, translated, e)
+    end
+
+    def no_results_error_message
+      I18n.t('i18n_tasks.deepl_translate.errors.no_results')
+    end
+
+    private
+
+    def configure_api_key!
+      api_key = @i18n_tasks.translation_config[:deepl_api_key]
+      fail CommandError, I18n.t('i18n_tasks.deepl_translate.errors.no_api_key') if api_key.blank?
+      DeepL.configure { |config| config.auth_key = api_key }
+    end
+  end
+end

data/lib/i18n/tasks/google_translation.rb

@@ -2,6 +2,7 @@
 
 require 'easy_translate'
 require 'i18n/tasks/html_keys'
+require 'i18n/tasks/base_translator'
 
 module I18n::Tasks
   module GoogleTranslation
@@ -9,117 +10,58 @@ module I18n::Tasks
     # @param [String] from locale
     # @return [I18n::Tasks::Tree::Siblings] translated forest
     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<[String, Object]>] list of key-value pairs
-    # @return [Array<[String, Object]>] translated list
-    def google_translate_list(list, opts) # rubocop:disable Metrics/AbcSize
-      return [] if list.empty?
-      opts = opts.dup
-      opts[:key] ||= translation_config[:api_key]
-      validate_google_translate_api_key! opts[:key]
-      key_pos = list.each_with_index.inject({}) { |idx, ((k, _v), i)| idx.update(k => i) }
-      # copy reference keys as is, instead of translating
-      reference_key_vals = list.select { |_k, v| v.is_a? Symbol } || []
-      list -= reference_key_vals
-      result = list.group_by { |k_v| html_key? k_v[0], opts[:from] }.map do |is_html, list_slice|
-        fetch_google_translations list_slice, opts.merge(is_html ? { html: true } : { format: 'text' })
-      end.reduce(:+) || []
-      result.concat(reference_key_vals)
-      result.sort! { |a, b| key_pos[a[0]] <=> key_pos[b[0]] }
-      result
-    end
-
-    # @param [Array<[String, Object]>] list of key-value pairs
-    # @return [Array<[String, Object]>] translated list
-    def fetch_google_translations(list, opts)
-      from_values(list, EasyTranslate.translate(to_values(list), opts)).tap do |result|
-        fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_results') if result.blank?
-      end
+      GoogleTranslator.new(self).translate_forest(forest, from)
     end
+  end
 
-    private
+  class GoogleTranslator < BaseTranslator
+    SUPPORTED_LOCALES_WITH_REGION = %w[zh-CN zh-TW].freeze
 
-    def validate_google_translate_api_key!(key)
-      fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_api_key') if key.blank?
+    def translate_values(list, **options)
+      EasyTranslate.translate(list, options)
     end
 
-    # @param [Array<[String, Object]>] list of key-value pairs
-    # @return [Array<String>] values for translation extracted from list
-    def to_values(list)
-      list.map { |l| dump_value l[1] }.flatten.compact
+    def options_for_translate_values(from:, to:, **options)
+      options.merge(
+        api_key: api_key,
+        from: to_google_translate_compatible_locale(from),
+        to: to_google_translate_compatible_locale(to)
+      )
     end
 
-    # @param [Array<[String, Object]>] list
-    # @param [Array<String>] translated_values
-    # @return [Array<[String, Object]>] translated key-value pairs
-    def from_values(list, translated_values)
-      keys                = list.map(&:first)
-      untranslated_values = list.map(&:last)
-      keys.zip parse_value(untranslated_values, translated_values.to_enum)
+    def options_for_html
+      { html: true }
     end
 
-    # Prepare value for translation.
-    # @return [String, Array<String, nil>, nil] value for Google Translate or nil for non-string values
-    def dump_value(value)
-      case value
-      when Array
-        # dump recursively
-        value.map { |v| dump_value v }
-      when String
-        replace_interpolations value
-      end
+    def options_for_plain
+      { format: 'text' }
     end
 
-    # Parse translated value from the each_translated enumerator
-    # @param [Object] untranslated
-    # @param [Enumerator] each_translated
-    # @return [Object] final translated value
-    def parse_value(untranslated, each_translated)
-      case untranslated
-      when Array
-        # implode array
-        untranslated.map { |from| parse_value(from, each_translated) }
-      when String
-        restore_interpolations untranslated, each_translated.next
-      else
-        untranslated
-      end
+    def no_results_error_message
+      I18n.t('i18n_tasks.google_translate.errors.no_results')
     end
 
-    INTERPOLATION_KEY_RE  = /%\{[^}]+}/
-    UNTRANSLATABLE_STRING = 'zxzxzx'
+    private
 
-    # @param [String] value
-    # @return [String] 'hello, %{name}' => 'hello, <round-trippable string>'
-    def replace_interpolations(value)
-      i = -1
-      value.gsub INTERPOLATION_KEY_RE do
-        i += 1
-        "#{UNTRANSLATABLE_STRING}#{i}"
-      end
+    # Convert 'es-ES' to 'es'
+    def to_google_translate_compatible_locale(locale)
+      return locale unless locale.include?('-') && !SUPPORTED_LOCALES_WITH_REGION.include?(locale)
+      locale.split('-', 2).first
     end
 
-    # @param [String] untranslated
-    # @param [String] translated
-    # @return [String] 'hello, <round-trippable string>' => 'hello, %{name}'
-    def restore_interpolations(untranslated, translated)
-      return translated if untranslated !~ INTERPOLATION_KEY_RE
-      values = untranslated.scan(INTERPOLATION_KEY_RE)
-      translated.gsub(/#{Regexp.escape(UNTRANSLATABLE_STRING)}\d+/i) do |m|
-        values[m[UNTRANSLATABLE_STRING.length..-1].to_i]
+    def api_key
+      @api_key ||= begin
+        key = @i18n_tasks.translation_config[:google_translate_api_key]
+        # fallback with deprecation warning
+        if @i18n_tasks.translation_config[:api_key]
+          @i18n_tasks.warn_deprecated(
+            'Please rename Google Translate API Key from `api_key` to `google_translate_api_key`.'
+          )
+          key ||= translation_config[:api_key]
+        end
+        fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_api_key') if key.blank?
+        key
       end
-    rescue StandardError => e
-      raise CommandError.new(e, <<-TEXT.strip)
-Error when restoring interpolations:
-  original: "#{untranslated}"
-  response: "#{translated}"
-  error: #{e.message} (#{e.class.name})
-      TEXT
     end
   end
 end

data/lib/i18n/tasks/scanners/pattern_scanner.rb

@@ -65,7 +65,7 @@ module I18n::Tasks::Scanners
       re && re =~ line
     end
 
-    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/ # rubocop:disable Lint/InterpolationCheck
+    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/
 
     def valid_key?(key)
       if @config[:strict]

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.21'
+    VERSION = '0.9.22'
   end
 end

data/templates/config/i18n-tasks.yml

@@ -82,10 +82,14 @@ search:
   ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
   ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
 
-## Google Translate
+## Translation Services
 # translation:
+#   # Google Translate
 #   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
-#   api_key: "AbC-dEf5"
+#   google_translate_api_key: "AbC-dEf5"
+#   # DeepL Pro Translate
+#   # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro
+#   deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"
 
 ## Do not consider these keys missing:
 # ignore_missing:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: deepl-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: easy_translate
   requirement: !ruby/object:Gem::Requirement
@@ -202,30 +216,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,7 @@ files:
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/base_translator.rb
 - lib/i18n/tasks/cli.rb
 - lib/i18n/tasks/command/collection.rb
 - lib/i18n/tasks/command/commander.rb
@@ -295,6 +310,7 @@ files:
 - lib/i18n/tasks/data/tree/nodes.rb
 - lib/i18n/tasks/data/tree/siblings.rb
 - lib/i18n/tasks/data/tree/traversal.rb
+- lib/i18n/tasks/deepl_translation.rb
 - lib/i18n/tasks/google_translation.rb
 - lib/i18n/tasks/html_keys.rb
 - lib/i18n/tasks/ignore_keys.rb
@@ -361,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis