iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): allow single quotes into named interpolations (#15461)

Browse Source 
Fixes #15318
This commit is contained in:
Olivier Combe 2017-03-24 23:10:41 +01:00 committed by Victor Berchet
parent c17b912eb9
commit 53b89ec312
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/compiler/src/i18n/i18n_parser.ts
View File

@ -161,8 +161,9 @@ class _I18nVisitor implements html.Visitor {
} }
} }
const _CUSTOM_PH_EXP = /\/\/[\s\S]*i18n[\s\S]*\([\s\S]*ph[\s\S]*=[\s\S]*"([\s\S]*?)"[\s\S]*\)/g; const _CUSTOM_PH_EXP =
/\/\/[\s\S]*i18n[\s\S]*\([\s\S]*ph[\s\S]*=[\s\S]*("|')([\s\S]*?)\1[\s\S]*\)/g;
function _extractPlaceholderName(input: string): string { function _extractPlaceholderName(input: string): string {
return input.split(_CUSTOM_PH_EXP)[1]; return input.split(_CUSTOM_PH_EXP)[2];
} }

6
packages/compiler/test/i18n/i18n_parser_spec.ts
View File

@ -125,6 +125,12 @@ export function main() {
.toEqual([ .toEqual([
[['[before, <ph name="TEST"> exp //i18n(ph="teSt") </ph>, after]'], 'm', 'd'], [['[before, <ph name="TEST"> exp //i18n(ph="teSt") </ph>, after]'], 'm', 'd'],
]); ]);
expect(
_humanizeMessages('<div i18n=\'m|d\'>before{{ exp //i18n(ph=\'teSt\') }}after</div>'))
.toEqual([
[[`[before, <ph name="TEST"> exp //i18n(ph='teSt') </ph>, after]`], 'm', 'd'],
]);
}); });
}); });