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

feat(i18n): support plural and gender special forms

Browse Source
This commit is contained in:
vsavkin
2016-04-12 11:46:49 -07:00
committed by Victor Savkin
parent 7c9717bba8
commit 88b0a239c4
11 changed files with 278 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/angular2/src/i18n/i18n_html_parser.ts
View File

@ -7,6 +7,8 @@ import {
HtmlAttrAst,
HtmlTextAst,
HtmlCommentAst,
HtmlExpansionAst,
HtmlExpansionCaseAst,
htmlVisitAll
} from 'angular2/src/compiler/html_ast';
import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
@ -14,6 +16,7 @@ import {RegExpWrapper, NumberWrapper, isPresent} from 'angular2/src/facade/lang'
import {BaseException} from 'angular2/src/facade/exceptions';
import {Parser} from 'angular2/src/compiler/expression_parser/parser';
import {Message, id} from './message';
import {Expander} from './expander';
import {
messageFromAttribute,
I18nError,
@ -119,19 +122,25 @@ export class I18nHtmlParser implements HtmlParser {
constructor(private _htmlParser: HtmlParser, private _parser: Parser,
private _messagesContent: string, private _messages: {[key: string]: HtmlAst[]}) {}
parse(sourceContent: string, sourceUrl: string): HtmlParseTreeResult {
parse(sourceContent: string, sourceUrl: string,
parseExpansionForms: boolean = false): HtmlParseTreeResult {
this.errors = [];
let res = this._htmlParser.parse(sourceContent, sourceUrl);
let res = this._htmlParser.parse(sourceContent, sourceUrl, parseExpansionForms);
if (res.errors.length > 0) {
return res;
} else {
let nodes = this._recurse(res.rootNodes);
let nodes = this._recurse(this._expandNodes(res.rootNodes));
return this.errors.length > 0 ? new HtmlParseTreeResult([], this.errors) :
new HtmlParseTreeResult(nodes, []);
}
}
private _expandNodes(nodes: HtmlAst[]): HtmlAst[] {
let e = new Expander();
return htmlVisitAll(e, nodes);
}
private _processI18nPart(p: Part): HtmlAst[] {
try {
return p.hasI18n ? this._mergeI18Part(p) : this._recurseIntoI18nPart(p);
@ -360,5 +369,9 @@ class _CreateNodeMapping implements HtmlAstVisitor {
return null;
}
visitExpansion(ast: HtmlExpansionAst, context: any): any { return null; }
visitExpansionCase(ast: HtmlExpansionCaseAst, context: any): any { return null; }
visitComment(ast: HtmlCommentAst, context: any): any { return ""; }
}