fix(translate.js): Allow blank translation values

Check for translationTable presence in place of boolean eval of values.
angular-translate · May 25, 2013 · 97591a8 · 97591a8
1 parent c18dfaf
commit 97591a8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/src/translate.js b/src/translate.js
@@ -398,11 +398,9 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
     }
 
     var $translate = function (translationId, interpolateParams) {
-      var translation = ($uses) ?
-        ($translationTable[$uses] ? $translationTable[$uses][translationId] : translationId) :
-        $translationTable[translationId];
-      if (translation) {
-        return $interpolate(translation)(interpolateParams);
+      var table = $uses ? $translationTable[$uses] : $translationTable;
+      if (table && table.hasOwnProperty(translationId)) {
+        return $interpolate(table[translationId])(interpolateParams);
       }
 
       if ($missingTranslationHandlerFactory) {

diff --git a/test/unit/translateDirectiveSpec.js b/test/unit/translateDirectiveSpec.js
@@ -15,7 +15,8 @@ describe('pascalprecht.translate', function () {
         'YET_ANOTHER': 'Hallo da!',
         'TEXT_WITH_VALUE': 'This is a text with given value: {{value}}',
         'HOW_ABOUT_THIS': '{{value}} + {{value}}',
-        'AND_THIS': '{{value + value}}'
+        'AND_THIS': '{{value + value}}',
+        'BLANK_VALUE': ''
       });
     }));
 
@@ -39,6 +40,10 @@ describe('pascalprecht.translate', function () {
         element = $compile('<div translate="TRANSLATION_ID"></div>')($rootScope);
         $rootScope.$digest();
         expect(element.text()).toBe('foo');
+
+        element = $compile('<div translate="BLANK_VALUE"></div>')($rootScope);
+        $rootScope.$digest();
+        expect(element.text()).toBe('');
       });
     });
 
@@ -75,6 +80,10 @@ describe('pascalprecht.translate', function () {
           element = $compile('<div translate>TRANSLATION_ID</div>')($rootScope);
           $rootScope.$digest();
           expect(element.text()).toBe('foo');
+
+          element = $compile('<div translate>BLANK_VALUE</div>')($rootScope);
+          $rootScope.$digest();
+          expect(element.text()).toBe('');
         });
       });
 
@@ -238,7 +247,8 @@ describe('pascalprecht.translate', function () {
         'YET_ANOTHER': 'Hallo da!',
         'TEXT_WITH_VALUE': 'This is a text with given value: {{value}}',
         'HOW_ABOUT_THIS': '{{value}} + {{value}}',
-        'AND_THIS': '{{value + value}}'
+        'AND_THIS': '{{value + value}}',
+        'BLANK_VALUE': ''
       });
       $translateProvider.uses('en_EN');
     }));
@@ -265,6 +275,10 @@ describe('pascalprecht.translate', function () {
           element = $compile('<div translate="EXISTING_TRANSLATION_ID"></div>')($rootScope);
           $rootScope.$digest();
           expect(element.text()).toBe('foo');
+
+          element = $compile('<div translate="BLANK_VALUE"></div>')($rootScope);
+          $rootScope.$digest();
+          expect(element.text()).toBe('');
         });
       });
 
@@ -301,6 +315,10 @@ describe('pascalprecht.translate', function () {
           element = $compile('<div translate>EXISTING_TRANSLATION_ID</div>')($rootScope);
           $rootScope.$digest();
           expect(element.text()).toBe('foo');
+
+          element = $compile('<div translate>BLANK_VALUE</div>')($rootScope);
+          $rootScope.$digest();
+          expect(element.text()).toBe('');
         });
       });
 

diff --git a/test/unit/translateFilterSpec.js b/test/unit/translateFilterSpec.js
@@ -13,7 +13,8 @@ describe('pascalprecht.translate', function () {
         'TEXT': 'this is a text',
         'TEXT_WITH_VALUE': 'This is a text with given value: {{value}}',
         'HOW_ABOUT_THIS': '{{value}} + {{value}}',
-        'AND_THIS': '{{value + value}}'
+        'AND_THIS': '{{value + value}}',
+        'BLANK_VALUE': ''
       });
     }));
 
@@ -32,6 +33,7 @@ describe('pascalprecht.translate', function () {
     it('should return translation if translation id exist', function () {
       inject(function ($filter) {
         expect($filter('translate')('TRANSLATION_ID')).toEqual('Lorem Ipsum ');
+        expect($filter('translate')('BLANK_VALUE')).toEqual('');
       });
     });
 
@@ -77,7 +79,8 @@ describe('pascalprecht.translate', function () {
         'TEXT': 'this is a text',
         'TEXT_WITH_VALUE': 'This is a text with given value: {{value}}',
         'HOW_ABOUT_THIS': '{{value}} + {{value}}',
-        'AND_THIS': '{{value + value}}'
+        'AND_THIS': '{{value + value}}',
+        'BLANK_VALUE': ''
       });
 
       $translateProvider.uses('en_EN');
@@ -92,6 +95,7 @@ describe('pascalprecht.translate', function () {
     it('should return translation if translation id exist and language is given', function () {
       inject(function ($filter) {
         expect($filter('translate')('EXISTING_TRANSLATION_ID')).toEqual('foo');
+        expect($filter('translate')('BLANK_VALUE')).toEqual('');
       });
     });
 

diff --git a/test/unit/translateServiceSpec.js b/test/unit/translateServiceSpec.js
@@ -101,6 +101,7 @@ describe('pascalprecht.translate', function () {
     beforeEach(module('pascalprecht.translate', function ($translateProvider) {
       $translateProvider.translations({
         'EXISTING_TRANSLATION_ID': 'foo',
+        'BLANK_VALUE': '',
         'TRANSLATION_ID': 'Lorem Ipsum {{value}}',
         'TRANSLATION_ID_2': 'Lorem Ipsum {{value}} + {{value}}',
         'TRANSLATION_ID_3': 'Lorem Ipsum {{value + value}}'
@@ -126,9 +127,9 @@ describe('pascalprecht.translate', function () {
     });
 
     it('should return translation if translation id if exists', function () {
-      var translationId = "EXISTING_TRANSLATION_ID";
       inject(function ($translate) {
-        expect($translate(translationId)).toEqual('foo');
+        expect($translate("EXISTING_TRANSLATION_ID")).toEqual('foo');
+        expect($translate("BLANK_VALUE")).toEqual('');
       });
     });
 
@@ -162,6 +163,7 @@ describe('pascalprecht.translate', function () {
       $translateProvider.translations('de_DE', {
         'EXISTING_TRANSLATION_ID': 'foo',
         'ANOTHER_ONE': 'bar',
+        'BLANK_VALUE': '',
         'TRANSLATION_ID': 'Lorem Ipsum {{value}}',
         'TRANSLATION_ID_2': 'Lorem Ipsum {{value}} + {{value}}',
         'TRANSLATION_ID_3': 'Lorem Ipsum {{value + value}}',
@@ -200,6 +202,7 @@ describe('pascalprecht.translate', function () {
       inject(function ($translate) {
         expect($translate('EXISTING_TRANSLATION_ID')).toEqual('foo');
         expect($translate('ANOTHER_ONE')).toEqual('bar');
+        expect($translate('BLANK_VALUE')).toEqual('');
       });
     });