Merge pull request #396 from workmanw/ember-deprecate-deprecations

Added an `until` property when calling `Ember.deprecate`
jamesarosen · Aug 30, 2016 · d602e51 · d602e51
2 parents 67a9857 + 0e6fcfd
commit d602e51
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/addon/services/i18n.js b/addon/services/i18n.js
@@ -23,11 +23,13 @@ export default Parent.extend(Evented, {
   // in the current `locale`.
   t(key, data = {}) {
     Ember.deprecate('locale is a reserved attribute', !data.hasOwnProperty('locale'), {
-      id: 'ember-i18n.reserve-locale'
+      id: 'ember-i18n.reserve-locale',
+      until: '5.0.0'
     });
 
     Ember.deprecate('htmlSafe is a reserved attribute', !data.hasOwnProperty('htmlSafe'), {
-      id: 'ember-i18n.reserve-htmlSafe'
+      id: 'ember-i18n.reserve-htmlSafe',
+      until: '5.0.0'
     });
 
     const locale = this.get('_locale');