i18n-tasks 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a7092606f1ea327f57a9a2bc0489c07d5349f61b6b742415d0dd367b243237
-  data.tar.gz: dd87c3098d774df0fe685829cefe3716e9cd42156cb483762a491174d0eaf733
+  metadata.gz: e77c4c19ca040adf1879259e8ad1d963e181eb1682e97ffa99f5b09d1b59e803
+  data.tar.gz: cc5ed0a16159c8f14a9006ab3908cfdc93b5dbc338603d54846d0ae4f84abb80
 SHA512:
-  metadata.gz: 7341b68328712adcbbb7b28b9c83695a56fcaac29eb9d7303c8866cf0f6004bd7e85065a1684a3acb1597786c1993b876e8eab04f5db555d95563f43976e7934
-  data.tar.gz: 8b8f93c545f0cc80b3ee36610751db469c1cf6c47df4ba9376189c926480dc0a96d678545c90163f2f24f1826beeaaff1e24ec9bc273a24541e715b0701ceb61
+  metadata.gz: 978d87d9e73dc5f4e183a7fdebabeec9864c3b1ba530f722bc3a80428b1c422eeda55f2bbd2b7ec8c1a67649ee128db4ae9ab0fc24db4b8cf386f7740b0f34d4
+  data.tar.gz: 46a0b0cbb262c17aaf1195293edd1fc04d665dd85d5f8d1b399f1ae565db2eb99e3e281fb1a34a5cb3629aadee2c2b279642d8beca623814fcd9b75c0c502b5e

data/README.md

