fix(directive): missing watch for expression within elements text nodes

Fixes #701
angular-translate · Dec 7, 2014 · 31c0356 · 31c0356
1 parent 4f6ee9a
commit 31c0356
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/directive/translate.js b/src/directive/translate.js
@@ -100,7 +100,8 @@ angular.module('pascalprecht.translate')
 
       var translateValueExist = tElement[0].outerHTML.match(/translate-value-+/i);
 
-      var interpolateRegExp = "^(.*)(" + $interpolate.startSymbol() + ".*" + $interpolate.endSymbol() + ")(.*)";
+      var interpolateRegExp = "^(.*)(" + $interpolate.startSymbol() + ".*" + $interpolate.endSymbol() + ")(.*)",
+          watcherRegExp = "^(.*)" + $interpolate.startSymbol() + "(.*)" + $interpolate.endSymbol() + "(.*)";
 
       return function linkFn(scope, iElement, iAttr) {
 
@@ -121,6 +122,10 @@ angular.module('pascalprecht.translate')
               scope.preText = interpolateMatches[1];
               scope.postText = interpolateMatches[3];
               translationIds.translate = $interpolate(interpolateMatches[2])(scope.$parent);
+              watcherMatches = iElement.text().match(watcherRegExp);
+              if (angular.isArray(watcherMatches) && watcherMatches[2] && watcherMatches[2].length) {
+                scope.$watch(watcherMatches[2], updateTranslations);
+              }
             } else {
               translationIds.translate = iElement.text().replace(/^\s+|\s+$/g,'');
             }

diff --git a/test/unit/directive/translate.spec.js b/test/unit/directive/translate.spec.js
@@ -117,6 +117,15 @@ describe('pascalprecht.translate', function () {
         expect(element.text()).toBe('foo');
       });
 
+      it('should return newer translation if translation id exist and if its passed as interpolation', function () {
+        $rootScope.translationId = 'TRANSLATION_ID';
+        element = $compile('<div translate>{{translationId}}</div>')($rootScope);
+        $rootScope.$digest();
+        $rootScope.translationId = 'TEXT'; // refresh expression
+        $rootScope.$digest();
+        expect(element.text()).toBe('foo');
+      });
+
       it('should return translation prepended by additional content when passed as interpolation', function () {
         $rootScope.translationId = 'TRANSLATION_ID';
         element = $compile('<div translate>abc{{translationId}}')($rootScope);