honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler): xmb `<ph>` tags should not self close (#13413)

This commit is contained in:
Victor Berchet 2016-12-12 19:10:20 -08:00 committed by GitHub
parent 1d0ed6f75f
commit 4b3d135193
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/@angular/compiler/src/i18n/serializers/xmb.ts
View File

@ -119,11 +119,11 @@ class _Visitor implements i18n.Visitor {
}
visitPlaceholder(ph: i18n.Placeholder, context?: any): xml.Node[] {
return [new xml.Tag(_PLACEHOLDER_TAG, {name: ph.name})];
return [new xml.Tag(_PLACEHOLDER_TAG, {name: ph.name}, [], false)];
}
visitIcuPlaceholder(ph: i18n.IcuPlaceholder, context?: any): xml.Node[] {
return [new xml.Tag(_PLACEHOLDER_TAG, {name: ph.name})];
return [new xml.Tag(_PLACEHOLDER_TAG, {name: ph.name}, [], false)];
}
serialize(nodes: i18n.Node[]): xml.Node[] {

7
modules/@angular/compiler/src/i18n/serializers/xml_helper.ts
View File

@ -18,7 +18,8 @@ class _Visitor implements IVisitor {
const strAttrs = this._serializeAttributes(tag.attrs);
if (tag.children.length == 0) {
return `<${tag.name}${strAttrs}/>`;
return tag.canSelfClose ? `<${tag.name}${strAttrs}/>` :
`<${tag.name}${strAttrs}></${tag.name}>`;
}
const strChildren = tag.children.map(node => node.visit(this));
@ -71,8 +72,8 @@ export class Tag implements Node {
public attrs: {[k: string]: string} = {};
constructor(
public name: string, unescapedAttrs: {[k: string]: string} = {},
public children: Node[] = []) {
public name: string, unescapedAttrs: {[k: string]: string} = {}, public children: Node[] = [],
public canSelfClose: boolean = true) {
Object.keys(unescapedAttrs).forEach((k: string) => {
this.attrs[k] = _escapeXml(unescapedAttrs[k]);
});

6
modules/@angular/compiler/test/i18n/integration_spec.ts
View File

@ -208,9 +208,9 @@ const XMB = `
<ph name="ICU"/>
</msg>
<msg id="5868084092545682515">{VAR_SELECT, select, m {male} f {female} }</msg>
<msg id="4851788426695310455"><ph name="INTERPOLATION"/></msg>
<msg id="9013357158046221374">sex = <ph name="INTERPOLATION"/></msg>
<msg id="8324617391167353662"><ph name="CUSTOM_NAME"/></msg>
<msg id="4851788426695310455"><ph name="INTERPOLATION"></ph></msg>
<msg id="9013357158046221374">sex = <ph name="INTERPOLATION"></ph>></msg>
<msg id="8324617391167353662"><ph name="CUSTOM_NAME"></ph></msg>
<msg id="7685649297917455806">in a translatable section</msg>
<msg id="2387287228265107305">
<ph name="START_HEADING_LEVEL1"><ex>&lt;h1&gt;</ex></ph>Markers in html comments<ph name="CLOSE_HEADING_LEVEL1"><ex>&lt;/h1&gt;</ex></ph>

2
modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
View File

@ -46,7 +46,7 @@ export function main(): void {
<!ELEMENT ex (#PCDATA)>
]>
<messagebundle>
<msg id="7056919470098446707">translatable element <ph name="START_BOLD_TEXT"><ex>&lt;b&gt;</ex></ph>with placeholders<ph name="CLOSE_BOLD_TEXT"><ex>&lt;/b&gt;</ex></ph> <ph name="INTERPOLATION"/></msg>
<msg id="7056919470098446707">translatable element <ph name="START_BOLD_TEXT"><ex>&lt;b&gt;</ex></ph>with placeholders<ph name="CLOSE_BOLD_TEXT"><ex>&lt;/b&gt;</ex></ph> <ph name="INTERPOLATION"></ph></msg>
<msg id="2981514368455622387">{VAR_PLURAL, plural, =0 {<ph name="START_PARAGRAPH"><ex>&lt;p&gt;</ex></ph>test<ph name="CLOSE_PARAGRAPH"><ex>&lt;/p&gt;</ex></ph>} }</msg>
<msg id="7999024498831672133" desc="d" meaning="m">foo</msg>
<msg id="i" desc="d" meaning="m">foo</msg>