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

fix(ivy): i18n - add XLIFF aliases for legacy message id support (#33160) 

The `legacyMessageIdFormat` is taken from the `i18nInFormat` property but we were only considering
`xmb`, `xlf` and `xlf2` values.

The CLI also supports `xliff` and `xliff2` values for the
`i18nInFormat`.

This commit adds support for those aliases.

PR Close #33160
This commit is contained in:
Pete Bacon Darwin 2019-10-15 08:23:46 +01:00 committed by Miško Hevery
parent 11e04b1892
commit ad72c90447
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
View File

@ -2064,6 +2064,21 @@ runInEachFileSystem(os => {
expect(jsContents).toContain(':@@5dbba0a3da8dff890e20cf76eb075d58900fbcd3:Some text'); expect(jsContents).toContain(':@@5dbba0a3da8dff890e20cf76eb075d58900fbcd3:Some text');
}); });
it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xliff"',
() => {
env.tsconfig({i18nInFormat: 'xliff'});
env.write(`test.ts`, `
import {Component} from '@angular/core';
@Component({
selector: 'test',
template: '<div i18n>Some text</div>'
})
class FooCmp {}`);
env.driveMain();
const jsContents = env.getContents('test.js');
expect(jsContents).toContain(':@@5dbba0a3da8dff890e20cf76eb075d58900fbcd3:Some text');
});
it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xlf2"', it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xlf2"',
() => { () => {
env.tsconfig({i18nInFormat: 'xlf2'}); env.tsconfig({i18nInFormat: 'xlf2'});
@ -2079,6 +2094,21 @@ runInEachFileSystem(os => {
expect(jsContents).toContain(':@@8321000940098097247:Some text'); expect(jsContents).toContain(':@@8321000940098097247:Some text');
}); });
it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xliff2"',
() => {
env.tsconfig({i18nInFormat: 'xliff2'});
env.write(`test.ts`, `
import {Component} from '@angular/core';
@Component({
selector: 'test',
template: '<div i18n>Some text</div>'
})
class FooCmp {}`);
env.driveMain();
const jsContents = env.getContents('test.js');
expect(jsContents).toContain(':@@8321000940098097247:Some text');
});
it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xmb"', it('should render legacy id when `enableI18nLegacyMessageIdFormat` is not false and `i18nInFormat` is set to "xmb"',
() => { () => {
env.tsconfig({i18nInFormat: 'xmb'}); env.tsconfig({i18nInFormat: 'xmb'});

5
packages/compiler/src/render3/view/i18n/meta.ts
View File

@ -52,10 +52,11 @@ export class I18nMetaVisitor implements html.Visitor {
message.id = typeof meta !== 'string' && (meta as i18n.Message).id || decimalDigest(message); message.id = typeof meta !== 'string' && (meta as i18n.Message).id || decimalDigest(message);
} }
if (this.i18nLegacyMessageIdFormat === 'xlf') { if (this.i18nLegacyMessageIdFormat === 'xlf' || this.i18nLegacyMessageIdFormat === 'xliff') {
message.legacyId = computeDigest(message); message.legacyId = computeDigest(message);
} else if ( } else if (
this.i18nLegacyMessageIdFormat === 'xlf2' || this.i18nLegacyMessageIdFormat === 'xmb') { this.i18nLegacyMessageIdFormat === 'xlf2' || this.i18nLegacyMessageIdFormat === 'xliff2' ||
this.i18nLegacyMessageIdFormat === 'xmb') {
message.legacyId = computeDecimalDigest(message); message.legacyId = computeDecimalDigest(message);
} else if (typeof meta !== 'string') { } else if (typeof meta !== 'string') {
// This occurs if we are doing the 2nd pass after whitespace removal // This occurs if we are doing the 2nd pass after whitespace removal