fixed regex used for string substitutions in yml files

obtiva · Aug 15, 2009 · 83a3630 · 83a3630
1 parent 21458bf
commit 83a3630
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/babelphish/yml_translator.rb b/lib/babelphish/yml_translator.rb
@@ -121,7 +121,7 @@ def translate_many_yml_keys(translate_hash, tos, from)
 
       def parse_substitutions(translate_text)
         # pull out all the string substitutions so that google doesn't translate those
-        pattern = /\{\{.+\}\}/
+        pattern = /\{\{.+?\}\}/ # non greedy pattern match so that we properly match strings like: "{{name}} on {{application_name}}"
         replacements = translate_text.scan(pattern)
         translate_text.gsub!(pattern, SUBSTITUTION_PLACE_HOLDER)
         replacements

diff --git a/test/translations/fa.yml b/test/translations/fa.yml
@@ -4,4 +4,4 @@ fa:
     more: 
       test_more: "این یک سطح پایین تر است."
     test: "این یک تست است که رشته"
-    test_embedded: "این embedding با یک رشته {{insert}}است."
+    test_embedded: "این یک رشته با embedding {{insert}}است."