other-3rdP-component
multi-lines
diff --git a/packages/compiler/src/i18n/serializers/xliff2.ts b/packages/compiler/src/i18n/serializers/xliff2.ts
index e2940491ef..6db2de5d9c 100644
--- a/packages/compiler/src/i18n/serializers/xliff2.ts
+++ b/packages/compiler/src/i18n/serializers/xliff2.ts
@@ -35,9 +35,9 @@ export class Xliff2 extends Serializer {
messages.forEach(message => {
const unit = new xml.Tag(_UNIT_TAG, {id: message.id});
+ const notes = new xml.Tag('notes');
if (message.description || message.meaning) {
- const notes = new xml.Tag('notes');
if (message.description) {
notes.children.push(
new xml.CR(8),
@@ -49,11 +49,18 @@ export class Xliff2 extends Serializer {
new xml.CR(8),
new xml.Tag('note', {category: 'meaning'}, [new xml.Text(message.meaning)]));
}
-
- notes.children.push(new xml.CR(6));
- unit.children.push(new xml.CR(6), notes);
}
+ message.sources.forEach((source: i18n.MessageSpan) => {
+ notes.children.push(new xml.CR(8), new xml.Tag('note', {category: 'location'}, [
+ new xml.Text(
+ `${source.filePath}:${source.startLine}${source.endLine !== source.startLine ? ',' + source.endLine : ''}`)
+ ]));
+ });
+
+ notes.children.push(new xml.CR(6));
+ unit.children.push(new xml.CR(6), notes);
+
const segment = new xml.Tag('segment');
segment.children.push(
@@ -367,4 +374,4 @@ function getTypeForTag(tag: string): string {
default:
return 'other';
}
-}
\ No newline at end of file
+}
diff --git a/packages/compiler/test/i18n/serializers/xliff2_spec.ts b/packages/compiler/test/i18n/serializers/xliff2_spec.ts
index d20548c48d..5c10135c92 100644
--- a/packages/compiler/test/i18n/serializers/xliff2_spec.ts
+++ b/packages/compiler/test/i18n/serializers/xliff2_spec.ts
@@ -24,22 +24,33 @@ const HTML = `
hello
{ count, plural, =0 { { sex, select, other {
deeply nested
}} }}
{ count, plural, =0 { { sex, select, other {
deeply nested
}} }}
+multi
+lines
`;
const WRITE_XLIFF = `
+
+ file.ts:2
+
translatable attribute
+
+ file.ts:3
+
translatable element with placeholders
+
+ file.ts:4
+
{VAR_PLURAL, plural, =0 {test} }
@@ -48,6 +59,7 @@ const WRITE_XLIFF = `
d
m
+ file.ts:5
foo
@@ -56,6 +68,7 @@ const WRITE_XLIFF = `
nested
+ file.ts:6
Text
@@ -64,6 +77,7 @@ const WRITE_XLIFF = `
ph names
+ file.ts:7
@@ -72,21 +86,37 @@ const WRITE_XLIFF = `
empty element
+ file.ts:8
hello
+
+ file.ts:9
+
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {deeply nested} } } }
+
+ file.ts:10
+
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {deeply nested} } } }
+
+
+ file.ts:11,12
+
+
+ multi
+lines
+
+
`;
@@ -95,18 +125,27 @@ const LOAD_XLIFF = `
+
+ file.ts:2
+
translatable attribute
etubirtta elbatalsnart
+
+ file.ts:3
+
translatable element with placeholders
sredlohecalp htiw tnemele elbatalsnart
+
+ file.ts:4
+
{VAR_PLURAL, plural, =0 {test} }
{VAR_PLURAL, plural, =0 {TEST} }
@@ -116,6 +155,7 @@ const LOAD_XLIFF = `
d
m
+ file.ts:5
foo
@@ -125,6 +165,7 @@ const LOAD_XLIFF = `
nested
+ file.ts:6
Text
@@ -134,6 +175,7 @@ const LOAD_XLIFF = `
ph names
+ file.ts:7
@@ -143,6 +185,7 @@ const LOAD_XLIFF = `
empty element
+ file.ts:8
hello
@@ -150,17 +193,34 @@ const LOAD_XLIFF = `
+
+ file.ts:9
+
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {deeply nested} } } }
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {profondément imbriqué} } } }
+
+ file.ts:10
+
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {deeply nested} } } }
{VAR_PLURAL, plural, =0 {{VAR_SELECT, select, other {profondément imbriqué} } } }
+
+
+ file.ts:11,12
+
+
+ multi
+lines
+ multi
+lignes
+
+
`;
@@ -170,7 +230,7 @@ export function main(): void {
function toXliff(html: string, locale: string | null = null): string {
const catalog = new MessageBundle(new HtmlParser, [], {}, locale);
- catalog.updateFromTemplate(html, '', DEFAULT_INTERPOLATION_CONFIG);
+ catalog.updateFromTemplate(html, 'file.ts', DEFAULT_INTERPOLATION_CONFIG);
return catalog.write(serializer);
}
@@ -208,8 +268,10 @@ export function main(): void {
'6536355551500405293': ' olleh',
'baz':
'{VAR_PLURAL, plural, =0 {[{VAR_SELECT, select, other {[, profondément imbriqué, ]}}, ]}}',
- '2015957479576096115':
- '{VAR_PLURAL, plural, =0 {[{VAR_SELECT, select, other {[, profondément imbriqué, ]}}, ]}}'
+ '2015957479576096115': '{VAR_PLURAL, plural, =0 {[{VAR_SELECT, select, other {[, profondément imbriqué, ]}}, ]}}',
+ '2340165783990709777': `multi
+lignes`
});
});
@@ -333,4 +395,4 @@ export function main(): void {
});
});
});
-}
\ No newline at end of file
+}
diff --git a/packages/compiler/test/i18n/serializers/xliff_spec.ts b/packages/compiler/test/i18n/serializers/xliff_spec.ts
index c6d01231f4..56e929f396 100644
--- a/packages/compiler/test/i18n/serializers/xliff_spec.ts
+++ b/packages/compiler/test/i18n/serializers/xliff_spec.ts
@@ -25,6 +25,8 @@ const HTML = `
![]()
{ count, plural, =0 { { sex, select, other {
deeply nested
}} }}
{ count, plural, =0 { { sex, select, other {
deeply nested
}} }}
+multi
+lines
`;
const WRITE_XLIFF = `
@@ -112,6 +114,15 @@ const WRITE_XLIFF = `
11
+
+ multi
+lines
+
+
+ file.ts
+ 12
+
+