Also detect %{variable} in translations.

sevos · Jun 8, 2010 · 7d7ed74 · 7d7ed74
1 parent ac77341
commit 7d7ed74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/tolk/translation.rb b/app/models/tolk/translation.rb
@@ -56,7 +56,7 @@ def value
 
     def self.detect_variables(search_in)
       case search_in
-        when String then Set.new(search_in.scan(/\{\{(\w+)\}\}/).flatten)
+        when String then Set.new(search_in.scan(/\{\{(\w+)\}\}/).flatten + search_in.scan(/\%\{(\w+)\}/).flatten) 
         when Array then search_in.inject(Set[]) { |carry, item| carry + detect_variables(item) }
         when Hash then search_in.values.inject(Set[]) { |carry, item| carry + detect_variables(item) }
         else Set[]

diff --git a/test/locales/formats/en.yml b/test/locales/formats/en.yml
@@ -1,11 +1,11 @@
 en:
   number: 1
   string: I am just a stupid string :(
-  variables: "String with variables {{hello}} and {{world}}"
+  variables: "String with variables {{hello}} and %{world}"
   variables_in_struct:
     zero: "Without variable"
     one: "With {{variables}}"
-    other: "With even {{more}} {{variables}}"
+    other: "With even %{more} {{variables}}"
   number_array: [1, 2, 3]
   string_array: ['sun', 'moon']
   pluralization: