i18n-tasks 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cc5711c56c707bafd3ee3c344220c54976c2a7a
-  data.tar.gz: 8d90bbc68292fd2ee20a843f1770013542cd50bc
+  metadata.gz: d0cac577152584d62e48767e77416aa559bed589
+  data.tar.gz: 5b981968e66f977fd24c8d2d16fc840614d88146
 SHA512:
-  metadata.gz: 71bcef7b28fe7a5ad8fcd0b0c3c69d13b15e279cd288b07616999234faea165c84c8bba2860fc76353366c7242746210264cabedc46f63ea8111c397b173db85
-  data.tar.gz: a603c30adaa7d37be7439bc9063da2d41406cce3a2021bbff4f6f655bb4e699ce5c72a1bc3797a997eb92fa056f0f14e55285f3c0ea57efd9a6b6a5c5bcebc29
+  metadata.gz: '09b634136cd5a68aa0f37c5b272cf55bda9880181e68c173d1247acb5c629c825317b0aea9e64f5a09387e1ae4c87813d4988c930dfa07f0d088f616b6da165d'
+  data.tar.gz: 78d5153233fd8050e9394761010fb11344bdfc84f0d2f6786a2d016026e1027938a3b625a686e004f988bb6551aad3ae677ea8584c7356a09f01266807903e48

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', '~> 0.9.15'
+gem 'i18n-tasks', '~> 0.9.16'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -224,6 +224,11 @@ all the dynamic parts of the key will be considered used, e.g. `cats.tenderlove.
 Note that only one section of the key is treated as a wildcard for each string interpolation; i.e. in this example,
 `cats.tenderlove.special.name` *will* be reported as unused.
 
+#### I18n.localize
+
+`I18n.localize` is not supported, use [i18n-tasks-use hints](#fine-tuning).
+This is because the key generated by `I18n.localize` depends on the type of the object passed in and thus cannot be inferred statically.
+
 ## Configuration
 
 Configuration is read from `config/i18n-tasks.yml` or `config/i18n-tasks.yml.erb`.

data/lib/i18n/tasks/google_translation.rb

@@ -95,13 +95,17 @@ module I18n::Tasks
       end
     end
 
-    INTERPOLATION_KEY_RE  = /%\{[^}]+\}/
+    INTERPOLATION_KEY_RE  = /%\{[^}]+}/
     UNTRANSLATABLE_STRING = 'zxzxzx'
 
     # @param [String] value
     # @return [String] 'hello, %{name}' => 'hello, <round-trippable string>'
     def replace_interpolations(value)
-      value.gsub INTERPOLATION_KEY_RE, UNTRANSLATABLE_STRING
+      i = -1
+      value.gsub INTERPOLATION_KEY_RE do
+        i += 1
+        "#{UNTRANSLATABLE_STRING}#{i}"
+      end
     end
 
     # @param [String] untranslated
@@ -109,8 +113,17 @@ module I18n::Tasks
     # @return [String] 'hello, <round-trippable string>' => 'hello, %{name}'
     def restore_interpolations(untranslated, translated)
       return translated if untranslated !~ INTERPOLATION_KEY_RE
-      each_value = untranslated.scan(INTERPOLATION_KEY_RE).to_enum
-      translated.gsub(Regexp.new(UNTRANSLATABLE_STRING, Regexp::IGNORECASE)) { each_value.next }
+      values = untranslated.scan(INTERPOLATION_KEY_RE)
+      translated.gsub(/#{Regexp.escape(UNTRANSLATABLE_STRING)}\d+/i) do |m|
+        values[m[UNTRANSLATABLE_STRING.length..-1].to_i]
+      end
+    rescue StandardError => e
+      raise CommandError.new(e, <<-TEXT.strip)
+Error when restoring interpolations:
+  original: "#{untranslated}"
+  response: "#{translated}"
+  error: #{e.message} (#{e.class.name})
+      TEXT
     end
   end
 end

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

@@ -117,9 +117,9 @@ module I18n::Tasks::Scanners
         node.children[0].to_s
       elsif %i[true false].include?(node.type)
         node.type.to_s
-      elsif :nil == node.type
+      elsif node.type == :nil
         ''
-      elsif :array == node.type && array_join_with
+      elsif node.type == :array && array_join_with
         extract_array_as_string(
           node,
           array_join_with:    array_join_with,
@@ -154,7 +154,7 @@ module I18n::Tasks::Scanners
         else
           # ignore dynamic argument in strict mode
           return nil if config[:strict]
-          if %i[dsym dstr].include?(child.type) || (:array == child.type && array_flatten)
+          if %i[dsym dstr].include?(child.type) || (child.type == :array && array_flatten)
             extract_string(child, array_join_with: array_join_with)
           else
             "\#{#{child.loc.expression.source}}"

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

@@ -15,8 +15,8 @@ module I18n::Tasks::Scanners
     # @param literal [String] e.g: "key", 'key', or :key.
     # @return [String] key
     def strip_literal(literal)
-      literal = literal[1..-1] if ':' == literal[0]
-      literal = literal[1..-2] if "'" == literal[0] || '"' == literal[0]
+      literal = literal[1..-1] if literal[0] == ':'
+      literal = literal[1..-2] if literal[0] == "'" || literal[0] == '"'
       literal
     end
 

data/lib/i18n/tasks/used_keys.rb

@@ -124,7 +124,7 @@ module I18n::Tasks
 
     # @return [Boolean] whether the key is potentially used in a code expression such as `t("category.#{category_key}")`
     def used_in_expr?(key)
-      !!(key =~ expr_key_re) # rubocop:disable Style/DoubleNegation,Style/InverseMethods
+      !!(key =~ expr_key_re) # rubocop:disable Style/DoubleNegation
     end
 
     private

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.15'
+    VERSION = '0.9.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis