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

refatcor(digestMessage): takes a i18n.Message

Browse Source
This commit is contained in:
Victor Berchet 2016-08-05 11:53:37 -07:00
parent 4028fcaa51
commit 8c9c0986e9
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/@angular/compiler/src/i18n/extractor_merger.ts
View File

@ -338,7 +338,7 @@ class _Visitor implements html.Visitor {
// translate the given message given the `TranslationBundle` // translate the given message given the `TranslationBundle`
private _translateMessage(el: html.Node, message: i18n.Message): html.Node[] { private _translateMessage(el: html.Node, message: i18n.Message): html.Node[] {
if (message && this._mode === _VisitorMode.Merge) { if (message && this._mode === _VisitorMode.Merge) {
const id = msgBundle.digestMessage(message.nodes, message.meaning); const id = msgBundle.digestMessage(message);
const nodes = this._translations.get(id); const nodes = this._translations.get(id);
if (nodes) { if (nodes) {
@ -374,7 +374,7 @@ class _Visitor implements html.Visitor {
if (i18nAttributeMeanings.hasOwnProperty(attr.name)) { if (i18nAttributeMeanings.hasOwnProperty(attr.name)) {
const meaning = i18nAttributeMeanings[attr.name]; const meaning = i18nAttributeMeanings[attr.name];
const message: i18n.Message = this._createI18nMessage([attr], meaning, ''); const message: i18n.Message = this._createI18nMessage([attr], meaning, '');
const id = msgBundle.digestMessage(message.nodes, message.meaning); const id = msgBundle.digestMessage(message);
const nodes = this._translations.get(id); const nodes = this._translations.get(id);
if (!nodes) { if (!nodes) {
this._reportError( this._reportError(

9
modules/@angular/compiler/src/i18n/message_bundle.ts
View File

@ -39,16 +39,15 @@ export class MessageBundle {
return i18nParserResult.errors; return i18nParserResult.errors;
} }
i18nParserResult.messages.forEach((message) => { i18nParserResult.messages.forEach(
this._messageMap[digestMessage(message.nodes, message.meaning)] = message; (message) => { this._messageMap[digestMessage(message)] = message; });
});
} }
write(serializer: Serializer): string { return serializer.write(this._messageMap); } write(serializer: Serializer): string { return serializer.write(this._messageMap); }
} }
export function digestMessage(nodes: i18n.Node[], meaning: string): string { export function digestMessage(message: i18n.Message): string {
return strHash(serializeNodes(nodes).join('') + `[${meaning}]`); return strHash(serializeNodes(message.nodes).join('') + `[${message.meaning}]`);
} }
/** /**

6
modules/@angular/compiler/test/i18n/extractor_merger_spec.ts
View File

@ -373,9 +373,9 @@ function fakeTranslate(
const i18nMsgMap: {[id: string]: html.Node[]} = {}; const i18nMsgMap: {[id: string]: html.Node[]} = {};
messages.forEach(msg => { messages.forEach(message => {
const id = digestMessage(msg.nodes, msg.meaning); const id = digestMessage(message);
const text = serializeI18nNodes(msg.nodes).join(''); const text = serializeI18nNodes(message.nodes).join('');
i18nMsgMap[id] = [new html.Text(`**${text}**`, null)]; i18nMsgMap[id] = [new html.Text(`**${text}**`, null)];
}); });