i18n-tasks 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3259a9c8894c28f8372fefdd509e2dc8240d40d8ead58b284fc9887f9c30d2c4
-  data.tar.gz: cd9003f49d146342de7466f42478f2bddd94cfcb108752d1a2fb8109900a3abe
+  metadata.gz: daf654e97c52cba1413c10e69c12510ed9ce438e2fabf089bdb05b38ac944c5c
+  data.tar.gz: 7d3d264ca3a630497da4c7c5fc48907cf22c55bd0f16ac51bffed22febb540f4
 SHA512:
-  metadata.gz: 4a05cf473e34cc265fd70ad193aa849698dafca63b6d76542170d6d119b9d4c453ae06cd1b23d2c9ce3b6943e0d3e14865bb62ffe4cc3c2ab591e432530a2a28
-  data.tar.gz: 6d9fe81237a10d0fec00ab1bb588d45beb3085ef8342dd644bcc059547b079971aad039d1f17203d16439eece482ca83904f29fdf6e99d6cabe7481667b336a9
+  metadata.gz: 2fd90385cd85755fcb9ef3f53a1a21f09a6ac217d8f9153871ade1cd38a155dbd2eb585a2ac0b059938b07b50578949c2291012fb97b4c1169a470b1ee59d84c
+  data.tar.gz: de5ee6c4256599189f4934b97595364d39b242e4645ac017c59ea2f2a172296628340b53bbcd2b54df0657bbddd92fe0e8bee69f980e915b1a286a025eff8b78

data/README.md

@@ -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.28'
 ```
 
 Copy the default [configuration file](#configuration):

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: Нет неиспользуемых ключей

data/i18n-tasks.gemspec

@@ -39,6 +39,7 @@ 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'

data/lib/i18n/tasks.rb

@@ -64,6 +64,12 @@ 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
+
+# Load pluralization data
+require 'rails-i18n'
+I18n.enforce_available_locales = false
+RailsI18n::Railtie.add('rails/pluralization/*.rb')

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/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,26 @@ module I18n::Tasks
       end
     end
 
+    def missing_plural_forest(locales, _base = base_locale)
+      locales.each_with_object(empty_forest) do |locale, forest|
+        next unless I18n.exists?(:'i18n.plural.keys', locale)
+        required_keys = Set.new(I18n.t(:'i18n.plural.keys', locale: locale, resolve: false))
+        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
+
     # 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|

data/lib/i18n/tasks/plural_keys.rb

@@ -31,10 +31,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

@@ -34,11 +34,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|
@@ -114,6 +109,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])}"

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.27'
+    VERSION = '0.9.28'
   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.28
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-29 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