@@ -24,7 +24,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', '~> 1.0.11'
+gem 'i18n-tasks', '~> 1.0.12'
 ```
 
 Copy the default [configuration file](#configuration):

data/config/locales/en.yml

@@ -33,7 +33,7 @@ en:
             Value. Interpolates: %{value}, %{human_key}, %{key}, %{default}, %{value_or_human_key},
             %{value_or_default_or_human_key}
       desc:
-        add_missing: add missing keys to locale data
+        add_missing: add missing keys to locale data, optionally match a pattern
         check_consistent_interpolations: verify that all translations use correct interpolation variables
         check_normalized: verify that all translation data is normalized
         config: display i18n-tasks configuration
@@ -46,12 +46,13 @@ en:
         gem_path: show path to the gem
         health: is everything OK?
         irb: start REPL session within i18n-tasks context
-        missing: show missing translations
+        missing: show missing translations, optionally match a pattern
         mv: rename/merge the keys in locale data that match the given pattern
         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 or DeepL Pro
+        translate_missing: translate missing keys with Google Translate or DeepL Pro, optionally match
+          a pattern
         tree_convert: convert tree between formats
         tree_filter: filter tree by key pattern
         tree_merge: merge trees

data/i18n-tasks.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.1.0'
-  s.add_dependency 'better_html', '~> 1.0'
+  s.add_dependency 'better_html', '>= 1.0', '< 3.0'
   s.add_dependency 'erubi'
   s.add_dependency 'highline', '>= 2.0.0'
   s.add_dependency 'i18n'

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

@@ -25,10 +25,14 @@ module I18n::Tasks
         cmd :missing,
             pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.missing'),
-            args: %i[locales out_format missing_types]
+            args: %i[locales out_format missing_types pattern]
 
         def missing(opt = {})
           forest = i18n.missing_keys(**opt.slice(:locales, :base_locale, :types))
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            forest.select_keys! { |full_key, _node| full_key =~ pattern_re }
+          end
           print_forest forest, opt, :missing_keys
           :exit1 unless forest.empty?
         end
@@ -36,10 +40,14 @@ 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), :translation_backend]
+            args: [:locales, :locale_to_translate_from, arg(:out_format).from(1), :translation_backend, :pattern]
 
         def translate_missing(opt = {})
           missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            missing.select_keys! { |full_key, _node| full_key =~ pattern_re }
+          end
           translated = i18n.translate_forest missing, from: opt[:from], backend: opt[:backend].to_sym
           i18n.data.merge! translated
           log_stderr t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
@@ -49,7 +57,7 @@ module I18n::Tasks
         cmd :add_missing,
             pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.add_missing'),
-            args: [:locales, :out_format, arg(:value) + [{ default: '%{value_or_default_or_human_key}' }],
+            args: [:locales, :out_format, :pattern, arg(:value) + [{ default: '%{value_or_default_or_human_key}' }],
                    ['--nil-value', 'Set value to nil. Takes precedence over the value argument.']]
 
         # Merge base locale first, as this may affect the value for the other locales
@@ -60,6 +68,10 @@ module I18n::Tasks
           ].reject(&:empty?).each_with_object(i18n.empty_forest) do |locales, added|
             forest = i18n.missing_keys(locales: locales, **opt.slice(:types, :base_locale))
                          .set_each_value!(opt[:'nil-value'] ? nil : opt[:value])
+            if opt[:pattern]
+              pattern_re = i18n.compile_key_pattern(opt[:pattern])
+              forest.select_keys! { |full_key, _node| full_key =~ pattern_re }
+            end
             i18n.data.merge! forest
             added.merge! forest
           end.tap do |added|

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

@@ -174,15 +174,29 @@ module I18n::Tasks
           human_key = ActiveSupport::Inflector.humanize(node.key.to_s)
           full_key = node.full_key
           default = (node.data[:occurrences] || []).detect { |o| o.default_arg.presence }.try(:default_arg)
-          StringInterpolation.interpolate_soft(
-            val_pattern,
-            value: node_value,
-            human_key: human_key,
-            key: full_key,
-            default: default,
-            value_or_human_key: node_value.presence || human_key,
-            value_or_default_or_human_key: node_value.presence || default || human_key
-          )
+          if default.is_a?(Hash)
+            default.each_with_object({}) do |(k, v), h|
+              h[k] = StringInterpolation.interpolate_soft(
+                val_pattern,
+                value: node_value,
+                human_key: human_key,
+                key: full_key,
+                default: v,
+                value_or_human_key: node_value.presence || human_key,
+                value_or_default_or_human_key: node_value.presence || v || human_key
+              )
+            end
+          else
+            StringInterpolation.interpolate_soft(
+              val_pattern,
+              value: node_value,
+              human_key: human_key,
+              key: full_key,
+              default: default,
+              value_or_human_key: node_value.presence || human_key,
+              value_or_default_or_human_key: node_value.presence || default || human_key
+            )
+          end
         end
         pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern) if key_pattern.present?
         keys.each do |key, node|

data/lib/i18n/tasks/locale_pathname.rb

@@ -10,7 +10,7 @@ module I18n::Tasks
       private
 
       def path_locale_re(locale)
-        (@path_locale_res ||= {})[locale] ||= %r{(?<=^|[/.])#{locale}(?=[/.])}
+        (@path_locale_res ||= {})[locale] ||= %r{(?<=^|[/.-])#{locale}(?=[/.])}
       end
     end
   end

data/lib/i18n/tasks/plural_keys.rb

@@ -52,15 +52,9 @@ module I18n::Tasks::PluralKeys
   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/scanners/ast_matchers/base_matcher.rb

@@ -54,6 +54,22 @@ module I18n::Tasks::Scanners::AstMatchers
       end
     end
 
+    # Extract the whole hash from a node of type `:hash`
+    #
+    # @param node [AST::Node] a node of type `:hash`.
+    # @return [Hash] the whole hash from the node
+    def extract_hash(node)
+      return {} if node.nil?
+
+      if node.type == :hash
+        node.children.each_with_object({}) do |pair, h|
+          key = pair.children[0].children[0].to_s
+          value = pair.children[1].children[0]
+          h[key] = value
+        end
+      end
+    end
+
     # Extract a hash pair with a given literal key.
     #
     # @param node [AST::Node] a node of type `:hash`.

data/lib/i18n/tasks/scanners/ast_matchers/message_receivers_matcher.rb

@@ -77,8 +77,13 @@ module I18n::Tasks::Scanners::AstMatchers
 
         key = [scope, key].join('.') unless scope == ''
       end
-      default_arg_node = extract_hash_pair(node, 'default')
-      default_arg = extract_string(default_arg_node.children[1]) if default_arg_node
+      if default_arg_node = extract_hash_pair(node, 'default')
+        default_arg = if default_arg_node.children[1]&.type == :hash
+          extract_hash(default_arg_node.children[1])
+        else
+          extract_string(default_arg_node.children[1])
+        end
+      end
 
       [key, default_arg]
     end

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '1.0.11'
+    VERSION = '1.0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - glebm
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,22 @@ dependencies:
   name: better_html
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -439,8 +445,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
 test_files: []