Recondition Tolk::Translation#value to accommodate string values that…

… are invalid YAML.
phongnh · Apr 22, 2010 · d2e11dd · d2e11dd
1 parent b3263c8
commit d2e11dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app/models/tolk/translation.rb b/app/models/tolk/translation.rb
@@ -31,8 +31,8 @@ def text=(value)
     end
 
     def value
-      if text.is_a?(String)
-        YAML.load text
+      if text.is_a?(String) && /^\d+$/.match(text)
+        text.to_i
       else
         text
       end
@@ -48,12 +48,12 @@ def fix_text_type
           rescue ArgumentError
             nil
           end
-
+          
         end
-
+          
         self.text = nil if primary_translation.text.class != self.text.class
       end
-
+          
       true
     end
 

diff --git a/test/unit/translation_test.rb b/test/unit/translation_test.rb
@@ -27,6 +27,11 @@ def setup
     assert_equal "Hello World", tolk_translations(:hello_world_en).value
   end
 
+  test "translation with string value with variables" do
+    text = "{{attribute}} {{message}}"
+    assert_equal text, Tolk::Translation.new(:text => text).value
+  end
+
   test "translation with numeric value" do
     assert_equal 1, tolk_translations(:human_format_precision_en).value
   end