allowEmpty attribute for format-message, format-html-message, and t h…

…elper
ember-intl · Jan 16, 2017 · a84841a · a84841a
1 parent f0268e0
commit a84841a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/ember-intl/addon/helpers/format-message.js b/packages/ember-intl/addon/helpers/format-message.js
@@ -10,14 +10,16 @@ import { LiteralWrapper } from './l';
 
 const { get, assert } = Ember;
 
-export function getValue([key], { locale:optionalLocale }) {
+export function getValue([key], { allowEmpty, locale:optionalLocale }) {
   if (key && key instanceof LiteralWrapper) {
     return key.value;
   }
 
   assert('[ember-intl] translation lookup attempted but no translation key was provided.', key);
 
-  return get(this, 'intl').lookup(key, optionalLocale);
+  return get(this, 'intl').lookup(key, optionalLocale, {
+    resilient: allowEmpty
+  });
 }
 
 export default factory('message').extend({

diff --git a/packages/ember-intl/addon/services/intl.js b/packages/ember-intl/addon/services/intl.js
@@ -141,11 +141,11 @@ const IntlService = Service.extend(Evented, {
     });
   },
 
-  lookup(key, localeName) {
+  lookup(key, localeName, options = {}) {
     const localeNames = makeArray(localeName || get(this, '_locale'));
     const translation = get(this, 'adapter').lookup(localeNames, key);
 
-    if (!translation) {
+    if (!options.resilient && !translation) {
       const missingMessage = this.owner.resolveRegistration('util:intl/missing-message');
 
       return missingMessage.call(this, key, localeNames);

diff --git a/packages/ember-intl/tests/unit/helpers/format-message-test.js b/packages/ember-intl/tests/unit/helpers/format-message-test.js
@@ -73,6 +73,12 @@ test('should throw if called with out a value', function(assert) {
   }
 });
 
+test('should throw if called with out a value', function(assert) {
+  assert.expect(1);
+  this.render(hbs`{{t 'does.not.exist' allowEmpty=true}}`);
+  assert.equal(this.$().text(), '');
+});
+
 test('should return a formatted string', function(assert) {
   assert.expect(1);