i18n-tasks 0.9.27 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3259a9c8894c28f8372fefdd509e2dc8240d40d8ead58b284fc9887f9c30d2c4
-  data.tar.gz: cd9003f49d146342de7466f42478f2bddd94cfcb108752d1a2fb8109900a3abe
+  metadata.gz: bcf38124b967eb00a21ca02f9e894a22941d95e590024971144131cd61856f70
+  data.tar.gz: 9ffb6f291f36f0015ad22ad26981d7b605dad695f723517bb928287cd091ecaa
 SHA512:
-  metadata.gz: 4a05cf473e34cc265fd70ad193aa849698dafca63b6d76542170d6d119b9d4c453ae06cd1b23d2c9ce3b6943e0d3e14865bb62ffe4cc3c2ab591e432530a2a28
-  data.tar.gz: 6d9fe81237a10d0fec00ab1bb588d45beb3085ef8342dd644bcc059547b079971aad039d1f17203d16439eece482ca83904f29fdf6e99d6cabe7481667b336a9
+  metadata.gz: 8c27ffd3ab866c82237e99b1bea2afd444b2e9e82d0ef4b48031d46da697c079273ba6a88c4beb20a3795044096a614523aab289a46f86afc6f7e66e8719ed1e
+  data.tar.gz: fcb4deae9fdcadef52e7e4a6b85871fcbd33b437bc4a7a11f2c4ad42d60f2b835596bbaa86fe6ad4d30382195fd884c0728aa6fdf35fdb1b78cedb2f617bac2a

data/README.md

@@ -1,4 +1,4 @@
-# i18n-tasks [![Build Status][badge-travis]][travis] [![Coverage Status][badge-coverage]][coverage] [![Gemnasium][badge-gemnasium]][gemnasium] [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/glebm/i18n-tasks?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# i18n-tasks [![Build Status][badge-travis]][travis] [![Coverage Status][badge-coverage]][coverage] [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/glebm/i18n-tasks?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 i18n-tasks helps you find and manage missing and unused translations.
 
@@ -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.27'
+gem 'i18n-tasks', '~> 0.9.32'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -45,7 +45,7 @@ $ cp $(i18n-tasks gem-path)/templates/minitest/i18n_test.rb test/
 
 ## Usage
 
-Run `i18n-tasks` to get the list of all the tasks with short descriptions.
+Run `bundle exec i18n-tasks` to get the list of all the tasks with short descriptions.
 
 ### Check health
 
@@ -104,6 +104,17 @@ $ i18n-tasks translate-missing --backend=deepl
 $ i18n-tasks translate-missing --backend=deepl --from=en fr nl
 ```
 
+### Yandex Translate missing keys
+
+Translate missing values with Yandex Translate ([more below on the API key](#yandex-translation-config)).
+
+```console
+$ i18n-tasks translate-missing --backend=yandex
+
+# accepts from and locales options:
+$ i18n-tasks translate-missing --from=en es fr
+```
+
 ### Find usages
 
 See where the keys are used with `i18n-tasks find`:
@@ -324,6 +335,16 @@ A special syntax similar to file glob patterns is used throughout i18n-tasks to
 |      `:`     | matches a single key                                      |
 |   `{a, b.c}` | match any in set, can use `:` and `*`, match is captured  |
 
+Example of usage:
+
+```sh
+$ bundle exec i18n-tasks mv "{:}.contents.{*}_body" "\1.attributes.\2.body"
+
+car.contents.name_body ⮕ car.attributes.name.body
+car.contents.description_body ⮕ car.attributes.description.body
+truck.contents.name_body ⮕ truck.attributes.name.body
+truck.contents.description_body ⮕ truck.attributes.description.body
+```
 
 #### Custom adapters
 
@@ -387,6 +408,17 @@ translation:
   deepl_api_key: <Deep Pro API key>
 ```
 
