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

refactor(compiler): Load the translation bundle only once in the i18n html parser (#14362)

Browse Source 
fixes #14322
This commit is contained in:
Victor Berchet
2017-02-08 11:35:16 -08:00
committed by Miško Hevery
parent c4817988ca
commit 881dce841f
3 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/@angular/compiler/src/i18n/i18n_html_parser.ts
View File

@ -24,11 +24,18 @@ export class I18NHtmlParser implements HtmlParser {
// @override
getTagDefinition: any;
private _translationBundle: TranslationBundle;
constructor(
private _htmlParser: HtmlParser, private _translations?: string,
private _translationsFormat?: string,
private _missingTranslation: MissingTranslationStrategy = MissingTranslationStrategy.Warning,
private _console?: Console) {}
private _htmlParser: HtmlParser, translations?: string, translationsFormat?: string,
missingTranslation: MissingTranslationStrategy = MissingTranslationStrategy.Warning,
console?: Console) {
if (translations) {
const serializer = createSerializer(translationsFormat);
this._translationBundle =
TranslationBundle.load(translations, 'i18n', serializer, missingTranslation, console);
}
}
parse(
source: string, url: string, parseExpansionForms: boolean = false,
@ -36,36 +43,31 @@ export class I18NHtmlParser implements HtmlParser {
const parseResult =
this._htmlParser.parse(source, url, parseExpansionForms, interpolationConfig);
if (!this._translations || this._translations === '') {
if (!this._translationBundle) {
// Do not enable i18n when no translation bundle is provided
return parseResult;
}
// TODO(vicb): add support for implicit tags / attributes
if (parseResult.errors.length) {
return new ParseTreeResult(parseResult.rootNodes, parseResult.errors);
}
const serializer = this._createSerializer();
const translationBundle = TranslationBundle.load(
this._translations, url, serializer, this._missingTranslation, this._console);
return mergeTranslations(parseResult.rootNodes, translationBundle, interpolationConfig, [], {});
}
private _createSerializer(): Serializer {
const format = (this._translationsFormat || 'xlf').toLowerCase();
switch (format) {
case 'xmb':
return new Xmb();
case 'xtb':
return new Xtb();
case 'xliff':
case 'xlf':
default:
return new Xliff();
}
return mergeTranslations(
parseResult.rootNodes, this._translationBundle, interpolationConfig, [], {});
}
}
function createSerializer(format?: string): Serializer {
format = (format || 'xlf').toLowerCase();
switch (format) {
case 'xmb':
return new Xmb();
case 'xtb':
return new Xtb();
case 'xliff':
case 'xlf':
default:
return new Xliff();
}
}