base_scanner.rb in i18n-tasks-0.7.9

- old
+ new

@@ -17,20 +17,20 @@
         conf[:include] = Array(conf[:include]) if conf[:include].present?
         if conf.key?(:exclude)
           conf[:exclude] = Array(conf[:exclude])
         else
           # exclude common binary extensions by default (images and fonts)
-          conf[:exclude] = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.ttf *.woff *.pdf)
+          conf[:exclude] = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.ttf *.woff *.woff2 *.pdf)
         end
         # Regexps for lines to ignore per extension
         if conf[:ignore_lines] && !conf[:ignore_lines].is_a?(Hash)
           warn_deprecated "search.ignore_lines must be a Hash, found #{conf[:ignore_lines].class.name}"
           conf[:ignore_lines] = nil
         end
         conf[:ignore_lines] ||= {
             'rb'   => %q(^\s*#(?!\si18n-tasks-use)),
-            'haml' => %q(^\s*-\s*#\s*(?!\si18n-tasks-use)),
+            'haml' => %q(^\s*-\s*#(?!\si18n-tasks-use)),
             'slim' => %q(^\s*(?:-#|/)(?!\si18n-tasks-use)),
             'erb'  => %q(^\s*<%\s*#(?!\si18n-tasks-use)),
         }
         @ignore_lines_res = conf[:ignore_lines].inject({}) { |h, (ext, re)| h.update(ext => Regexp.new(re)) }
         @key_filter = nil
@@ -124,12 +124,12 @@
       key = key[1..-1] if ':' == key[0]
       key = key[1..-2] if %w(' ").include?(key[0])
       key
     end
 
-    VALID_KEY_CHARS = /[-\w.?!;:]/
+    VALID_KEY_CHARS = /[-\w.?!;]/
     VALID_KEY_RE_STRICT = /^#{VALID_KEY_CHARS}+$/
-    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[\#{@}])+$/
+    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[:\#{@}])+$/
 
     def valid_key?(key, strict = false)
       return false if @key_filter && @key_filter_pattern !~ key
       if strict
         key =~ VALID_KEY_RE_STRICT && !key.end_with?('.')