+<a name="yandex-translation-config"></a>
+### Yandex Translate
+
+`i18n-tasks translate-missing` requires a Yandex API key, get it at [Yandex](https://tech.yandex.com/translate).
+
+```yaml
+# config/i18n-tasks.yml
+translation:
+  yandex_api_key: <Yandex API key>
+```
+
 ## Interactive console
 
 `i18n-tasks irb` starts an IRB session in i18n-tasks context. Type `guide` for more information.
@@ -405,8 +437,6 @@ Custom tasks can be added easily, see the examples [on the wiki](https://github.
 [badge-travis]: https://img.shields.io/travis/glebm/i18n-tasks.svg
 [coverage]: https://codeclimate.com/github/glebm/i18n-tasks
 [badge-coverage]: https://api.codeclimate.com/v1/badges/5d173e90ada8df07cedc/test_coverage
-[gemnasium]: https://gemnasium.com/glebm/i18n-tasks
-[badge-gemnasium]: https://gemnasium.com/glebm/i18n-tasks.svg
 [config]: https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
 [wiki]: https://github.com/glebm/i18n-tasks/wiki "i18n-tasks wiki"
 [i18n-gem]: https://github.com/svenfuchs/i18n "svenfuchs/i18n on Github"

data/config/locales/en.yml

@@ -120,3 +120,9 @@ en:
       none: Every translation is in use.
     usages:
       none: No key usages found.
+    yandex_translate:
+      errors:
+        no_api_key: >-
+          Set Yandex API key via YANDEX_API_KEY environment variable or translation.yandex_api_key
+          in config/i18n-tasks.yml. Get the key at https://tech.yandex.com/translate.
+        no_results: Yandex returned no results.

data/config/locales/ru.yml

@@ -69,6 +69,8 @@ ru:
         invalid_format: 'Неизвестный формат %{invalid}. Форматы: %{valid}.'
         invalid_locale: Неверный язык %{invalid}
         invalid_missing_type:
+          few: 'Неизвестные типы: %{invalid}. Типы: %{valid}.'
+          many: 'Неизвестные типы: %{invalid}. Типы: %{valid}.'
           one: 'Неизвестный тип %{invalid}. Типы: %{valid}.'
           other: 'Неизвестные типы: %{invalid}. Типы: %{valid}.'
         pass_forest: Передайте дерево
@@ -108,6 +110,8 @@ ru:
       none: Всё переведено.
     remove_unused:
       confirm:
+        few: Переводы (%{count}) будут удалены из %{locales}.
+        many: Переводы (%{count}) будут удалены из %{locales}.
         one: "%{count} перевод будут удалён из %{locales}."
         other: Переводы (%{count}) будут удалены из %{locales}.
       noop: Нет неиспользуемых ключей
@@ -118,3 +122,9 @@ ru:
       none: Все переводы используются.
     usages:
       none: Не найдено использований.
+    yandex_translate:
+      errors:
+        no_api_key: |-
+          Установить ключ API Яндекса с помощью переменной среды YANDEX_API_KEY или translation.yandex_api_key
+           в config / i18n-tasks.yml. Получите ключ по адресу https://tech.yandex.com/translate/.
+        no_results: Яндекс не дал результатов.

data/i18n-tasks.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
 TEXT
   s.post_install_message = <<~TEXT
     # Install default configuration:
-    cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
+    cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
     # Add an RSpec for missing and unused keys:
-    cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
+    cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
 TEXT
   s.homepage = 'https://github.com/glebm/i18n-tasks'
   s.metadata = { 'issue_tracker' => 'https://github.com/glebm/i18n-tasks' } if s.respond_to?(:metadata=)
-  s.required_ruby_version = '~> 2.3' if s.respond_to?(:required_ruby_version=)
+  s.required_ruby_version = '>= 2.3', '< 4.0' if s.respond_to?(:required_ruby_version=)
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
@@ -39,15 +39,19 @@ TEXT
   s.add_dependency 'highline', '>= 2.0.0'
   s.add_dependency 'i18n'
   s.add_dependency 'parser', '>= 2.2.3.0'
+  s.add_dependency 'rails-i18n'
   s.add_dependency 'rainbow', '>= 2.2.2', '< 4.0'
   s.add_dependency 'terminal-table', '>= 1.5.1'
   s.add_development_dependency 'axlsx', '~> 2.0'
-  s.add_development_dependency 'bundler', '~> 1.3'
-  s.add_development_dependency 'deepl-rb', '>= 2.1.0'
-  s.add_development_dependency 'easy_translate', '>= 0.5.1'
+  s.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'rubocop', '~> 0.53.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
+
+  # Translation backends
+  s.add_development_dependency 'deepl-rb', '>= 2.1.0'
+  s.add_development_dependency 'easy_translate', '>= 0.5.1' # Google Translate
+  s.add_development_dependency 'yandex-translator', '>= 0.3.3'
 end

data/lib/i18n/tasks.rb

@@ -64,6 +64,7 @@ require 'i18n/tasks/base_task'
 
 # Add internal locale data to i18n gem load path
 require 'i18n'
+
 Dir[File.join(I18n::Tasks.gem_path, 'config', 'locales', '*.yml')].each do |locale_file|
   I18n.config.load_path << locale_file
 end

data/lib/i18n/tasks/command/commander.rb

@@ -22,7 +22,7 @@ module I18n::Tasks
         if opts.empty? || method(name).arity.zero?
           send name
         else
-          send name, opts
+          send name, **opts
         end
       end
 

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

@@ -17,10 +17,10 @@ module I18n::Tasks
           fail CommandError, t('i18n_tasks.health.no_keys_detected') if stats[:key_count].zero?
           terminal_report.forest_stats forest, stats
           [
-            missing(opt),
-            unused(opt),
-            check_consistent_interpolations(opt),
-            check_normalized(opt)
+            missing(**opt),
+            unused(**opt),
+            check_consistent_interpolations(**opt),
+            check_normalized(**opt)
           ].detect { |result| result == :exit_1 }
         end
       end

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

@@ -12,7 +12,7 @@ module I18n::Tasks
             args: %i[locales out_format]
 
         def check_consistent_interpolations(opt = {})
-          forest = i18n.inconsistent_interpolations(opt.slice(:locales, :base_locale))
+          forest = i18n.inconsistent_interpolations(**opt.slice(:locales, :base_locale))
           print_forest forest, opt, :inconsistent_interpolations
           :exit_1 unless forest.empty?
         end

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

@@ -28,7 +28,7 @@ module I18n::Tasks
             args: %i[locales out_format missing_types]
 
         def missing(opt = {})
-          forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :types))
+          forest = i18n.missing_keys(**opt.slice(:locales, :base_locale, :types))
           print_forest forest, opt, :missing_keys
           :exit_1 unless forest.empty?
         end

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

@@ -32,7 +32,7 @@ module I18n::Tasks
             args: %i[locales out_format strict]
 
         def unused(opt = {})
-          forest = i18n.unused_keys(opt.slice(:locales, :strict))
+          forest = i18n.unused_keys(**opt.slice(:locales, :strict))
           print_forest forest, opt, :unused_keys
           :exit_1 unless forest.empty?
         end
@@ -40,10 +40,16 @@ module I18n::Tasks
         cmd :remove_unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.remove_unused'),
-            args: %i[locales out_format strict keep_order confirm]
+            args: %i[locales out_format strict keep_order confirm pattern]
+
+        def remove_unused(opt = {}) # rubocop:disable Metrics/AbcSize
+          unused_keys = i18n.unused_keys(**opt.slice(:locales, :strict))
+
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            unused_keys = unused_keys.select_keys { |full_key, _node| full_key =~ pattern_re }
+          end
 
-        def remove_unused(opt = {})
-          unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))
           if unused_keys.present?
             terminal_report.unused_keys(unused_keys)
             confirm_remove_unused!(unused_keys, opt)

data/lib/i18n/tasks/command/dsl.rb

@@ -42,8 +42,8 @@ module I18n::Tasks
         end
 
         # late-bound I18n.t for module bodies
-        def t(*args)
-          proc { I18n.t(*args) }
+        def t(*args, **opts)
+          proc { I18n.t(*args, **opts) }
         end
 
         # if class is a module, merge DSL definitions when it is included

data/lib/i18n/tasks/configuration.rb

@@ -59,6 +59,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
       conf = (config[:translation] || {}).with_indifferent_access
       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[:yandex_api_key] = ENV['YANDEX_API_KEY'] if ENV.key?('YANDEX_API_KEY')
       conf
     end
   end

data/lib/i18n/tasks/data/adapter/yaml_adapter.rb

@@ -9,7 +9,7 @@ module I18n::Tasks
           # @return [Hash] locale tree
           def parse(str, options)
             if YAML.method(:load).arity.abs == 2
-              YAML.load(str, options || {})
+              YAML.load(str, **(options || {}))
             else
               # older jruby and rbx 2.2.7 do not accept options
               YAML.load(str)

data/lib/i18n/tasks/data/file_formats.rb

@@ -38,6 +38,8 @@ module I18n
         # @return [Hash]
         def load_file(path)
           adapter_parse read_file(path), self.class.adapter_name_for_path(path)
+        rescue CommandError => e
+          raise(e.class, "#{e.message} (file: #{path})")
         end
 
         # @return [String]

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

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/siblings'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   class Node # rubocop:disable Metrics/ClassLength
     include Enumerable
@@ -28,7 +27,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def derive(new_attr = {})
-      self.class.new(attributes.merge(new_attr))
+      self.class.new(**attributes.merge(new_attr))
     end
 
     def children=(children)
@@ -164,7 +163,7 @@ module I18n::Tasks::Data::Tree
 
     def inspect(level = 0)
       label = if key.nil?
-                I18n::Tasks::RainbowUtils.faint_color('∅')
+                Rainbow('∅').faint
               else
                 [Rainbow(key).color(1 + level % 15),
                  (": #{format_value_for_inspect(value)}" if leaf?),

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n/tasks/data/tree/traversal'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   # A list of nodes
   class Nodes
@@ -48,7 +47,7 @@ module I18n::Tasks::Data::Tree
       if present?
         map(&:inspect) * "\n"
       else
-        I18n::Tasks::RainbowUtils.faint_color('{∅}')
+        Rainbow('{∅}').faint
       end
     end
 

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

@@ -11,6 +11,7 @@ module I18n::Tasks::Data::Tree
   # siblings' keys are unique
   class Siblings < Nodes # rubocop:disable Metrics/ClassLength
     include ::I18n::Tasks::SplitKey
+    include ::I18n::Tasks::PluralKeys
 
     attr_reader :parent, :key_to_node
 
@@ -100,12 +101,12 @@ module I18n::Tasks::Data::Tree
             key: key_part,
             parent: parent,
             children: [],
-            warn_about_add_children_to_leaf: @warn_add_children_to_leaf
+            warn_about_add_children_to_leaf: @warn_about_add_children_to_leaf
           )
           append! child
         end
         unless child.children
-          warn_add_children_to_leaf child if @warn_about_add_children_to_leaf
+          conditionally_warn_add_children_to_leaf(child, [])
           child.children = []
         end
         child.children.set rest, node
@@ -187,7 +188,7 @@ module I18n::Tasks::Data::Tree
           if our.children
             our.children.merge!(node.children)
           else
-            warn_add_children_to_leaf our
+            conditionally_warn_add_children_to_leaf(our, node.children)
             our.children = node.children
           end
         elsif on_leaves_merge
@@ -228,6 +229,13 @@ module I18n::Tasks::Data::Tree
       end
     end
 
+    def conditionally_warn_add_children_to_leaf(node, children)
+      return unless @warn_about_add_children_to_leaf
+      return if plural_forms?(children)
+
+      warn_add_children_to_leaf(node)
+    end
+
     def warn_add_children_to_leaf(node)
       ::I18n::Tasks::Logging.log_warn "'#{node.full_key}' was a leaf, now has children (value <- scope conflict)"
     end
@@ -265,7 +273,7 @@ module I18n::Tasks::Data::Tree
         build_forest(opts) do |forest|
           key_attrs.each do |(full_key, attr)|
             fail "Invalid key #{full_key.inspect}" if full_key.end_with?('.')
-            node = ::I18n::Tasks::Data::Tree::Node.new(attr.merge(key: split_key(full_key).last))
+            node = ::I18n::Tasks::Data::Tree::Node.new(**attr.merge(key: split_key(full_key).last))
             yield(full_key, node) if block
             forest[full_key] = node
           end

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

@@ -60,14 +60,12 @@ module I18n::Tasks
         self
       end
 
-      def key_names(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, _node| key }
+      def key_names(root: false)
+        keys(root: root).map { |key, _node| key }
       end
 
-      def key_values(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, node| [key, node.value] }
+      def key_values(root: false)
+        keys(root: root).map { |key, node| [key, node.value] }
       end
 
       def root_key_values(sort = false)
@@ -146,12 +144,12 @@ module I18n::Tasks
       # @return [Siblings]
       def intersect_keys(other_tree, key_opts = {}, &block)
         if block
-          select_keys(key_opts) do |key, node|
+          select_keys(**key_opts.slice(:root)) do |key, node|
             other_node = other_tree[key]
             other_node && yield(key, node, other_node)
           end
         else
-          select_keys(key_opts) { |key, _node| other_tree[key] }
+          select_keys(**key_opts.slice(:root)) { |key, _node| other_tree[key] }
         end
       end
 

