i18n-tasks 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0229b3a4c2b8749a457c6b71e412a80802a6aa3
-  data.tar.gz: e43c66b6e67ef86dd28fcb7d7c9875c4578c9b84
+  metadata.gz: e38c549e1d0303125dde7b029aa4ed4f5daa13ba
+  data.tar.gz: 55337517009dfeba3b60027c9c2fe1d9dd3aca21
 SHA512:
-  metadata.gz: d370ab448ca1126486d67e810b9dab6f20ea07b5145c297a3fdbc15bf03fc6c3118434d93803b9b7ba9147b57b36f30b9582ab7af27d6d31172fe79d84157737
-  data.tar.gz: 0f1a783ca1d8ca7024d26f9506fc814ac6eff22ddb1141f4730567e73730c287e192a216ad5f4971d399d0df664ade82a8cf72301a1486e1cffff15b4a254bf9
+  metadata.gz: d9bada34e186461d3c9941f24fba746e06628681d68f925e34a874769c8046cec65d7ed06717fe0f16efefa85543db799c8a8f0997eff2f28ec2f8b3f7b81d44
+  data.tar.gz: e83e89d336812b51fc0ea49fe1364f086d1efa56008e26810955205032d7839d590d905985ef4891bd477e111f1820807f707adfc73d1f33e5245c427ec5f3c7

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.5'
+gem 'i18n-tasks', '~> 0.9.6'
 ```
 
 Copy the default [configuration file](#configuration):

data/lib/i18n/tasks/google_translation.rb

@@ -26,7 +26,7 @@ module I18n::Tasks
       # copy reference keys as is, instead of translating
       reference_key_vals = list.select { |_k, v| v.is_a? Symbol } || []
       list -= reference_key_vals
-      result  = list.group_by { |k_v| HtmlKeys.html_key? k_v[0] }.map { |is_html, list_slice|
+      result  = list.group_by { |k_v| html_key? k_v[0], opts[:from] }.map { |is_html, list_slice|
         fetch_google_translations list_slice, opts.merge(is_html ? {html: true} : {format: 'text'})
       }.reduce(:+) || []
       result.concat(reference_key_vals)

data/lib/i18n/tasks/html_keys.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 module I18n::Tasks
   module HtmlKeys
-    extend self
-    HTML_KEY_PATTERN = /[.\-_]html\z/.freeze
+    HTML_KEY_PATTERN = /[.\-_]html\z/
+    MAYBE_PLURAL_HTML_KEY_PATTERN = /[.\-_]html\.[^.]+\z/
 
-    def html_key?(full_key)
-      !!(full_key =~ HTML_KEY_PATTERN)
+    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)
     end
   end
 end

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

@@ -14,7 +14,7 @@ module I18n::Tasks::Scanners
     def initialize(**args)
       super
       @pattern          = config[:pattern].present? ? Regexp.new(config[:pattern]) : default_pattern
-      @ignore_lines_res = (config[:ignore_lines] || []).inject({}) { |h, (ext, re)| h.update(ext => Regexp.new(re)) }
+      @ignore_lines_res = (config[:ignore_lines] || []).inject({}) { |h, (ext, re)| h.update(ext.to_s => Regexp.new(re)) }
     end
 
     protected

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

@@ -19,7 +19,7 @@ module I18n::Tasks::Scanners
       literal
     end
 
-    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!;À-ž])/
+    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž])/
     VALID_KEY_RE    = /^#{VALID_KEY_CHARS}+$/
 
     def valid_key?(key)

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module I18n
   module Tasks
-    VERSION = '0.9.5'
+    VERSION = '0.9.6'
   end
 end

data/templates/config/i18n-tasks.yml

@@ -65,6 +65,7 @@ search:
   exclude:
     - app/assets/images
     - app/assets/fonts
+    - app/assets/videos
 
   ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
   ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
@@ -110,11 +111,11 @@ search:
 ## e.g. in case of a relative key defined in a helper method.
 ## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
 #
-# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
-#        only: %w(*.html.haml *.html.slim),
-#        patterns: [['= title\b', '.page_title']] %>
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       only: %w(*.html.haml *.html.slim),
+#       patterns: [['= title\b', '.page_title']] %>
 #
 # The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
 #
-# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
-#        patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis