fix(service): fix .instant() not handling TrustedValueHolderType corr…

…ectly Although we have to reconsider the result type of this, this will fix sce+linking. Fixes #1618 Replaces #1630
angular-translate · Oct 30, 2016 · 1ede55e · 1ede55e · tommck · Oct 31, 2017
1 parent aaaa972
commit 1ede55e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -1401,7 +1401,13 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
         Interpolator.setLocale(langKey);
         result = Interpolator.interpolate(translationTable[translationId], interpolateParams, 'filter', sanitizeStrategy);
         result = applyPostProcessing(translationId, translationTable[translationId], result, interpolateParams, langKey, sanitizeStrategy);
-        if (result.substr(0, 2) === '@:') {
+        // workaround for TrustedValueHolderType
+        if (!angular.isString(result) && angular.isFunction(result.$$unwrapTrustedValue)) {
+          var result2 = result.$$unwrapTrustedValue();
+          if (result2.substr(0, 2) === '@:') {
+            return getFallbackTranslationInstant(langKey, result2.substr(2), interpolateParams, Interpolator, sanitizeStrategy);
+          }
+        } else if (result.substr(0, 2) === '@:') {
           return getFallbackTranslationInstant(langKey, result.substr(2), interpolateParams, Interpolator, sanitizeStrategy);
         }
         Interpolator.setLocale($uses);

diff --git a/test/unit/service/translate.spec.js b/test/unit/service/translate.spec.js
@@ -3015,4 +3015,25 @@ describe('pascalprecht.translate', function () {
       expect(failed).toEqual(true);
     }));
   });
+
+  describe('$translate with sce activated', function () {
+
+    beforeEach(module('pascalprecht.translate', function ($translateProvider) {
+      $translateProvider
+        .translations('en', {
+          'FOO' : 'foo',
+          'BAR': 'Bar'
+        })
+        .translations('de', {
+          'FOO' : 'foo'
+        })
+        .useSanitizeValueStrategy('sce')
+        .preferredLanguage('de')
+        .fallbackLanguage('en');
+    }));
+
+    it('should handle TrustedValueHolderType inner-results', inject(function ($translate) {
+      expect($translate.instant('BAR').$$unwrapTrustedValue()).toEqual('Bar');
+    }));
+  });
 });