Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(compiler): ICUs should roll up to the root i18n block for application (#54026)

Browse source 
Previously, if an ICU was inside a nested i18n root, it would use the nested root to calculate whether it should be applied. Now, we use the root i18n block.

PR Close #54026
This commit is contained in:
Dylan Hunn 2024-01-22 16:34:01 -08:00 committed by Pawel Kozlowski
parent f81a4365fe
commit d99bc8aeb6
5 changed files with 88 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/GOLDEN_PARTIAL.js
View file

@ -143,3 +143,43 @@ export declare class MyModule {
static ɵinj: i0.ɵɵInjectorDeclaration<MyModule>;
}
/****************************************************************************************************
* PARTIAL FILE: icu_and_i18n.js
****************************************************************************************************/
import { Component } from '@angular/core';
import * as i0 from "@angular/core";
export class MyComponent {
}
MyComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: MyComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
MyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "0.0.0-PLACEHOLDER", type: MyComponent, isStandalone: true, selector: "my-component", ngImport: i0, template: `
<div i18n>
<div *ngFor="let diskView of disks">
{{diskView.name}} has {diskView.length, plural, =1 {VM} other {VMs}}
</div>
</div>
`, isInline: true });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: MyComponent, decorators: [{
type: Component,
args: [{
selector: 'my-component',
standalone: true,
template: `
<div i18n>
<div *ngFor="let diskView of disks">
{{diskView.name}} has {diskView.length, plural, =1 {VM} other {VMs}}
</div>
</div>
`,
}]
}] });
/****************************************************************************************************
* PARTIAL FILE: icu_and_i18n.d.ts
****************************************************************************************************/
import * as i0 from "@angular/core";
export declare class MyComponent {
disks: any;
static ɵfac: i0.ɵɵFactoryDeclaration<MyComponent, never>;
static ɵcmp: i0.ɵɵComponentDeclaration<MyComponent, "my-component", never, {}, {}, never, never, true, never>;
}

6
packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/TEST_CASES.json
View file

@ -28,6 +28,12 @@
]
}
]
},
{
"description": "should support i18n nodes with ICUs inside",
"inputFiles": [
"icu_and_i18n.ts"
]
}
]
}

25
packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/icu_and_i18n.js Normal file
View file

@ -0,0 +1,25 @@
function MyComponent_div_2_Template(rf, ctx) {
if (rf & 1) {
i0.ɵɵi18nStart(0, 0, 1);
i0.ɵɵelement(1, "div");
i0.ɵɵi18nEnd();
} if (rf & 2) {
const diskView_r1 = ctx.$implicit;
i0.ɵɵadvance();
i0.ɵɵi18nExp(diskView_r1.name)(diskView_r1.length);
i0.ɵɵi18nApply(0);
}
}
…
function MyComponent_Template(rf, ctx) {
if (rf & 1) {
i0.ɵɵelementStart(0, "div");
i0.ɵɵi18nStart(1, 0);
i0.ɵɵtemplate(2, MyComponent_div_2_Template, 2, 2, "div", 1);
i0.ɵɵi18nEnd();
i0.ɵɵelementEnd();
} if (rf & 2) {
i0.ɵɵadvance(2);
i0.ɵɵproperty("ngForOf", ctx.disks);
}
}

16
packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/icu_and_i18n.ts Normal file
View file

@ -0,0 +1,16 @@
import {Component} from '@angular/core';
@Component({
selector: 'my-component',
standalone: true,
template: `
<div i18n>
<div *ngFor="let diskView of disks">
{{diskView.name}} has {diskView.length, plural, =1 {VM} other {VMs}}
</div>
</div>
`,
})
export class MyComponent {
disks: any;
}

2
packages/compiler/src/template/pipeline/src/phases/create_i18n_contexts.ts
View file

@ -97,7 +97,7 @@ export function createI18nContexts(job: CompilationJob) {
// This ICU is a sub-message inside its parent i18n block message. We need to give it
// its own context.
const contextOp = ir.createI18nContextOp(
ir.I18nContextKind.Icu, job.allocateXrefId(), currentI18nOp.xref, op.message, null!
ir.I18nContextKind.Icu, job.allocateXrefId(), currentI18nOp.root, op.message, null!
);
unit.create.push(contextOp);
op.context = contextOp.xref;