diff --git a/packages/compiler/test/i18n/integration_common.ts b/packages/compiler/test/i18n/integration_common.ts index 4d7e37d620..400365f9ad 100644 --- a/packages/compiler/test/i18n/integration_common.ts +++ b/packages/compiler/test/i18n/integration_common.ts @@ -71,12 +71,12 @@ export function validateHtml( expect(el.query(By.css('#i18n-14')).nativeElement).toHaveText('beaucoup'); expect(el.query(By.css('#i18n-17')).nativeElement).toHaveText('beaucoup'); - cmp.sex = 'm'; - cmp.sexB = 'f'; + cmp.sex = 'male'; + cmp.sexB = 'female'; tb.detectChanges(); expect(el.query(By.css('#i18n-8')).nativeElement).toHaveText('homme'); expect(el.query(By.css('#i18n-8b')).nativeElement).toHaveText('femme'); - cmp.sex = 'f'; + cmp.sex = 'female'; tb.detectChanges(); expect(el.query(By.css('#i18n-8')).nativeElement).toHaveText('femme'); cmp.sex = '0'; @@ -107,38 +107,38 @@ function expectHtml(el: DebugElement, cssSelector: string): any { export const HTML = `

i18n attribute on tags

- +

nested

- +

nested

- +

with placeholders

with placeholders

with
nested
placeholders
- +

- - + +
{count, plural, =0 {zero} =1 {one} =2 {two} other {many}}
- +
- {sex, select, m {male} f {female} 0 {other}} + {sex, select, male {m} female {f} other {other}}
- {sexB, select, m {male} f {female}} + {sexB, select, male {m} female {f}}
- +
{{ "count = " + count }}
sex = {{ sex }}
-
{{ "custom name" //i18n(ph="CUSTOM_NAME") }}
+
{{ "custom name" //i18n(ph="CUSTOM_NAME") }}
-

Markers in html comments

+

Markers in html comments

{count, plural, =0 {zero} =1 {one} =2 {two} other {many}}
diff --git a/packages/compiler/test/i18n/integration_xliff2_spec.ts b/packages/compiler/test/i18n/integration_xliff2_spec.ts index 4c80d1a4ae..657f8141f5 100644 --- a/packages/compiler/test/i18n/integration_xliff2_spec.ts +++ b/packages/compiler/test/i18n/integration_xliff2_spec.ts @@ -107,38 +107,38 @@ const XLIFF2_TOMERGE = ` {VAR_PLURAL, plural, =0 {zero} =1 {un} =2 {deux} other {beaucoup} } - + - + - + - + file.ts:23 - {VAR_SELECT, select, 0 {other} m {male} f {female} } - {VAR_SELECT, select, 0 {autre} m {homme} f {femme} } + {VAR_SELECT, select, other {other} male {m} female {female} } + {VAR_SELECT, select, other {autre} male {homme} female {femme} } - + file.ts:25,27 - + - + - + - {VAR_SELECT, select, m {male} f {female} } - {VAR_SELECT, select, m {homme} f {femme} } + {VAR_SELECT, select, male {m} female {f} } + {VAR_SELECT, select, male {homme} female {femme} } @@ -165,15 +165,15 @@ const XLIFF2_TOMERGE = ` dans une section traductible - + - Markers in html comments + Markers in html comments - Balises dans les commentaires html + Balises dans les commentaires html @@ -284,40 +284,40 @@ const XLIFF2_EXTRACTED = ` {VAR_PLURAL, plural, =0 {zero} =1 {one} =2 {two} other {many} } - + file.ts:22,24 - + - + file.ts:23 - {VAR_SELECT, select, 0 {other} m {male} f {female} } + {VAR_SELECT, select, male {m} female {f} other {other} } - + file.ts:25,27 - + - + file.ts:26 - {VAR_SELECT, select, m {male} f {female} } + {VAR_SELECT, select, male {m} female {f} } @@ -353,13 +353,13 @@ const XLIFF2_EXTRACTED = ` in a translatable section - + file.ts:34,38 - Markers in html comments + Markers in html comments diff --git a/packages/compiler/test/i18n/integration_xliff_spec.ts b/packages/compiler/test/i18n/integration_xliff_spec.ts index dbe823e6f3..ba347cc1bb 100644 --- a/packages/compiler/test/i18n/integration_xliff_spec.ts +++ b/packages/compiler/test/i18n/integration_xliff_spec.ts @@ -93,25 +93,25 @@ const XLIFF_TOMERGE = ` {VAR_PLURAL, plural, =0 {zero} =1 {one} =2 {two} other {many} } {VAR_PLURAL, plural, =0 {zero} =1 {un} =2 {deux} other {beaucoup} } - + - + - - {VAR_SELECT, select, 0 {other} m {male} f {female} } - {VAR_SELECT, select, 0 {autre} m {homme} f {femme}} + + {VAR_SELECT, select, other {other} male {m} female {f} } + {VAR_SELECT, select, other {autre} male {homme} female {femme}} - + - - {VAR_SELECT, select, m {male} f {female} } - {VAR_SELECT, select, m {homme} f {femme} } + + {VAR_SELECT, select, male {m} female {f} } + {VAR_SELECT, select, male {homme} female {femme} } @@ -129,9 +129,9 @@ const XLIFF_TOMERGE = ` in a translatable section dans une section traductible - + - Markers in html comments + Markers in html comments @@ -233,33 +233,33 @@ const XLIFF_EXTRACTED = ` 37 - + - + file.ts 22 - - {VAR_SELECT, select, 0 {other} m {male} f {female} } + + {VAR_SELECT, select, male {m} female {f} other {other} } file.ts 23 - + - + file.ts 25 - - {VAR_SELECT, select, m {male} f {female} } + + {VAR_SELECT, select, male {m} female {f} } file.ts 26 @@ -297,9 +297,9 @@ const XLIFF_EXTRACTED = ` 54 - + - Markers in html comments + Markers in html comments diff --git a/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts b/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts index ee85887e68..33f9543da4 100644 --- a/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts +++ b/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts @@ -65,22 +65,22 @@ const XTB = ` sur des balises non traductibles sur des balises traductibles {VAR_PLURAL, plural, =0 {zero} =1 {un} =2 {deux} other {beaucoup}} - - {VAR_SELECT, select, 0 {autre} m {homme} f {femme} } - - {VAR_SELECT, select, m {homme} f {femme}} + + {VAR_SELECT, select, male {homme} female {femme} other {autre}} + + {VAR_SELECT, select, male {homme} female {femme}} sexe = dans une section traductible - - Balises dans les commentaires html + + Balises dans les commentaires html ca devrait marcher avec un ID explicite - {VAR_PLURAL, plural, =0 {zero} =1 {un} =2 {deux} other {{VAR_PLURAL, plural, =0 {zero} =1 {un} =2 {deux} other {<b>beaucoup</b>} } {VAR_PLURAL, plural, =0 {Pas de réponse} =1 {une réponse} other {INTERPOLATION réponse} } FOO<a>BAR</a> @@ -95,20 +95,20 @@ const XMB = `file.ts:3i18n attribu file.ts:14on not translatable node file.ts:15on translatable node file.ts:20file.ts:37{VAR_PLURAL, plural, =0 {zero} =1 {one} =2 {two} other {<b>many</b>} } - file.ts:22,24 - {sex, select, 0 {...} m {...} f {...}} + file.ts:22,24 + {sex, select, male {...} female {...} other {...}} - file.ts:23{VAR_SELECT, select, 0 {other} m {male} f {female} } - file.ts:25,27 - {sexB, select, m {...} f {...}} + file.ts:23{VAR_SELECT, select, male {m} female {f} other {other} } + file.ts:25,27 + {sexB, select, male {...} female {...}} - file.ts:26{VAR_SELECT, select, m {male} f {female} } + file.ts:26{VAR_SELECT, select, male {m} female {f} } file.ts:29{{ "count = " + count }} file.ts:30sex = {{ sex }} file.ts:31{{ "custom name" //i18n(ph="CUSTOM_NAME") }} file.ts:36file.ts:54in a translatable section - file.ts:34,38 - <h1>Markers in html comments</h1> + file.ts:34,38 + <h1>Markers in html comments</h1> <div></div> <div>{count, plural, =0 {...} =1 {...} =2 {...} other {...}}</div> diff --git a/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts b/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts index 992675b9b9..e74e1a4d25 100644 --- a/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts +++ b/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts @@ -36,7 +36,7 @@ import {humanizeNodes} from './ast_spec_utils'; }); it('should handle nested expansion forms', () => { - const res = expand(`{messages.length, plural, =0 { {p.gender, select, =m {m}} }}`); + const res = expand(`{messages.length, plural, =0 { {p.gender, select, male {m}} }}`); expect(humanizeNodes(res.nodes)).toEqual([ [html.Element, 'ng-container', 0], @@ -46,7 +46,7 @@ import {humanizeNodes} from './ast_spec_utils'; [html.Element, 'ng-container', 2], [html.Attribute, '[ngSwitch]', 'p.gender'], [html.Element, 'ng-template', 3], - [html.Attribute, 'ngSwitchCase', '=m'], + [html.Attribute, 'ngSwitchCase', 'male'], [html.Text, 'm', 4], [html.Text, ' ', 2], ]);