data/lib/i18n/tasks/missing_keys.rb

@@ -2,21 +2,22 @@
 
 require 'set'
 module I18n::Tasks
-  module MissingKeys
-    MISSING_TYPES = {
-      used: { glyph: '✗', summary: 'used in code but missing from base locale' },
-      diff: { glyph: '∅', summary: 'translated in one locale but not in the other' }
-    }.freeze
+  module MissingKeys # rubocop:disable Metrics/ModuleLength
+    MISSING_TYPES = %w[
+      used
+      diff
+      plural
+    ].freeze
 
     def self.missing_keys_types
-      @missing_keys_types ||= MISSING_TYPES.keys
+      @missing_keys_types ||= MISSING_TYPES
     end
 
     def missing_keys_types
       MissingKeys.missing_keys_types
     end
 
-    # @param types [:used, :diff] all if `nil`.
+    # @param types [:used, :diff, :plural] all if `nil`.
     # @return [Siblings]
     def missing_keys(locales: nil, types: nil, base_locale: nil)
       locales ||= self.locales
@@ -55,6 +56,39 @@ module I18n::Tasks
       end
     end
 
+    def missing_plural_forest(locales, _base = base_locale)
+      locales.each_with_object(empty_forest) do |locale, forest|
+        required_keys = required_plural_keys_for_locale(locale)
+        next if required_keys.empty?
+        tree = empty_forest
+        plural_nodes data[locale] do |node|
+          children = node.children
+          present_keys = Set.new(children.map { |c| c.key.to_sym })
+          next if present_keys.superset?(required_keys)
+          tree[node.full_key] = node.derive(
+            value: children.to_hash,
+            children: nil,
+            data: node.data.merge(missing_keys: (required_keys - present_keys).to_a)
+          )
+        end
+        tree.set_root_key!(locale, type: :missing_plural)
+        forest.merge!(tree)
+      end
+    end
+
+    def required_plural_keys_for_locale(locale)
+      @plural_keys_for_locale ||= {}
+      return @plural_keys_for_locale[locale] if @plural_keys_for_locale.key?(locale)
+
+      @plural_keys_for_locale[locale] = plural_keys_for_locale(locale)
+    end
+
+    # Loads rails-i18n pluralization config for the given locale.
+    def load_rails_i18n_pluralization!(locale)
+      path = File.join(Gem::Specification.find_by_name('rails-i18n').gem_dir, 'rails', 'pluralization', "#{locale}.rb")
+      eval(File.read(path), binding, path) # rubocop:disable Security/Eval
+    end
+
     # keys present in compared_to, but not in locale
     def missing_diff_tree(locale, compared_to = base_locale)
       data[compared_to].select_keys do |key, _node|
@@ -85,7 +119,7 @@ module I18n::Tasks
     end
 
     def locale_key_missing?(locale, key)
-      !key_value?(key, locale) && !external_key?(key) && !ignore_key?(key, :missing)
+      !key_value?(key, locale) && !external_key?(key, locale) && !ignore_key?(key, :missing)
     end
 
     # @param [::I18n::Tasks::Data::Tree::Siblings] forest
@@ -116,5 +150,32 @@ module I18n::Tasks
       end
       forest
     end
+
+    private
+
+    def plural_keys_for_locale(locale)
+      configuration = load_rails_i18n_pluralization!(locale)
+      if configuration[locale.to_sym].nil?
+        alternate_locale = alternate_locale_from(locale)
+        return Set.new if configuration[alternate_locale.to_sym].nil?
+
+        return set_from_rails_i18n_pluralization(configuration, alternate_locale)
+      end
+      set_from_rails_i18n_pluralization(configuration, locale)
+    rescue SystemCallError, IOError
+      Set.new
+    end
+
+    def alternate_locale_from(locale)
+      re = /(\w{2})-*(\w{2,3})*/
+      match = locale.match(re)
+      language_code = match[1]
+      country_code = match[2]
+      "#{language_code}-#{country_code.upcase}"
+    end
+
+    def set_from_rails_i18n_pluralization(configuration, locale)
+      Set.new(configuration[locale.to_sym][:i18n][:plural][:keys])
+    end
   end
 end

data/lib/i18n/tasks/plural_keys.rb

@@ -2,8 +2,10 @@
 
 require 'set'
 module I18n::Tasks::PluralKeys
