fix(service): return empty string when found in fallback

angular-translate · Oct 9, 2016 · d76227e · d76227e
1 parent 132e49a
commit d76227e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -1507,7 +1507,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
         if (fallbackLanguageIndex < $fallbackLanguage.length) {
           var langKey = $fallbackLanguage[fallbackLanguageIndex];
           result = getFallbackTranslationInstant(langKey, translationId, interpolateParams, Interpolator);
-          if (!result) {
+          if (!result && result !== '') {
             result = resolveForFallbackLanguageInstant(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator);
           }
         }

diff --git a/test/unit/service/translate.spec.js b/test/unit/service/translate.spec.js
@@ -2316,11 +2316,15 @@ describe('pascalprecht.translate', function () {
         .useLoader('customLoader')
         .translations('en', {
           'FOO': 'bar',
-          'BAR': 'foo'
+          'BAR': 'foo',
+          'BARE': ''
         })
         .translations('de', {
           'FOO2': 'bar2'
         })
+        .translations('fr', {
+          'BARE': 'bare'
+        })
         .preferredLanguage('de')
         .fallbackLanguage('en');
 
@@ -2349,12 +2353,17 @@ describe('pascalprecht.translate', function () {
     it('should return translation if translation id exist', function () {
       expect($translate.instant('FOO')).toEqual('bar');
       expect($translate.instant('FOO2')).toEqual('bar2');
+      expect($translate.instant('BARE')).toEqual('');
     });
 
     it('should return translation id if translation id nost exist', function () {
       expect($translate.instant('FOO3')).toEqual('FOO3');
     });
 
+    it('should return the first translation if multiple fallbacks exist', function () {
+      expect($translate.instant('BARE')).toEqual('');
+    });
+
     it('should return translation id with default interpolator if translation id nost exist', function () {
       expect($translate.instant('FOO4 {{value}}', {'value': 'PARAM'})).toEqual('FOO4 PARAM');
     });