Merge 4c1849a into 2a96f26

i18n.js

@@ -886,7 +886,7 @@ module.exports = (function() {
     var mutator = localeMutator(locale, singular);
 
     if (plural) {
-      if (!accessor()) {
+      if (accessor() == null) {
         mutator({
           'one': defaultSingular || singular,
           'other': defaultPlural || plural
@@ -895,7 +895,7 @@ module.exports = (function() {
       }
     }
 
-    if (!accessor()) {
+    if (accessor() == null) {
       mutator(defaultSingular || singular);
       write(locale);
     }

locales/en.json

@@ -1,4 +1,5 @@
 {
+	"Empty": "",
 	"Hello": "Hello",
 	"Hello %s, how are you today?": "Hello %s, how are you today?",
 	"weekend": "weekend",

test/i18n.api.global.js

@@ -61,6 +61,11 @@ describe('Module API', function() {
     });
 
     describe('i18nTranslate', function() {
+      it('should return an empty string if the translation is an empty string', function() {
+        i18n.setLocale('en');
+        should.equal(__('Empty'), '');
+      });
+
       it('should return en translations as expected', function() {
         i18n.setLocale('en');
         should.equal(__('Hello'), 'Hello');

test/i18n.api.local.js

@@ -172,6 +172,13 @@ describe('Module API', function () {
         afterEach(function() {
           i18n.setLocale('en');
         });
+
+        it('should return an empty string if the translation is an empty string', function(done) {
+          i18n.setLocale(req, 'en').should.equal('en');
+          req.__('Empty').should.equal('');
+          done();
+        });
+
         it('has to use local translation in en', function (done) {
           i18n.setLocale(req, 'en').should.equal('en');
           req.__('Hello').should.equal('Hello');

test/i18n.missingPhrases.js

@@ -0,0 +1,69 @@
+/*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
+
+// now with coverage suport
+var i18n = require('../i18n'),
+    should = require("should");
+
+describe('Missing Phrases', function () {
+
+  beforeEach(function() {
+
+    i18n.configure({
+      locales: ['en', 'de'],
+      fallbacks: {'nl': 'de'},
+      directory: './locales',
+      updateFiles: false,
+      syncFiles: false
+    });
+
+  });
+
+  describe('Local Module API', function () {
+    var req = {
+      request: "GET /test",
+      __: i18n.__,
+      __n: i18n.__n,
+      locale: {},
+      headers: {}
+    };
+
+    beforeEach(function() {
+      i18n.configure({
+        locales: ['en', 'de', 'en-GB'],
+        defaultLocale: 'en',
+        directory: './locales',
+        register: req,
+        updateFiles: false,
+        syncFiles: false
+      });
+    });
+
+    describe('i18nTranslate', function () {
+      it('should return the key if the translation does not exist', function(done) {
+        i18n.setLocale(req, 'en').should.equal('en');
+        req.__('DoesNotExist').should.equal('DoesNotExist');
+        done();
+      });
+    });
+  });
+
+  describe('Global Module API', function () {
+    beforeEach(function() {
+      i18n.configure({
+        locales: ['en', 'de', 'en-GB'],
+        defaultLocale: 'en',
+        directory: './locales',
+        register: global,
+        updateFiles: false,
+        syncFiles: false
+      });
+    });
+
+    describe('i18nTranslate', function () {
+      it('should return the key if the translation does not exist', function() {
+        i18n.setLocale('en');
+        should.equal(__('DoesNotExist'), 'DoesNotExist');
+      });
+    });
+  });
+});