Ember 1.13 and 2.0 support

.travis.yml

@@ -18,7 +18,6 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:

addon/helper.js

@@ -1,33 +1,23 @@
 import Ember from "ember";
-import Stream from "./stream";
-import { readHash } from "./stream";
 
-// @public
-export default function t(params, hash, options, env) {
-  const i18n = env.data.view.container.lookup('service:i18n');
-  const i18nKey = params[0];
+var Helper = null;
 
-  var out = new Stream(function() {
-    const value = i18nKey.isStream ? i18nKey.value() : i18nKey;
-    return value === undefined ? '' : i18n.t(value, readHash(hash));
-  });
-
-  // observe any hash arguments that are streams:
-  Ember.keys(hash).forEach(function(key) {
-    const value = hash[key];
-
-    if (value && value.isStream) {
-      value.subscribe(out.notify, out);
-    }
-  });
+if (Ember.Helper) {
+  Helper = Ember.Helper.extend({
+    i18n: Ember.inject.service(),
 
-  // observe the locale:
-  i18n.localeStream.subscribe(out.notify, out);
+    _locale: Ember.computed.readOnly('i18n.locale'),
 
-  // if the i18n key itself is dynamic, observe it:
-  if (i18nKey.isStream) {
-    i18nKey.subscribe(out.notify, out);
-  }
+    compute: function(params, interpolations) {
+      const key = params[0];
+      const i18n = this.get('i18n');
+      return i18n.t(key, interpolations);
+    },
 
-  return out;
+    _recomputeOnLocaleChange: Ember.observer('_locale', function() {
+      this.recompute();
+    })
+  });
 }
+
+export default Helper;

addon/legacy-helper.js

@@ -0,0 +1,39 @@
+import Ember from "ember";
+import Stream from "./stream";
+import { readHash } from "./stream";
+
+var helper = null;
+
+if (Ember.Helper == null) {
+  // @public
+  helper = function tHelper(params, hash, options, env) {
+    const i18n = env.data.view.container.lookup('service:i18n');
+    const i18nKey = params[0];
+
+    var out = new Stream(function() {
+      const value = i18nKey.isStream ? i18nKey.value() : i18nKey;
+      return value === undefined ? '' : i18n.t(value, readHash(hash));
+    });
+
+    // observe any hash arguments that are streams:
+    Ember.keys(hash).forEach(function(key) {
+      const value = hash[key];
+
+      if (value && value.isStream) {
+        value.subscribe(out.notify, out);
+      }
+    });
+
+    // observe the locale:
+    i18n.localeStream.subscribe(out.notify, out);
+
+    // if the i18n key itself is dynamic, observe it:
+    if (i18nKey.isStream) {
+      i18nKey.subscribe(out.notify, out);
+    }
+
+    return out;
+  };
+}
+
+export default helper;

addon/macro.js

@@ -1,6 +1,5 @@
 import Ember from "ember";
 
-const map = Ember.EnumerableUtils.map;
 const keys = Ember.keys;
 const get = Ember.get;
 
@@ -14,7 +13,7 @@ export default function createTranslatedComputedProperty(key, interpolations = {
 }
 
 function values(object) {
-  return map(keys(object), (key) => object[key]);
+  return keys(object).map((key) => object[key]);
 }
 
 function mapPropertiesByHash(object, hash) {

addon/service.js

@@ -4,9 +4,10 @@ import Locale from "./locale";
 import addTranslations from "./add-translations";
 
 const get = Ember.get;
+const Parent = Ember.Service || Ember.Object;
 
 // @public
-export default Ember.Object.extend(Ember.Evented, {
+export default Parent.extend(Ember.Evented, {
 
   // @public
   // The user's locale.

app/instance-initializers/ember-i18n.js

@@ -1,5 +1,6 @@
 import Ember from "ember";
-import helper from "ember-i18n/helper";
+import legacyHelper from "ember-i18n/legacy-helper";
+import Helper from "ember-i18n/helper";
 import ENV from '../config/environment';
 
 export default {
@@ -13,7 +14,14 @@ export default {
     }
     instance.container.lookup('service:i18n').set('locale', defaultLocale);
 
-    Ember.HTMLBars._registerHelper('t', helper);
+    if (legacyHelper != null) {
+      Ember.HTMLBars._registerHelper('t', legacyHelper);
+    }
+
+    if (Helper != null) {
+      instance.registry.register('helper:t', Helper);
+    }
+
     instance.registry.injection('component', 'i18n', 'service:i18n');
     instance.registry.injection('controller', 'i18n', 'service:i18n');
     instance.registry.injection('route', 'i18n', 'service:i18n');

tests/acceptance/t-helper-test.js

@@ -7,7 +7,7 @@ var app;
 module('Acceptance: {{t}} Helper', {
   beforeEach: function() {
     app = startApp();
-    visit('/in/en');
+    visit('/');
   },
 
   afterEach: function() {
@@ -44,7 +44,9 @@ test('updates when dynamic interpolations change', function(assert) {
 });
 
 test('updates when the locale changes', function(assert) {
-  visit('/in/es');
+  click('.switch-to-es');
 
-  assert.textIs('.no-interpolations', 'texto sin interpolaciones');
+  andThen(function() {
+    assert.textIs('.no-interpolations', 'texto sin interpolaciones');
+  });
 });

tests/dummy/app/controllers/translate.js → tests/dummy/app/controllers/index.js

@@ -3,7 +3,9 @@ import $ from "jquery";
 
 export default Ember.Controller.extend({
 
+  i18n: Ember.inject.service(),
   clickCount: 0,
+  dynamicKey: 'no.interpolations',
 
   actions: {
     increment: function() {
@@ -12,6 +14,10 @@ export default Ember.Controller.extend({
 
     changeDynamicKey(newKey) {
       this.set('dynamicKey', newKey);
+    },
+
+    switchLocale(locale) {
+      this.set('i18n.locale', locale);
     }
   }
 

tests/dummy/app/router.js

@@ -6,7 +6,6 @@ var Router = Ember.Router.extend({
 });
 
 Router.map(function() {
-  this.route('translate', { path: '/in/:locale' });
 });
 
 export default Router;

tests/dummy/app/templates/translate.hbs → tests/dummy/app/templates/index.hbs

@@ -17,3 +17,7 @@
 
   <span class='dynamic-key'>{{t dynamicKey}}</span>
 </section>
+
+<section>
+  <button class='switch-to-es' {{action "switchLocale" "es"}}>Switch to Spanish</button>
+</section>