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

fix(ivy): handle ICUs with placeholders in case other nested ICUs are present (#31516)

Browse Source 
Prior to this fix, the logic to set the right placeholder format for ICUs was a bit incorrect: if there was a nested ICU in one of the root ICU cases, that led to a problem where placeholders in subsequent branches used the wrong ({$placeholder}) format instead of {PLACEHOLDER} one. This commit updates the logic to make sure we properly transform all placeholders even if nested ICUs are present.

PR Close #31516
This commit is contained in:
Andrew Kushnir
2019-07-11 11:59:22 -07:00
committed by Matias Niemelä
parent d545bbeee4
commit 63e458dd3a
3 changed files with 85 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
View File

@ -3036,6 +3036,52 @@ describe('i18n support in the view compiler', () => {
verify(input, output, {exceptions});
});
it('nested with interpolations in "other" blocks', () => {
const input = `
<div i18n>{count, plural,
=0 {zero}
=2 {{{count}} {name, select,
cat {cats}
dog {dogs}
other {animals}} !}
other {other - {{count}}}
}</div>
`;
const output = String.raw `
var $I18N_0$;
if (ngI18nClosureMode) {
const $MSG_EXTERNAL_6870293071705078389$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_PLURAL, plural, =0 {zero} =2 {{INTERPOLATION} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}} !} other {other - {INTERPOLATION}}}");
$I18N_0$ = $MSG_EXTERNAL_6870293071705078389$$APP_SPEC_TS_1$;
}
else {
$I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_PLURAL, plural, =0 {zero} =2 {{INTERPOLATION} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}} !} other {other - {INTERPOLATION}}}");
}
$I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
"VAR_SELECT": "\uFFFD0\uFFFD",
"VAR_PLURAL": "\uFFFD1\uFFFD",
"INTERPOLATION": "\uFFFD2\uFFFD"
});
…
consts: 2,
vars: 3,
template: function MyComponent_Template(rf, ctx) {
if (rf & 1) {
$r3$.ɵɵelementStart(0, "div");
$r3$.ɵɵi18n(1, $I18N_0$);
$r3$.ɵɵelementEnd();
}
if (rf & 2) {
$r3$.ɵɵselect(1);
$r3$.ɵɵi18nExp(ctx.name)(ctx.count)(ctx.count);
$r3$.ɵɵi18nApply(1);
}
}
`;
verify(input, output);
});
it('should handle icus in different contexts', () => {
const input = `
<div i18n>