feat(filter): filter now use $translate.instant() since promises coul…

…d not use
angular-translate · Feb 7, 2014 · a1b8a17 · a1b8a17
1 parent 3a855eb
commit a1b8a17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 96 deletions.
diff --git a/src/filter/translate.js b/src/filter/translate.js
@@ -49,20 +49,13 @@ angular.module('pascalprecht.translate')
     </file>
    </example>
  */
-.filter('translate', ['$parse', '$translate', '$q', function ($parse, $translate, $q) {
+.filter('translate', ['$parse', '$translate', function ($parse, $translate) {
   return function (translationId, interpolateParams, interpolation) {
-    var deferred = $q.defer();
 
     if (!angular.isObject(interpolateParams)) {
       interpolateParams = $parse(interpolateParams)();
     }
 
-    $translate(translationId, interpolateParams, interpolation).then(function (translation) {
-      deferred.resolve(translation);
-    }, function (translationId) {
-      deferred.reject(translationId);
-    });
-
-    return deferred.promise;
+    return $translate.instant(translationId, interpolateParams, interpolation);
   };
 }]);
diff --git a/test/unit/filter/translate.spec.js b/test/unit/filter/translate.spec.js
@@ -33,81 +33,27 @@ describe('pascalprecht.translate', function () {
       expect(typeof $translate).toBe("function");
     });
 
-    it('should return a promise', function () {
-      expect($translate('foo').then).toBeDefined();
-    });
-
-    it('should reject with translation id if translation doesn\'t exist', function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $translate('WOOP').then(null, function (translationId) {
-        deferred.resolve(translationId);
-      });
-
-      $rootScope.$digest();
-      expect(value).toEqual('WOOP');
+    it('should return with translation id if translation doesn\'t exist', function () {
+      expect($translate('WOOP')).toEqual('WOOP');
     });
 
     it('should return translation if translation id exist', function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $translate('TRANSLATION_ID').then(function (translation) {
-        deferred.resolve(translation);
-      });
-
-      $rootScope.$digest();
-      expect(value).toEqual('Lorem Ipsum ');
+      expect($translate('TRANSLATION_ID')).toEqual('Lorem Ipsum ');
     });
 
     it('should replace interpolate directives with empty string if no values given', function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $translate('TRANSLATION_ID').then(function (translation) {
-        deferred.resolve(translation);
-      });
-
-      $rootScope.$digest();
-      expect(value).toEqual('Lorem Ipsum ');
+      expect($translate('TRANSLATION_ID')).toEqual('Lorem Ipsum ');
     });
 
     it('should replace interpolate directives with given values', function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $q.all([
+      var value = [
         $translate('TRANSLATION_ID', { value: 'foo'}),
         $translate('TRANSLATION_ID_2', { value: 'foo'}),
         $translate('TRANSLATION_ID_3', { value: 'foo'}),
         $translate('TRANSLATION_ID_3', { value: '3'}),
         $translate('TRANSLATION_ID_3', { value: 3})
-      ]).then(function (translations) {
-        deferred.resolve(translations);
-      });
+      ];
 
-      $rootScope.$digest();
       expect(value[0]).toEqual('Lorem Ipsum foo');
       expect(value[1]).toEqual('Lorem Ipsum foo + foo');
       expect(value[2]).toEqual('Lorem Ipsum foofoo');
@@ -116,27 +62,16 @@ describe('pascalprecht.translate', function () {
     });
 
     it('should replace interpolate directives with given values as string expression', function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $q.all([
+      var value = [
         $translate('TEXT'),
         $translate('TEXT_WITH_VALUE'),
         $translate('TEXT_WITH_VALUE', "{'value': 'dynamic value'}"),
         $translate('TEXT_WITH_VALUE', "{'value': '3'}"),
         $translate('HOW_ABOUT_THIS', "{'value': '4'}"),
         $translate('AND_THIS', "{'value': 5}"),
         $translate('AND_THIS', "{'value': '5'}")
-      ]).then(function (translations) {
-        deferred.resolve(translations);
-      });
+      ];
 
-      $rootScope.$digest();
       expect(value[0]).toEqual('this is a text');
       expect(value[1]).toEqual('This is a text with given value: ');
       expect(value[2]).toEqual('This is a text with given value: dynamic value');
@@ -189,20 +124,7 @@ describe('pascalprecht.translate', function () {
     }));
 
     it('should consider translate-interpolation value', inject(function () {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          value;
-
-      promise.then(function (translation) {
-        value = translation;
-      });
-
-      $translate('FOO', {}, 'custom').then(function (translation) {
-        deferred.resolve(translation);
-      });
-
-      $rootScope.$digest();
-      expect(value).toEqual('custom interpolation');
+      expect($translate('FOO', {}, 'custom')).toEqual('custom interpolation');
     }));
   });
 });