i18n-tasks 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e77c4c19ca040adf1879259e8ad1d963e181eb1682e97ffa99f5b09d1b59e803
-  data.tar.gz: cc5ed0a16159c8f14a9006ab3908cfdc93b5dbc338603d54846d0ae4f84abb80
+  metadata.gz: bd61ceb254dc1c44768bd40672b3f31635c9d42fb237950cbdfe64fef642a850
+  data.tar.gz: ae6981dd739636ddb5f1bae1ca9e5cf05ba991fd1345a5488e1cfa8561833877
 SHA512:
-  metadata.gz: 978d87d9e73dc5f4e183a7fdebabeec9864c3b1ba530f722bc3a80428b1c422eeda55f2bbd2b7ec8c1a67649ee128db4ae9ab0fc24db4b8cf386f7740b0f34d4
-  data.tar.gz: 46a0b0cbb262c17aaf1195293edd1fc04d665dd85d5f8d1b399f1ae565db2eb99e3e281fb1a34a5cb3629aadee2c2b279642d8beca623814fcd9b75c0c502b5e
+  metadata.gz: 1312910139411cc4695bea0f0de8624d49958efac33c8c7b7bd99fb3f351d408d0a6980789ec81a43452bc29a15292f6de9719ace0e3b902866d63c02f5cab79
+  data.tar.gz: e782f1bc1f1ad68cc33583d014c879b3d121ba2e0990db8cc109f864aeb0e98f0a97030300294e31e9041899b131b2b677fe6917f705d09bda6bf07aed588b42

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.12'
+gem 'i18n-tasks', '~> 1.0.14', group: :development
 ```
 
 Copy the default [configuration file](#configuration):
@@ -117,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`:
@@ -327,6 +338,33 @@ data:
 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).
 
