Escape interpolations by default

This is in order to get the expected handlebars-like mustache
escaping behavior. Unescaped interpolation made possible via the
common tripple curlies mustache.

Conflicts:
	lib/i18n.js
	spec/spec_support.js
	spec/tSpec.js

Conflicts:
	lib/i18n.js

lib/i18n.js

@@ -59,6 +59,7 @@
     }
   }
 
+  var escapeExpression = EmHandlebars.Utils.escapeExpression;
   var compileImplementation;
 
   function compileTemplate(template) {
@@ -75,9 +76,13 @@
     if (flag === true) {
       return function compileWithoutHandlebars(template) {
         return function (data) {
-          return template.replace(/\{\{(.*?)\}\}/g, function(i, match) {
-            return data[match];
-          });
+          return template
+            .replace(/\{\{\{(.*?)\}\}\}/g, function(i, match) {
+              // tripple curlies -> no-escaping
+              return get(data, match);
+            }).replace(/\{\{(.*?)\}\}/g, function(i, match) {
+             return escapeExpression( get(data, match) );
+            });
         };
       };
     }

spec/spec_support.js

@@ -25,7 +25,9 @@
 
     Ember.I18n.translations = {
       'foo.bar': 'A Foobar',
-      'foo.bar.named': 'A Foobar named {{name}}',
+      'foo.bar.named': 'A Foobar named <span>{{name}}</span>',
+      'foo.bar.named.noEscape': 'A Foobar named <span>{{{link}}}</span>',
+      'foo.bar.named.structured': 'A Foobar named {{contact.name}}',
       'foo.save.disabled': 'Saving Foo...',
       'foos.zero': 'No Foos',
       'foos.one': 'One Foo',

spec/tSpec.js

@@ -5,7 +5,19 @@ describe('Ember.I18n.t', function() {
 
   it('interpolates', function() {
     expect(Ember.I18n.t('foo.bar.named', {
-      name: 'Sue'
+      name: '<Sue>'
+    })).to.equal('A Foobar named <span>&lt;Sue&gt;</span>');
+  });
+
+  it('interpolates escaped', function() {
+    expect(Ember.I18n.t('foo.bar.named.noEscape', {
+      link: '<a href="#">Sue</a>'
+    })).to.equal('A Foobar named <span><a href="#">Sue</a></span>');
+  });
+
+  it('interpolates structures correctly', function() {
+    expect(Ember.I18n.t('foo.bar.named.structured', {
+      contact: { name: 'Sue' }
     })).to.equal('A Foobar named Sue');
   });