fix: Allow line breaks in interpolated expressions.

bobisch · knalli · commit 70957a3a27a4 · 2020-01-04T21:47:10.000+01:00
Line breaks can now appear in interpolated AngularJS expressions inside the body or translated elements and inside the value of translate attributes. Closes #1884, #1824 (cherry picked from commit 982980c)
diff --git a/src/directive/translate.js b/src/directive/translate.js
@@ -181,7 +181,7 @@ function translateDirective($translate, $interpolate, $compile, $parse, $rootSco
           }
 
           if (angular.equals(translationId , '') || !angular.isDefined(translationId)) {
-            var iElementText = trim.apply(iElement.text());
+            var iElementText = trim.apply(iElement.text()).replace(/\n/g, ' ');
 
             // Resolve translation id by inner html if required
             var interpolateMatches = iElementText.match(interpolateRegExp);
diff --git a/test/unit/directive/translate.spec.js b/test/unit/directive/translate.spec.js
@@ -904,4 +904,68 @@ describe('pascalprecht.translate', function () {
       expect(element.html()).toBe('My content');
     });
   });
+
+  describe('handling newlines in interpolation', function () {
+
+    var $compile, $rootScope, element;
+
+    beforeEach(module('pascalprecht.translate', function ($translateProvider) {
+      $translateProvider
+        .translations('en', {
+          'TRANSLATION_ID' : 'foo',
+          'abcfoodef': 'BOGUS?',
+          'foo': 'FOOGUS?'
+        })
+        .preferredLanguage('en');
+    }));
+
+    beforeEach(inject(function (_$compile_, _$rootScope_) {
+      $compile = _$compile_;
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should handle newlines embedded in interpolation expression', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      element = $compile('<div translate>{{\ntranslationId\n}}</div>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('foo');
+    });
+
+    it('should handle newlines embedded in interpolation expression for translate element', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      element = $compile('<translate>{{\ntranslationId\n}}</translate>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('foo');
+    });
+
+    it('should handle newlines embedded in interpolation expression with surrounding text', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      element = $compile('<div translate>abc{{\ntranslationId\n}}def</div>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('abcfoodef');
+    });
+
+    it('should handle newlines embedded in and surrounding interpolation expression', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      element = $compile('<div translate>abc\n{{\ntranslationId\n}}\ndef</div>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('abc foo def');
+    });
+
+    it('should handle newlines embedded in complex interpolation expression', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      $rootScope.var1 = 'TRANSLATION';
+      $rootScope.var2 = 'ID';
+      element = $compile('<div translate>\nabc{{\n   var1 + \n    "_" + var2\n   }}def\n   </div>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('abcfoodef');
+    });
+
+    it('should handle newlines embedded in interpolation expression in attribute', function () {
+      $rootScope.translationId = 'TRANSLATION_ID';
+      element = $compile('<div translate="{{\ntranslationId\n}}">...</div>')($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe('foo');
+    });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ function translateDirective($translate, $interpolate, $compile, $parse, $rootSco`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`if (angular.equals(translationId , '') \|\| !angular.isDefined(translationId)) {`
`184`		`- var iElementText = trim.apply(iElement.text());`
	`184`	`+ var iElementText = trim.apply(iElement.text()).replace(/\n/g, ' ');`
`185`	`185`
`186`	`186`	`// Resolve translation id by inner html if required`
`187`	`187`	`var interpolateMatches = iElementText.match(interpolateRegExp);`