-  PLURAL_KEY_SUFFIXES = Set.new %w[zero one two few many other]
-  PLURAL_KEY_RE = /\.(?:#{PLURAL_KEY_SUFFIXES.to_a * '|'})$/
+  # Ref: http://cldr.unicode.org/index/cldr-spec/plural-rules
+  CLDR_CATEGORY_KEYS = %w[zero one two few many other].freeze
+  PLURAL_KEY_SUFFIXES = Set.new CLDR_CATEGORY_KEYS
+  PLURAL_KEY_RE = /\.(?:#{CLDR_CATEGORY_KEYS * '|'})$/
 
   def collapse_plural_nodes!(tree)
     tree.leaves.map(&:parent).compact.uniq.each do |node|
@@ -31,10 +33,29 @@ module I18n::Tasks::PluralKeys
     end
   end
 
+  # @param [::I18n::Tasks::Data::Tree::Traversal] tree
+  # @yieldparam node [::I18n::Tasks::Data::Tree::Node] plural node
+  def plural_nodes(tree)
+    return to_enum(:plural_nodes, tree) unless block_given?
+    visited = Set.new
+    tree.leaves do |node|
+      parent = node.parent
+      next if !parent || visited.include?(parent)
+      yield parent if plural_forms?(parent.children)
+      visited.add(parent)
+    end
+    self
+  end
+
   def plural_forms?(s)
+    return false if non_plural_other?(s)
     s.present? && s.all? { |node| node.leaf? && plural_suffix?(node.key) }
   end
 
+  def non_plural_other?(s)
+    s.size == 1 && s.first.leaf? && (!s.first.value.is_a?(String) || !s.first.value.include?('%{count}'))
+  end
+
   def plural_suffix?(key)
     PLURAL_KEY_SUFFIXES.include?(key)
   end

data/lib/i18n/tasks/reports/terminal.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n/tasks/reports/base'
-require 'i18n/tasks/rainbow_utils'
 require 'terminal-table'
 module I18n
   module Tasks
@@ -34,11 +33,6 @@ module I18n
           end
         end
 
-        def icon(type)
-          glyph = missing_type_info(type)[:glyph]
-          { missing_used: Rainbow(glyph).red, missing_diff: Rainbow(glyph).yellow }[type]
-        end
-
         def used_keys(used_tree = task.used_tree)
           # For the used tree we may have usage nodes that are not leaves as references.
           keys_nodes = used_tree.nodes.select { |node| node.data[:occurrences].present? }.map do |node|
@@ -81,11 +75,11 @@ module I18n
 
         def forest_stats(forest, stats = task.forest_stats(forest))
           text  = if stats[:locale_count] == 1
-                    I18n.t('i18n_tasks.data_stats.text_single_locale', stats)
+                    I18n.t('i18n_tasks.data_stats.text_single_locale', **stats)
                   else
-                    I18n.t('i18n_tasks.data_stats.text', stats)
+                    I18n.t('i18n_tasks.data_stats.text', **stats)
                   end
-          title = Rainbow(I18n.t('i18n_tasks.data_stats.title', stats.slice(:locales))).bright
+          title = Rainbow(I18n.t('i18n_tasks.data_stats.title', **stats.slice(:locales))).bright
           print_info "#{Rainbow(title).cyan} #{Rainbow(text).cyan}"
         end
 
@@ -114,6 +108,8 @@ module I18n
         def missing_key_info(leaf)
           if leaf[:type] == :missing_used
             first_occurrence leaf
+          elsif leaf[:type] == :missing_plural
+            leaf[:data][:missing_keys].join(', ')
           else
             "#{Rainbow(leaf[:data][:missing_diff_locale]).cyan} "\
             "#{format_value(leaf[:value].is_a?(String) ? leaf[:value].strip : leaf[:value])}"
@@ -173,7 +169,7 @@ module I18n
         end
 
         def print_title(title)
-          log_stderr "#{Rainbow(title.strip).bright} #{I18n::Tasks::RainbowUtils.faint_color('|')} " \
+          log_stderr "#{Rainbow(title.strip).bright} #{Rainbow('|').faint} " \
                      "#{"i18n-tasks v#{I18n::Tasks::VERSION}"}"
         end
 

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

@@ -12,13 +12,15 @@ module I18n::Tasks::Scanners
     include OccurrenceFromPosition
     include RubyKeyLiterals
 
-    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:ranslate)?/
+    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:!|ranslate!?)?/
     IGNORE_LINES = {
-      'opal' => /^\s*#(?!\si18n-tasks-use)/,
-      'haml' => /^\s*-\s*#(?!\si18n-tasks-use)/,
-      'slim' => %r{^\s*(?:-#|/)(?!\si18n-tasks-use)},
       'coffee' => /^\s*#(?!\si18n-tasks-use)/,
-      'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/
+      'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/,
+      'es6' => %r{^\s*//(?!\si18n-tasks-use)},
+      'haml' => /^\s*-\s*#(?!\si18n-tasks-use)/,
+      'js' => %r{^\s*//(?!\si18n-tasks-use)},
+      'opal' => /^\s*#(?!\si18n-tasks-use)/,
+      'slim' => %r{^\s*(?:-#|/)(?!\si18n-tasks-use)}
     }.freeze
 
     def initialize(**args)

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

@@ -15,10 +15,10 @@ module I18n::Tasks::Scanners
     include AST::Sexp
 
     MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/
-    RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t translate])
+    RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t t! translate translate!])
 
     def initialize(**args)
-      super(args)
+      super(**args)
       @parser = ::Parser::CurrentRuby.new
       @magic_comment_parser = ::Parser::CurrentRuby.new
       @call_finder = RubyAstCallFinder.new(

data/lib/i18n/tasks/translation.rb

@@ -2,12 +2,13 @@
 
 require 'i18n/tasks/translators/deepl_translator.rb'
 require 'i18n/tasks/translators/google_translator.rb'
+require 'i18n/tasks/translators/yandex_translator.rb'
 
 module I18n::Tasks
   module Translation
     # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
     # @param [String] from locale
-    # @param [:deepl, :google] backend
+    # @param [:deepl, :google, :yandex] backend
     # @return [I18n::Tasks::Tree::Siblings] translated forest
     def translate_forest(forest, from:, backend: :google)
       case backend
@@ -15,6 +16,8 @@ module I18n::Tasks
         Translators::DeeplTranslator.new(self).translate_forest(forest, from)
       when :google
         Translators::GoogleTranslator.new(self).translate_forest(forest, from)
+      when :yandex
+        Translators::YandexTranslator.new(self).translate_forest(forest, from)
       else
         fail CommandError, "invalid backend: #{backend}"
       end

data/lib/i18n/tasks/translators/deepl_translator.rb

@@ -17,7 +17,12 @@ module I18n::Tasks::Translators
     protected
 
     def translate_values(list, from:, to:, **options)
-      DeepL.translate(list, to_deepl_compatible_locale(from), to_deepl_compatible_locale(to), options).map(&:text)
+      result = DeepL.translate(list, to_deepl_compatible_locale(from), to_deepl_compatible_locale(to), options).map(&:text)
+      if result.is_a?(DeepL::Resources::Text)
+        result.text
+      else
+        result.map(&:text)
+      end
     end
 
     def options_for_translate_values(**options)

data/lib/i18n/tasks/translators/yandex_translator.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'i18n/tasks/translators/base_translator'
+
+module I18n::Tasks::Translators
+  class YandexTranslator < BaseTranslator
+    def initialize(*)
+      begin
+        require 'yandex-translator'
+      rescue LoadError
+        raise ::I18n::Tasks::CommandError, "Add gem 'yandex-translator' to your Gemfile to use this command"
+      end
+      super
+    end
+
+    protected
+
+    def translate_values(list, **options)
+      list.map { |item| translator.translate(item, options) }
+    end
+
+    def options_for_translate_values(from:, to:, **options)
+      options.merge(
+        from: to_yandex_compatible_locale(from),
+        to: to_yandex_compatible_locale(to)
+      )
+    end
+
+    def options_for_html
+      { format: 'html' }
+    end
+
+    def options_for_plain
+      { format: 'plain' }
+    end
+
+    def no_results_error_message
+      I18n.t('i18n_tasks.yandex_translate.errors.no_results')
+    end
+
+    private
+
+    # Convert 'es-ES' to 'es'
+    def to_yandex_compatible_locale(locale)
+      return locale unless locale.include?('-')
+      locale.split('-', 2).first
+    end
+
+    def translator
+      @translator ||= Yandex::Translator.new(api_key)
+    end
+
+    def api_key
+      @api_key ||= begin
+        key = @i18n_tasks.translation_config[:yandex_api_key]
+        fail ::I18n::Tasks::CommandError, I18n.t('i18n_tasks.yandex_translate.errors.no_api_key') if key.blank?
+        key
+      end
+    end
+  end
+end

data/lib/i18n/tasks/used_keys.rb

@@ -25,7 +25,8 @@ module I18n::Tasks
     }.freeze
 
     ALWAYS_EXCLUDE = %w[*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
-                        *.yml *.json *.zip *.tar.gz *.swf *.flv].freeze
+                        *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus
+                        *.webp].freeze
 
     # Find all keys in the source and return a forest with the keys in absolute form and their occurrences.
     #

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.27'
+    VERSION = '0.9.32'
   end
 end

data/templates/config/i18n-tasks.yml

@@ -32,7 +32,7 @@ data:
   # This data is not considered unused and is never written to.
   external:
     ## Example (replace %#= with %=):
-    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+    # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
   # router: conservative_router

data/templates/minitest/i18n_test.rb

@@ -23,7 +23,14 @@ class I18nTest < ActiveSupport::TestCase
     non_normalized = @i18n.non_normalized_paths
     error_message = "The following files need to be normalized:\n" \
                     "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
-                    'Please run `i18n-tasks normalize` to fix'
+                    "Please run `i18n-tasks normalize' to fix"
     assert_empty non_normalized, error_message
   end
+
+  def test_no_inconsistent_interpolations
+    inconsistent_interpolations = @i18n.inconsistent_interpolations
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Please run `i18n-tasks check-consistent-interpolations' to show them"
+    assert_empty inconsistent_interpolations, error_message
+  end
 end

data/templates/rspec/i18n_spec.rb

@@ -2,10 +2,11 @@
 
 require 'i18n/tasks'
 
-RSpec.describe 'I18n' do
+RSpec.describe I18n do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }
+  let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }
 
   it 'does not have missing keys' do
     expect(missing_keys).to be_empty,
@@ -21,7 +22,13 @@ RSpec.describe 'I18n' do
     non_normalized = i18n.non_normalized_paths
     error_message = "The following files need to be normalized:\n" \
                     "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
-                    'Please run `i18n-tasks normalize` to fix'
+                    "Please run `i18n-tasks normalize' to fix"
     expect(non_normalized).to be_empty, error_message
   end
+
+  it 'does not have inconsistent interpolations' do
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Run `i18n-tasks check-consistent-interpolations' to show them"
+    expect(inconsistent_interpolations).to be_empty, error_message
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.32
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3.0
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -148,42 +162,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: deepl-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.1
   type: :development
   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
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +246,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deepl-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: yandex-translator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: |
   i18n-tasks helps you find and manage missing and unused translations.
 
@@ -320,7 +354,6 @@ files:
 - lib/i18n/tasks/logging.rb
 - lib/i18n/tasks/missing_keys.rb
 - lib/i18n/tasks/plural_keys.rb
-- lib/i18n/tasks/rainbow_utils.rb
 - lib/i18n/tasks/references.rb
 - lib/i18n/tasks/reports/base.rb
 - lib/i18n/tasks/reports/terminal.rb
@@ -349,6 +382,7 @@ files:
 - lib/i18n/tasks/translators/base_translator.rb
 - lib/i18n/tasks/translators/deepl_translator.rb
 - lib/i18n/tasks/translators/google_translator.rb
+- lib/i18n/tasks/translators/yandex_translator.rb
 - lib/i18n/tasks/unused_keys.rb
 - lib/i18n/tasks/used_keys.rb
 - lib/i18n/tasks/version.rb
@@ -362,25 +396,27 @@ metadata:
   issue_tracker: https://github.com/glebm/i18n-tasks
 post_install_message: |
   # Install default configuration:
-  cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
+  cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
   # Add an RSpec for missing and unused keys:
-  cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
+  cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis

data/lib/i18n/tasks/rainbow_utils.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module I18n
-  module Tasks
-    module RainbowUtils
-      # TODO: This method can be removed after below PR is released.
-      # https://github.com/sickill/rainbow/pull/53
-      def self.faint_color(str)
-        presenter = Rainbow(str)
-        return presenter unless Rainbow.enabled
-        Rainbow::Presenter.new(Rainbow::StringUtils.wrap_with_sgr(presenter, [2]))
-      end
-    end
-  end
-end