stricter dynamic key matching #75

glebm · Jul 22, 2014 · ee6c572 · ee6c572
1 parent 620a28f
commit ee6c572
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/i18n/tasks/key_pattern_matching.rb b/lib/i18n/tasks/key_pattern_matching.rb
@@ -33,7 +33,7 @@ def key_pattern_re_body(key_pattern)
   def key_match_pattern(k)
     @key_match_pattern ||= {}
     @key_match_pattern[k] ||= begin
-      "#{k.gsub(KEY_INTERPOLATION_RE, '*')}#{'*' if k.end_with?('.')}"
+      "#{k.gsub(KEY_INTERPOLATION_RE, ':')}#{':' if k.end_with?('.')}"
     end
   end
 

diff --git a/lib/i18n/tasks/used_keys.rb b/lib/i18n/tasks/used_keys.rb
@@ -44,7 +44,12 @@ def used_in_expr?(key)
     # keys in the source that end with a ., e.g. t("category.#{cat.i18n_key}") or t("category." + category.key)
     def expr_key_re
       @expr_key_re ||= begin
-        patterns = used_key_names.select { |k| key_expression?(k) }.map { |k| key_match_pattern(k) }
+        patterns = used_key_names.select { |k| key_expression?(k) }.map { |k|
+          pattern = key_match_pattern(k)
+          # disallow patterns with no keys
+          next if pattern =~ /\A(:\.)*:\z/
+          pattern
+        }.compact
         compile_key_pattern "{#{patterns * ','}}"
       end
     end

diff --git a/templates/config/i18n-tasks.yml b/templates/config/i18n-tasks.yml
@@ -1,4 +1,4 @@
-# i18n-tasks find and manage missing and unused translations ⚙ https://github.com/glebm/i18n-tasks
+# i18n-tasks finds and manages missing and unused translations ⚙ https://github.com/glebm/i18n-tasks
 
 base_locale: en
 ## i18n-tasks detects locales automatically from the existing locale files
@@ -62,6 +62,7 @@ search:
 
 ## Google Translate
 # translation:
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
 #   api_key: "AbC-dEf5"
 
 ## Consider these keys not missing