cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): add support for marker tags in xliff serializers (#21250)

Browse Source 
The Xliff serializer now supports the tags `seg-source` and `mrk`, while the Xliff2 serializer now supports `mrk`.
Fixes #21078
PR Close #21250
This commit is contained in:
Olivier Combe
2018-01-02 11:19:16 +01:00
committed by Chuck Jazdzewski
parent d3d9aac4e9
commit f74130c9f7
4 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/compiler/src/i18n/serializers/xliff.ts
View File

@ -20,9 +20,11 @@ const _XMLNS = 'urn:oasis:names:tc:xliff:document:1.2';
// TODO(vicb): make this a param (s/_/-/)
const _DEFAULT_SOURCE_LANG = 'en';
const _PLACEHOLDER_TAG = 'x';
const _MARKER_TAG = 'mrk';
const _FILE_TAG = 'file';
const _SOURCE_TAG = 'source';
const _SEGMENT_SOURCE_TAG = 'seg-source';
const _TARGET_TAG = 'target';
const _UNIT_TAG = 'trans-unit';
const _CONTEXT_GROUP_TAG = 'context-group';
@ -214,8 +216,9 @@ class XliffParser implements ml.Visitor {
}
break;
// ignore those tags
case _SOURCE_TAG:
// ignore source message
case _SEGMENT_SOURCE_TAG:
break;
case _TARGET_TAG:
@ -266,7 +269,7 @@ class XmlToI18n implements ml.Visitor {
const i18nNodes = this._errors.length > 0 || xmlIcu.rootNodes.length == 0 ?
[] :
ml.visitAll(this, xmlIcu.rootNodes);
[].concat(...ml.visitAll(this, xmlIcu.rootNodes));
return {
i18nNodes: i18nNodes,
@ -276,7 +279,7 @@ class XmlToI18n implements ml.Visitor {
visitText(text: ml.Text, context: any) { return new i18n.Text(text.value, text.sourceSpan !); }
visitElement(el: ml.Element, context: any): i18n.Placeholder|null {
visitElement(el: ml.Element, context: any): i18n.Placeholder|ml.Node[]|null {
if (el.name === _PLACEHOLDER_TAG) {
const nameAttr = el.attrs.find((attr) => attr.name === 'id');
if (nameAttr) {
@ -284,9 +287,14 @@ class XmlToI18n implements ml.Visitor {
}
this._addError(el, `<${_PLACEHOLDER_TAG}> misses the "id" attribute`);
} else {
this._addError(el, `Unexpected tag`);
return null;
}
if (el.name === _MARKER_TAG) {
return [].concat(...ml.visitAll(this, el.children));
}
this._addError(el, `Unexpected tag`);
return null;
}

3
packages/compiler/src/i18n/serializers/xliff2.ts
View File

@ -21,6 +21,7 @@ const _XMLNS = 'urn:oasis:names:tc:xliff:document:2.0';
const _DEFAULT_SOURCE_LANG = 'en';
const _PLACEHOLDER_TAG = 'ph';
const _PLACEHOLDER_SPANNING_TAG = 'pc';
const _MARKER_TAG = 'mrk';
const _XLIFF_TAG = 'xliff';
const _SOURCE_TAG = 'source';
@ -332,6 +333,8 @@ class XmlToI18n implements ml.Visitor {
new i18n.Placeholder('', endId, el.sourceSpan));
}
break;
case _MARKER_TAG:
return [].concat(...ml.visitAll(this, el.children));
default:
this._addError(el, `Unexpected tag`);
}