i18n-tasks 0.9.37 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cad835aebcfc5621cb07d3a5ef4134a01cfed6286411776a9a5e04cfefe5862
-  data.tar.gz: 3b9f5a35077463778d1b940bd01738e49225fe7775d02858da5bdd9a9ded8308
+  metadata.gz: 12e19e4d7fe61bd20e000b0b6e4db5bdf233443e8e8cf965b62e634bdfa3e5a2
+  data.tar.gz: 3dab05338d079c4defad590466ab2985faf43245d616f86af4c212003831a6e4
 SHA512:
-  metadata.gz: 8ed7363e9cfd2e8cf179aa0f28c0f00b926b4a53ba95f19ca61d8a08901322c561e84ebab51616f592400dac985f32c82b0a08911ec5f22223fe22e7858dd6af
-  data.tar.gz: 04b44a9180dc9b1e9d739eb5e5881877f68321bbd7efa1028a2f2d89fd3acf1cf742d587aab566a8cbd43813619693132ec803221d6c7ad31cd703ba516622f3
+  metadata.gz: 2cf99aec1c6d5738c4a71964a7ce67e70c8ade3150042c4e381fef19b9eaa82cf6638979bf97c6e9941f119304973f9e6f3fd31b3bab0fd635520344448b5587
+  data.tar.gz: 2de5ab47951585b298e43bece202f3ad885ae8eb03edb2b6e860b30e3172ea213947509b9543bbf31df06ef03079ff1e7cfd1b7a32cd964428d9f9612fd7e171

data/README.md

@@ -1,5 +1,7 @@
 # i18n-tasks [![Build Status][badge-ci]][ci] [![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)
 
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua/)
+
 i18n-tasks helps you find and manage missing and unused translations.
 
 <img width="539" height="331" src="https://i.imgur.com/XZBd8l7.png">
@@ -22,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', '~> 0.9.37'
+gem 'i18n-tasks', '~> 1.0.13'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -115,6 +117,17 @@ $ i18n-tasks translate-missing --backend=yandex
 $ i18n-tasks translate-missing --from=en es fr
 ```
 
+### OpenAI Translate missing keys
+
+Translate missing values with OpenAI ([more below on the API key](#openai-translation-config)).
+
+```console
+$ i18n-tasks translate-missing --backend=openai
+
+# 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`:
@@ -221,7 +234,7 @@ See the full list of tasks with `i18n-tasks --help`.
 
 ### Features and limitations
 
-`i18n-tasks` uses an AST scanner for `.rb` files, and a regexp-based scanner for other files, such as `.haml`.
+`i18n-tasks` uses an AST scanner for `.rb` and `.html.erb` files, and a regexp-based scanner for other files, such as `.haml`.
 
 #### Relative keys
 
@@ -333,6 +346,7 @@ A special syntax similar to file glob patterns is used throughout i18n-tasks to
 |:------------:|:----------------------------------------------------------|
 |      `*`     | matches everything                                        |
 |      `:`     | matches a single key                                      |
+|      `*:`    | matches part of a single key                              |
 |   `{a, b.c}` | match any in set, can use `:` and `*`, match is captured  |
 
 Example of usage:
@@ -353,7 +367,7 @@ If you have implemented a custom adapter please share it on [the wiki][wiki].
 
 ### Usage search
 
-i18n-tasks uses an AST scanner for `.rb` files, and a regexp scanner for all other files.
+i18n-tasks uses an AST scanner for `.rb` and `.html.erb` files, and a regexp scanner for all other files.
 New scanners can be added easily: please refer to [this example](https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example).
 
 See the `search` section in the [config file][config] for all available configuration options.
