Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/lib/i18n_interpolation.rb b/spec/lib/i18n_interpolation.rb
new file mode 100644
index 000000000..8c86413ad
--- /dev/null
+++ b/spec/lib/i18n_interpolation.rb
@@ -0,0 +1,15 @@
+# This is a test of the set_content_type monkey patch in
+# lib/tmail_extensions.rb
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "when using i18n" do
+
+    it "should not complain if we're missing variables from the string" do
+        result = _('Hello', :dip => 'hummus')
+        result.should == 'Hello'
+        result = _('Hello {{dip}}', :dip => 'hummus')
+        result.should == 'Hello hummus'
+    end
+end
+