fix($translate): if translation exists, use the translated string eve…

…n if it's empty
angular-translate · Apr 2, 2014 · eeb8c2a · eeb8c2a
1 parent 2546920
commit eeb8c2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -1473,7 +1473,7 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
         for (var i = 0, c = possibleLangKeys.length; i < c; i++) {
           var possibleLangKey = possibleLangKeys[i];
           if ($translationTable[possibleLangKey]) {
-            if ($translationTable[possibleLangKey][translationId]) {
+            if (typeof $translationTable[possibleLangKey][translationId] !== 'undefined') {
               result = determineTranslationInstant(translationId, interpolateParams, interpolationId);
             }
           }
@@ -1482,7 +1482,7 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
           }
         }
 
-        if (!result) {
+        if (!result && result !== '') {
           // Return translation if not found anything.
           result = translationId;
           if ($missingTranslationHandlerFactory && !pendingLoader) {

diff --git a/test/unit/service/translate.spec.js b/test/unit/service/translate.spec.js
@@ -1231,6 +1231,10 @@ describe('pascalprecht.translate', function () {
     it('should return translation id if translation id nost exist', function () {
       expect($translate.instant('FOO2')).toEqual('FOO2');
     });
+
+    it('should return empty string if translated string is empty', function () {
+      expect($translate.instant('BLANK_VALUE')).toEqual('');
+    });
   });
 
   describe('$translate.instant (with fallback)', function () {