diff --git a/src/localization.js b/src/localization.js index e09c9c7..cee60b4 100644 --- a/src/localization.js +++ b/src/localization.js @@ -201,7 +201,7 @@ angular.module('ngLocalize') } function applySubstitutions(text, subs) { - var res = text, + var res = (angular.isArray(text) ? text.join('') : text), firstOfKind = 0; if (subs) { diff --git a/tests/unit/filterSpec.js b/tests/unit/filterSpec.js index 540c53a..454e693 100644 --- a/tests/unit/filterSpec.js +++ b/tests/unit/filterSpec.js @@ -17,7 +17,10 @@ describe('filter', function () { versionAlt: 'v%major.%minor.%patch', fullNameAlt: 'My name is {1} {2}', 'key with whitespace': 'valuewithoutwhitespace', - 'fullNameDups': 'My full name is {firstName} {lastName} so my "good name" is {firstName}.' + 'fullNameDups': 'My full name is {firstName} {lastName} so my "good name" is {firstName}.', + 'multiline' : ['line1', + 'line2', + 'line3'] }); }); }); @@ -78,5 +81,10 @@ describe('filter', function () { lastName: 'Smith' })).toEqual('My full name is John Smith so my "good name" is John.'); })); + + it('should combine multiple lines in one line',inject(function(i18nFilter){ + expect(i18nFilter('common.multiline')) + .toEqual("line1line2line3"); + })); }); }); \ No newline at end of file