@@ -421,6 +435,17 @@ translation:
   yandex_api_key: <Yandex API key>
 ```
 
+<a name="openai-translation-config"></a>
+### OpenAI Translate
+
+`i18n-tasks translate-missing` requires a OpenAI API key, get it at [OpenAI](https://openai.com/).
+
+```yaml
+# config/i18n-tasks.yml
+translation:
+  openai_api_key: <OpenAI API key>
+```
+
 ## Interactive console
 
 `i18n-tasks irb` starts an IRB session in i18n-tasks context. Type `guide` for more information.
@@ -434,15 +459,28 @@ See [i18n-tasks wiki: CSV import and export tasks](https://github.com/glebm/i18n
 Tasks that come with the gem are defined in [lib/i18n/tasks/command/commands](lib/i18n/tasks/command/commands).
 Custom tasks can be added easily, see the examples [on the wiki](https://github.com/glebm/i18n-tasks/wiki#custom-tasks).
 
+# Development
+
+- Install dependencies using `bundle install`
+- Run tests using `bundle exec rspec`
+- Install [Overcommit](https://github.com/sds/overcommit) by running `overcommit --install`
+
+## Skip Overcommit-hooks
+
+- `SKIP=RuboCop git commit`
+- `OVERCOMMIT_DISABLE=1 git commit`
+
+
 [MIT license]: /LICENSE.txt
 [ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml
 [badge-ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml/badge.svg
 [coverage]: https://codeclimate.com/github/glebm/i18n-tasks
 [badge-coverage]: https://api.codeclimate.com/v1/badges/5d173e90ada8df07cedc/test_coverage
-[config]: https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
+[config]: https://github.com/glebm/i18n-tasks/blob/main/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"
 [screenshot-i18n-tasks]: https://i.imgur.com/XZBd8l7.png "i18n-tasks screenshot"
 [screenshot-find]: https://i.imgur.com/VxBrSfY.png "i18n-tasks find output screenshot"
-[adapter-example]: https://github.com/glebm/i18n-tasks/blob/master/lib/i18n/tasks/data/file_system_base.rb
+[adapter-example]: https://github.com/glebm/i18n-tasks/blob/main/lib/i18n/tasks/data/file_system_base.rb
 [custom-scanner-docs]: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+[overcommit]: https://github.com/sds/overcommit#installation

data/Rakefile

@@ -9,5 +9,5 @@ task :irb do
   # $: << File.expand_path('lib', __FILE__)
   require 'i18n/tasks'
   require 'i18n/tasks/commands'
-  ::I18n::Tasks::Commands.new(::I18n::Tasks::BaseTask.new).irb
+  I18n::Tasks::Commands.new(I18n::Tasks::BaseTask.new).irb
 end

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
@@ -95,6 +96,8 @@ en:
           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.
+        specific_target_missing: You must supply a specific variant for the given target language
+          e.g. en-us instead of en.
     google_translate:
       errors:
         no_api_key: >-
@@ -109,6 +112,12 @@ en:
     missing:
       details_title: Value in other locales or source
       none: No translations are missing.
+    openai_translate:
+      errors:
+        no_api_key: >-
+          Set OpenAI API key via OPENAI_API_KEY environment variable or translation.openai_api_key
+          in config/i18n-tasks.yml. Get the key at https://openai.com/.
+        no_results: OpenAI returned no results.
     remove_unused:
       confirm:
         one: "%{count} translation will be removed from %{locales}."

data/config/locales/ru.yml

@@ -94,6 +94,8 @@ ru:
           Задайте ключ API DeepL через переменную окружения DEEPL_AUTH_KEY или translation.deepl_api_key
           Получите ключ через https://www.deepl.com/pro.
         no_results: DeepL не дал результатов.
+        specific_target_missing: You must supply a specific variant for the given target language
+          e.g. en-us instead of en.
     google_translate:
       errors:
         no_api_key: >-
@@ -109,6 +111,12 @@ ru:
     missing:
       details_title: На других языках или в коде
       none: Всё переведено.
+    openai_translate:
+      errors:
+        no_api_key: |-
+          Установить ключ API Яндекса с помощью переменной среды OPENAI_API_KEY или translation.openai_api_key
+           в config / i18n-tasks.yml. Получите ключ по адресу https://openai.com/.
+        no_results: Яндекс не дал результатов.
     remove_unused:
       confirm:
         few: Переводы (%{count}) будут удалены из %{locales}.

data/i18n-tasks.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'i18n/tasks/version'
 
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
   s.name          = 'i18n-tasks'
   s.version       = I18n::Tasks::VERSION
   s.authors       = ['glebm']
@@ -22,31 +22,38 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
     cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
     # Add an RSpec for missing and unused keys:
     cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
+    # Or for minitest:
+    cp $(bundle exec i18n-tasks gem-path)/templates/minitest/i18n_test.rb test/
   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.6', '< 4.0' if s.respond_to?(:required_ruby_version=)
+  s.metadata = {
+    'issue_tracker' => 'https://github.com/glebm/i18n-tasks',
+    'rubygems_mfa_required' => 'true'
+  }
+  s.required_ruby_version = '>= 2.6', '< 4.0'
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) } - %w[i18n-tasks.cmd]
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.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'
-  s.add_dependency 'parser', '>= 2.2.3.0'
+  s.add_dependency 'parser', '>= 3.2.2.1'
   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', '~> 2.0', '>= 2.0.1'
+  s.add_development_dependency 'overcommit', '~> 0.58.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
-  s.add_development_dependency 'rubocop', '~> 1.6.1'
+  s.add_development_dependency 'rubocop', '~> 1.50.1'
+  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.19.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
 

data/lib/i18n/tasks/cli.rb

@@ -35,13 +35,14 @@ class I18n::Tasks::CLI
 
   def run(argv)
     argv.each_with_index do |arg, i|
-      if ["--config", "-c"].include?(arg)
-        if File.exist?(argv[i+1])
-          @config_file = argv[i+1]
-          break
-        else
-          error "Config file doesn't exist: #{argv[i+1]}", 128
-        end
+      next unless ['--config', '-c'].include?(arg)
+
+      _, config_file = argv.slice!(i, 2)
+      if File.exist?(config_file)
+        @config_file = config_file
+        break
+      else
+        error "Config file doesn't exist: #{config_file}", 128
       end
     end
 

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

@@ -16,6 +16,7 @@ module I18n::Tasks
       end
 
       def run(name, opts = {})
+        log_stderr "#{Rainbow('#StandWith').bg(:blue)}#{Rainbow('Ukraine').bg(:yellow)}"
         name = name.to_sym
         public_name = name.to_s.tr '_', '-'
         log_verbose "task: #{public_name}(#{opts.map { |k, v| "#{k}: #{v.inspect}" } * ', '})"

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]
+          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,17 +57,21 @@ 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
-        def add_missing(opt = {})
+        def add_missing(opt = {}) # rubocop:disable Metrics/AbcSize
           [
             [i18n.base_locale] & opt[:locales],
             opt[:locales] - [i18n.base_locale]
           ].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/command/options/common.rb

@@ -33,7 +33,6 @@ module I18n::Tasks
             '--config FILE',
             t('i18n_tasks.cmd.args.desc.config')
 
-
         def arg_or_pos!(key, opts)
           opts[key] ||= opts[:arguments].try(:shift)
         end

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

@@ -86,7 +86,7 @@ module I18n::Tasks
           when 'keys'
             puts forest.key_names(root: true)
           when 'key-values'
-            puts forest.key_values(root: true).map { |kv| kv.join("\t") }
+            puts(forest.key_values(root: true).map { |kv| kv.join("\t") })
           when *DATA_FORMATS
             puts i18n.data.adapter_dump forest.to_hash(true), format
           end

data/lib/i18n/tasks/concurrent/cached_value.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/concurrent/cached_value'
-
 module I18n::Tasks::Concurrent
   # A thread-safe memoized value.
   # The given computation is guaranteed to be invoked at most once.

data/lib/i18n/tasks/configuration.rb

@@ -30,6 +30,13 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
           warn_deprecated 'Please move relative_roots under search in config/i18n-tasks.yml.'
           c[:search][:relative_roots] = c.delete(:relative_roots)
         end
+
+        if c.dig(:search, :exclude_method_name_paths)
+          warn_deprecated(
+            'Please rename exclude_method_name_paths to relative_exclude_method_name_paths in config/i18n-tasks.yml.'
+          )
+          c[:search][:relative_exclude_method_name_paths] = c[:search].delete(:exclude_method_name_paths)
+        end
       end
     else
       {}.with_indifferent_access
@@ -44,12 +51,10 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   # data config
   #  @return [Hash<adapter: String, options: Hash>]
   def data_config
-    @config_sections[:data] ||= begin
-      {
-        adapter: data.class.name,
-        config: data.config
-      }
-    end
+    @config_sections[:data] ||= {
+      adapter: data.class.name,
+      config: data.config
+    }
   end
 
   # translation config
@@ -61,6 +66,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
       conf[:deepl_api_key] = ENV['DEEPL_AUTH_KEY'] if ENV.key?('DEEPL_AUTH_KEY')
       conf[:deepl_host] = ENV['DEEPL_HOST'] if ENV.key?('DEEPL_HOST')
       conf[:deepl_version] = ENV['DEEPL_VERSION'] if ENV.key?('DEEPL_VERSION')
+      conf[:openai_api_key] = ENV['OPENAI_API_KEY'] if ENV.key?('OPENAI_API_KEY')
       conf[:yandex_api_key] = ENV['YANDEX_API_KEY'] if ENV.key?('YANDEX_API_KEY')
       conf
     end
@@ -82,7 +88,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
       valid_locales = Dir[File.join(I18n::Tasks.gem_path, 'config', 'locales', '*.yml')]
                       .map { |f| File.basename(f, '.yml') }
       unless valid_locales.include?(internal_locale)
-        log_warn "invalid internal_locale #{internal_locale.inspect}. "\
+        log_warn "invalid internal_locale #{internal_locale.inspect}. " \
                  "Available internal locales: #{valid_locales * ', '}."
         internal_locale = DEFAULTS[:internal_locale].to_s
       end

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

@@ -5,11 +5,14 @@ module I18n::Tasks
   module Data
     module Adapter
       module YamlAdapter
+        EMOJI_REGEX = /\\u[\da-f]{8}/i.freeze
+        TRAILING_SPACE_REGEX = / $/.freeze
+
         class << self
           # @return [Hash] locale tree
           def parse(str, options)
             if YAML.method(:load).arity.abs == 2
-              YAML.load(str, **(options || {}))
+              YAML.safe_load(str, **(options || {}), permitted_classes: [Symbol], aliases: true)
             else
               # older jruby and rbx 2.2.7 do not accept options
               YAML.load(str)
@@ -18,7 +21,17 @@ module I18n::Tasks
 
           # @return [String]
           def dump(tree, options)
-            tree.to_yaml(options || {})
+            strip_trailing_spaces(restore_emojis(tree.to_yaml(options || {})))
+          end
+
+          # @return [String]
+          def restore_emojis(yaml)
+            yaml.gsub(EMOJI_REGEX) { |m| [m[-8..].to_i(16)].pack('U') }
+          end
+
+          # @return [String]
+          def strip_trailing_spaces(yaml)
+            yaml.gsub(TRAILING_SPACE_REGEX, '')
           end
         end
       end

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

@@ -55,7 +55,7 @@ module I18n
           return if File.file?(path) && content == read_file(path)
 
           ::FileUtils.mkpath(File.dirname(path))
-          ::File.open(path, 'w') { |f| f.write content }
+          ::File.write(path, content)
         end
 
         def normalized?(path, tree)

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -38,7 +38,7 @@ module I18n::Tasks
           if pattern
             key_match = $~
             path      = format(path, locale: locale)
-            path.gsub!(/\\\d+/) { |m| key_match[m[1..-1].to_i] }
+            path.gsub!(/\\\d+/) { |m| key_match[m[1..].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else
             fail CommandError, "Cannot route key #{key}. Routes are #{@routes_config.inspect}"

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

@@ -168,7 +168,7 @@ module I18n::Tasks::Data::Tree
       label = if key.nil?
                 Rainbow('∅').faint
               else
-                [Rainbow(key).color(1 + level % 15),
+                [Rainbow(key).color(1 + (level % 15)),
                  (": #{format_value_for_inspect(value)}" if leaf?),
                  (" #{data}" if data?)].compact.join
               end

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

@@ -31,13 +31,11 @@ module I18n::Tasks::Data::Tree
     end
 
     def to_hash(sort = false)
-      (@hash ||= {})[sort] ||= begin
-        if sort
-          sort_by(&:key)
-        else
-          self
-        end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
-      end
+      (@hash ||= {})[sort] ||= if sort
+                                 sort_by(&:key)
+                               else
+                                 self
+                               end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
     end
 
     delegate :to_json, to: :to_hash

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

@@ -3,7 +3,6 @@
 require 'set'
 require 'i18n/tasks/split_key'
 require 'i18n/tasks/data/tree/nodes'
-require 'i18n/tasks/data/tree/node'
 
 module I18n::Tasks::Data::Tree
   # Siblings represents a subtree sharing a common parent
@@ -50,7 +49,7 @@ module I18n::Tasks::Data::Tree
             next
           end
           match = $~
-          new_key = to_pattern.gsub(/\\\d+/) { |m| match[m[1..-1].to_i] }
+          new_key = to_pattern.gsub(/\\\d+/) { |m| match[m[1..].to_i] }
           old_key_to_new_key[full_key] = new_key
           moved_forest.merge!(Siblings.new.tap do |forest|
             forest[[(node.root.try(:key) unless root), new_key].compact.join('.')] =

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

@@ -161,12 +161,12 @@ module I18n::Tasks
       end
 
       def grep_keys(match, opts = {})
-        select_keys(opts) do |full_key, _node|
+        select_keys(**opts) do |full_key, _node|
           match === full_key # rubocop:disable Style/CaseEquality
         end
       end
 
-      def set_each_value!(val_pattern, key_pattern = nil, &value_proc)
+      def set_each_value!(val_pattern, key_pattern = nil, &value_proc) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         value_proc ||= proc do |node|
           node_value = node.value
           next node_value if node.reference?
@@ -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/html_keys.rb

@@ -7,8 +7,8 @@ module I18n::Tasks
 
     def html_key?(full_key, locale)
       !!(full_key =~ HTML_KEY_PATTERN ||
-          full_key =~ MAYBE_PLURAL_HTML_KEY_PATTERN &&
-              depluralize_key(split_key(full_key, 2)[1], locale) =~ HTML_KEY_PATTERN)
+          (full_key =~ MAYBE_PLURAL_HTML_KEY_PATTERN &&
+              depluralize_key(split_key(full_key, 2)[1], locale) =~ HTML_KEY_PATTERN))
     end
   end
 end

data/lib/i18n/tasks/interpolations.rb

@@ -2,22 +2,26 @@
 
 module I18n::Tasks
   module Interpolations
-    VARIABLE_REGEX = /%{[^}]+}/.freeze
+    class << self
+      attr_accessor :variable_regex
+    end
+    @variable_regex = /%{[^}]+}/.freeze
 
     def inconsistent_interpolations(locales: nil, base_locale: nil) # rubocop:disable Metrics/AbcSize
       locales ||= self.locales
       base_locale ||= self.base_locale
       result = empty_forest
+      variable_regex = I18n::Tasks::Interpolations.variable_regex
 
       data[base_locale].key_values.each do |key, value|
         next if !value.is_a?(String) || ignore_key?(key, :inconsistent_interpolations)
 
-        base_vars = Set.new(value.scan(VARIABLE_REGEX))
+        base_vars = Set.new(value.scan(variable_regex))
         (locales - [base_locale]).each do |current_locale|
           node = data[current_locale].first.children[key]
           next unless node&.value.is_a?(String)
 
-          if base_vars != Set.new(node.value.scan(VARIABLE_REGEX))
+          if base_vars != Set.new(node.value.scan(variable_regex))
             result.merge!(node.walk_to_root.reduce(nil) { |c, p| [p.derive(children: c)] })
           end
         end

data/lib/i18n/tasks/key_pattern_matching.rb

@@ -21,6 +21,7 @@ module I18n::Tasks::KeyPatternMatching
   # In patterns:
   #      *     is like .* in regexs
   #      :     matches a single key
+  #      *:    matches part of a single key, equivalent to `[^.]+?` regex
   #   { a, b.c } match any in set, can use : and *, match is captured
   def compile_key_pattern(key_pattern)
     return key_pattern if key_pattern.is_a?(Regexp)
@@ -31,6 +32,7 @@ module I18n::Tasks::KeyPatternMatching
   def key_pattern_re_body(key_pattern)
     key_pattern
       .gsub(/\./, '\.')
+      .gsub(/\*:/, '[^.]+?')
       .gsub(/\*/, '.*')
       .gsub(/:/, '(?<=^|\.)[^.]+?(?=\.|$)')
       .gsub(/\{(.*?)}/) { "(#{Regexp.last_match(1).strip.gsub(/\s*,\s*/, '|')})" }

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