+##### Isolating router
+
+Isolating router assumes each YAML file is independent and can contain similar keys.
+
+As a result, the translations are written to an alternate target file for each source file
+(only the `%{locale}` part is changed to match target locale). Thus, it is not necessary to
+specify any `write` configuration (in fact, it would be completely ignored).
+
+This can be useful for example when using [ViewComponent sidecars](https://viewcomponent.org/guide/translations.html)
+(ViewComponent assigns an implicit scope to each sidecar YAML file but `i18n-tasks` is not aware of
+that logic, resulting in collisions):
+
+* `app/components/movies_component.en.yml`:
+   ```yaml
+   en:
+     title: Movies
+   ```
+
+* `app/components/games_component.en.yml`
+   ```yaml
+   en:
+     title: Games
+   ```
+
+This router has a limitation, though: it does not support detecting missing keys from code usage
+(since it is not aware of the implicit scope logic).
+
 ##### Key pattern syntax
 
 A special syntax similar to file glob patterns is used throughout i18n-tasks to match translation keys:
@@ -335,6 +373,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:
@@ -399,6 +438,12 @@ translation:
   google_translate_api_key: <Google Translate API key>
 ```
 
+or via environment variable:
+
+```bash
+GOOGLE_TRANSLATE_API_KEY=<Google Translate API key>
+```
+
 <a name="deepl-translation-config"></a>
 ### DeepL Pro Translate
 
@@ -410,6 +455,19 @@ translation:
   deepl_api_key: <DeepL Pro API key>
   deepl_host: <optional>
   deepl_version: <optional>
+  deepl_glossary_ids:
+    - f28106eb-0e06-489e-82c6-8215d6f95089
+    - 2c6415be-1852-4f54-9e1b-d800463496b4
+  deepl_options:
+    formality: prefer_less
+```
+
+or via environment variables:
+
+```bash
+DEEPL_API_KEY=<DeepL Pro API key>
+DEEPL_HOST=<optional>
+DEEPL_VERSION=<optional>
 ```
 
 <a name="yandex-translation-config"></a>
@@ -423,6 +481,31 @@ translation:
   yandex_api_key: <Yandex API key>
 ```
 
+or via environment variable:
+
+```bash
+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>
+  openai_model: <optional>
+```
+
+or via environment variable:
+
+```bash
+OPENAI_API_KEY=<OpenAI API key>
+OPENAI_MODEL=<optional>
+```
+
 ## Interactive console
 
 `i18n-tasks irb` starts an IRB session in i18n-tasks context. Type `guide` for more information.
@@ -440,7 +523,7 @@ Custom tasks can be added easily, see the examples [on the wiki](https://github.
 
 - Install dependencies using `bundle install`
 - Run tests using `bundle exec rspec`
-- Install [Overcommit](overcommit) by running `overcommit --install`
+- Install [Overcommit](https://github.com/sds/overcommit) by running `overcommit --install`
 
 ## Skip Overcommit-hooks
 

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

@@ -16,12 +16,10 @@ en:
           data_format: 'Data format: %{valid_text}.'
           keep_order: Keep the order of the keys
           key_pattern: Filter by key pattern (e.g. 'common.*')
-          key_pattern_to_rename: Full key (pattern) to rename. Required
           locale: :i18n_tasks.common.locale
           locale_to_translate_from: Locale to translate from
           locales_filter: 'Locale(s) to process. Special: base'
           missing_types: 'Filter by types: %{valid}'
-          new_key_name: New name, interpolates original name as %{key}. Required
           nostdin: Do not read from stdin
           out_format: 'Output format: %{valid_text}'
           pattern_router: 'Use pattern router: keys moved per config data.write'
@@ -30,13 +28,14 @@ en:
             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}
+            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, 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
+        cp: copy the keys in locale data that match the given pattern
         data: show locale data
         data_merge: merge locale data with trees
         data_remove: remove keys present in tree from data
@@ -96,6 +95,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: >-
@@ -110,6 +111,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

@@ -13,28 +13,27 @@ ru:
           data_format: 'Формат данных: %{valid_text}.'
           keep_order: Keep the order of the keys
           key_pattern: Маска ключа (например, common.*)
-          key_pattern_to_rename: Полный ключ (шаблон) для переименования. Необходимый параметр.
           locale: 'Язык. По умолчанию: base'
           locale_to_translate_from: 'Язык, с которого переводить (по умолчанию: base)'
           locales_filter: >-
             Список языков для обработки, разделенный запятыми (,). По умолчанию: все. Специальное
             значение: base.
           missing_types: 'Типы недостающих переводов: %{valid}. По умолчанию: все'
-          new_key_name: Новое имя, интерполирует оригинальное название как %{key}. Необходимый параметр.
           nostdin: Не читать дерево из стандартного ввода
           out_format: 'Формат вывода: %{valid_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}
+            Значение, интерполируется с %%{value}, %%{human_key}, %%{key}, %%{default}, %%{value_or_human_key},
+            %%{value_or_default_or_human_key}
       desc:
         add_missing: добавить недостающие ключи к переводам
         check_consistent_interpolations: убедитесь, что во всех переводах используются правильные
           интерполяционные переменные
         check_normalized: проверить, что все файлы переводов нормализованы
         config: показать конфигурацию
+        cp: скопируйте ключи в данных локали, соответствующие заданному шаблону
         data: показать данные переводов
         data_merge: добавить дерево к переводам
         data_remove: удалить ключи, которые есть в дереве, из данных
@@ -94,6 +93,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 +110,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']
@@ -35,16 +35,14 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   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'
@@ -52,7 +50,9 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   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.27.0'
+  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,14 +35,14 @@ class I18n::Tasks::CLI
 
   def run(argv)
     argv.each_with_index do |arg, i|
-      if ['--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
+      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/commands/data.rb

@@ -46,6 +46,20 @@ module I18n::Tasks
           terminal_report.mv_results results
         end
 
+        cmd :cp,
+            pos: 'FROM_KEY_PATTERN TO_KEY_PATTERN',
+            desc: t('i18n_tasks.cmd.desc.cp')
+        def cp(opt = {})
+          fail CommandError, 'requires FROM_KEY_PATTERN and TO_KEY_PATTERN' if opt[:arguments].size < 2
+
+          from_pattern = opt[:arguments].shift
+          to_pattern = opt[:arguments].shift
+          forest = i18n.data_forest
+          results = forest.mv_key!(compile_key_pattern(from_pattern), to_pattern, root: false, retain: true)
+          i18n.data.write forest
+          terminal_report.cp_results results
+        end
+
         cmd :rm,
             pos: 'KEY_PATTERN [KEY_PATTERN...]',
             desc: t('i18n_tasks.cmd.desc.rm')

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

@@ -43,7 +43,7 @@ module I18n::Tasks
             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 }
@@ -61,7 +61,7 @@ module I18n::Tasks
                    ['--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]

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

@@ -26,7 +26,7 @@ module I18n::Tasks
         arg :value,
             '-v',
             '--value VALUE',
-            t('i18n_tasks.cmd.args.desc.value')
+            t('i18n_tasks.cmd.args.desc.value', dummy: 'value') # Dummy value is workaround for https://github.com/ruby-i18n/i18n/issues/689
 
         arg :config,
             '-c',

data/lib/i18n/tasks/configuration.rb

@@ -66,6 +66,8 @@ 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[:openai_model] = ENV['OPENAI_MODEL'] if ENV.key?('OPENAI_MODEL')
       conf[:yandex_api_key] = ENV['YANDEX_API_KEY'] if ENV.key?('YANDEX_API_KEY')
       conf
     end
@@ -87,7 +89,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

@@ -6,6 +6,7 @@ module I18n::Tasks
     module Adapter
       module YamlAdapter
         EMOJI_REGEX = /\\u[\da-f]{8}/i.freeze
+        TRAILING_SPACE_REGEX = / $/.freeze
 
         class << self
           # @return [Hash] locale tree
@@ -20,13 +21,18 @@ module I18n::Tasks
 
           # @return [String]
           def dump(tree, options)
-            restore_emojis(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
     end

data/lib/i18n/tasks/data/file_system_base.rb

@@ -3,6 +3,7 @@
 require 'i18n/tasks/data/tree/node'
 require 'i18n/tasks/data/router/pattern_router'
 require 'i18n/tasks/data/router/conservative_router'
+require 'i18n/tasks/data/router/isolating_router'
 require 'i18n/tasks/data/file_formats'
 require 'i18n/tasks/key_pattern_matching'
 
@@ -151,6 +152,7 @@ module I18n::Tasks
 
       ROUTER_NAME_ALIASES = {
         'conservative_router' => 'I18n::Tasks::Data::Router::ConservativeRouter',
+        'isolating_router' => 'I18n::Tasks::Data::Router::IsolatingRouter',
         'pattern_router' => 'I18n::Tasks::Data::Router::PatternRouter'
       }.freeze
       def router
@@ -170,6 +172,9 @@ module I18n::Tasks
         end.map do |path|
           [path.freeze, load_file(path) || {}]
         end.map do |path, data|
+          if router.is_a?(I18n::Tasks::Data::Router::IsolatingRouter)
+            data.transform_values! { |tree| { "<#{router.alternate_path_for(path, base_locale)}>" => tree } }
+          end
           filter_nil_keys! path, data
           Data::Tree::Siblings.from_nested_hash(data).tap do |s|
             s.leaves { |x| x.data.update(path: path, locale: locale) }

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

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+require 'i18n/tasks/key_pattern_matching'
+require 'i18n/tasks/data/tree/node'
+
+module I18n::Tasks
+  module Data::Router
+    # Route based on source file path
+    class IsolatingRouter
+      include ::I18n::Tasks::KeyPatternMatching
+
+      attr_reader :config_read_patterns, :base_locale
+
+      def initialize(_adapter, data_config)
+        @base_locale = data_config[:base_locale]
+        @config_read_patterns = Array.wrap(data_config[:read])
+      end
+
+      # Route keys to destinations
+      # @param forest [I18n::Tasks::Data::Tree::Siblings] forest roots are locales.
+      # @yieldparam [String] dest_path
+      # @yieldparam [I18n::Tasks::Data::Tree::Siblings] tree_slice
+      # @return [Hash] mapping of destination => [ [key, value], ... ]
+      def route(locale, forest, &block)
+        return to_enum(:route, locale, forest) unless block
+
+        locale = locale.to_s
+        out = {}
+
+        forest.keys do |key_namespaced_with_source_path, _node|
+          source_path, key = key_namespaced_with_source_path.match(/\A<([^>]*)>\.(.*)/).captures
+          target_path = alternate_path_for(source_path, locale)
+          next unless source_path && key && target_path
+
+          (out[target_path] ||= Set.new) << "#{locale}.#{key}"
+        end
+
+        out.each do |target_path, keys|
+          file_namespace_subtree = I18n::Tasks::Data::Tree::Siblings.new(
+            nodes: forest.get("#{locale}.<#{alternate_path_for(target_path, base_locale)}>")
+          )
+          file_namespace_subtree.set_root_key!(locale)
+
+          block.yield(
+            target_path,
+            file_namespace_subtree.select_keys { |key, _| keys.include?(key) }
+          )
+        end
+      end
+
+      def alternate_path_for(source_path, locale)
+        source_path = source_path.dup
+
+        config_read_patterns.each do |pattern|
+          regexp = Glob.new(format(pattern, locale: '(*)')).to_regexp
+          next unless source_path.match?(regexp)
+
+          source_path.match(regexp) do |match_data|
+            (1..match_data.size - 1).reverse_each do |capture_index|
+              capture_begin, capture_end = match_data.offset(capture_index)
+              source_path.slice!(Range.new(capture_begin, capture_end, true))
+              source_path.insert(capture_begin, locale.to_s)
+            end
+          end
+
+          return source_path
+        end
+
+        nil
+      end
+
+      # based on https://github.com/alexch/rerun/blob/36f2d237985b670752abbe4a7f6814893cdde96f/lib/rerun/glob.rb
+      class Glob
+        NO_LEADING_DOT = '(?=[^\.])'
+        START_OF_FILENAME = '(?:\A|\/)'
+        END_OF_STRING = '\z'
+
+        def initialize(pattern)
+          @pattern = pattern
+        end
+
+        def to_regexp_string # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+          chars = smoosh(@pattern.chars)
+
+          curlies = 0
+          escaping = false
+
+          string = chars.map do |char|
+            if escaping
+              escaping = false
+              next char
+            end
+
+            case char
+            when '**' then '(?:[^/]+/)*'
+            when '*' then '.*'
+            when '?' then '.'
+            when '.' then '\.'
+            when '{'
+              curlies += 1
+              '('
+            when '}'
+              if curlies.positive?
+                curlies -= 1
+                ')'
+              else
+                char
+              end
+            when ','
+              if curlies.positive?
+                '|'
+              else
+                char
+              end
+            when '\\'
+              escaping = true
+              '\\'
+            else char
+            end
+          end.join
+
+          START_OF_FILENAME + string + END_OF_STRING
+        end
+
+        def to_regexp
+          Regexp.new(to_regexp_string)
+        end
+
+        def smoosh(chars)
+          out = []
+          until chars.empty?
+            char = chars.shift
+            if char == '*' && chars.first == '*'
+              chars.shift
+              chars.shift if chars.first == '/'
+              out.push('**')
+            else
+              out.push(char)
+            end
+          end
+          out
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module I18n::Tasks::Data::Tree
     # @param to_pattern [Regexp]
     # @param root [Boolean]
     # @return {old key => new key}
-    def mv_key!(from_pattern, to_pattern, root: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def mv_key!(from_pattern, to_pattern, root: false, retain: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       moved_forest = Siblings.new
       moved_nodes = []
       old_key_to_new_key = {}
@@ -69,7 +69,7 @@ module I18n::Tasks::Data::Tree
           node.value = new_target.to_sym
         end
       end
-      remove_nodes_and_emptied_ancestors! moved_nodes
+      remove_nodes_and_emptied_ancestors!(moved_nodes) unless retain
       merge! moved_forest
       old_key_to_new_key
     end

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?

data/lib/i18n/tasks/interpolations.rb

@@ -5,7 +5,7 @@ module I18n::Tasks
     class << self
       attr_accessor :variable_regex
     end
-    @variable_regex = /%{[^}]+}/.freeze
+    @variable_regex = /(?<!%)%{[^}]+}/.freeze
 
     def inconsistent_interpolations(locales: nil, base_locale: nil) # rubocop:disable Metrics/AbcSize
       locales ||= self.locales

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)
@@ -30,9 +31,10 @@ module I18n::Tasks::KeyPatternMatching
 
   def key_pattern_re_body(key_pattern)
     key_pattern
-      .gsub(/\./, '\.')
-      .gsub(/\*/, '.*')
-      .gsub(/:/, '(?<=^|\.)[^.]+?(?=\.|$)')
+      .gsub('.', '\.')
+      .gsub('*:', '[^.]+?')
+      .gsub('*', '.*')
+      .gsub(':', '(?<=^|\.)[^.]+?(?=\.|$)')
       .gsub(/\{(.*?)}/) { "(#{Regexp.last_match(1).strip.gsub(/\s*,\s*/, '|')})" }
   end
 end