98 Commits

Author SHA1 Message Date
Zhicheng Wang
4400deeef8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
2016-07-24 17:27:48 +08:00
Kathy Walrath
66984d5fc8 Revert "Template Expression Operators Copy Edit "
This reverts commit d0811714d54cda1882f8287e095bf182ce39421d.
2016-07-21 13:41:44 -07:00
sgmills365
14bd476d89 Added capital lettings to titles 2016-07-21 00:42:18 -07:00
amandaegraham
d0811714d5 Template Expression Operators Copy Edit
Waterloo ENGL 210 J Student 
Changed order of text in pipe operator to introduce pipe operator 
Changed word choice/word location in pope operator 
Added : before examples to keep consistent
2016-07-21 00:42:18 -07:00
amandaegraham
7e1dba64eb Interpolation Copy Edit 2016-07-21 00:42:18 -07:00
amandaegraham
e8642d4616 HTML Section Copy Edit
Waterloo ENGL 210J Student  
Line 44: Changed tense
Line 54: Changed wording of second sentence to not start with 'and'. Added DOM meaning (Document Object Model)
2016-07-21 00:42:18 -07:00
dreamapple
2269c9f893 翻译的建议 2016-07-18 10:50:36 +08:00
dreamapple
e72ae07927 翻译的建议 2016-07-18 10:46:20 +08:00
dreamapple
a56b460e20 翻译的建议: "In practice"在文中翻译为"实际上"可能比"在实践中"要好理解. 2016-07-18 10:38:00 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
Zhicheng Wang
0dd2932a2e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
2016-07-01 08:38:54 +08:00
Zhicheng Wang
21fe9dc1d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
2016-07-01 08:24:23 +08:00
Filipe Silva
aa8ab52937 chore: update to rc.4 2016-06-30 12:40:01 -07:00
priestch
b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Filipe Silva
58d20e57b5 chore: update ngSwitchWhen to ngSwitchCase
See https://github.com/angular/angular/commit/e1fcab7
2016-06-28 12:52:47 -07:00
Rick Beerendonk
2eae445504 docs(template-syntax): correct hyperlink path to API documentation 2016-06-28 12:52:47 -07:00
Zhicheng Wang
d7a71ccf59 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-06-28 09:40:49 +08:00
Patrick McDonald
a843310e17 docs: Typo fix (an > a) (#1747) 2016-06-26 17:41:06 +01:00
Zhicheng Wang
64b9e476fb 把alternative统一改为备选或替代品(取决于语境) 2016-06-21 07:54:34 +08:00
Zhicheng Wang
d46b4911e6 根据Hantsy的意见,把所有“API参考”改为“API参考手册”
为非对照模式的中文添加translated-cn类,以便自动加空格
2016-06-19 17:04:46 +08:00
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang
164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhicheng Wang
46f028b8eb 根据 [Joeylin] 的反馈意见,做出微调
在“关于中文版”中增加鸣谢名单
2016-06-04 16:17:34 +08:00
Zhicheng Wang
0a917a99c4 微调 2016-06-02 15:17:55 +08:00
Zhicheng Wang
58dec1f30c cookbook - 1 to 2 初译完毕 2016-06-02 09:07:31 +08:00
Zhimin YE (Rex)
1a66785970 template-syntax review is done. 2016-06-01 16:52:34 +01:00
Zhimin YE (Rex)
aa010fb920 添加了译注,解释deleteRequest属性是Output属性。 2016-06-01 14:56:54 +01:00
Zhimin YE (Rex)
16bc5bfea2 review @ 1860 for template-syntax.jade. 2016-06-01 14:34:21 +01:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Zhicheng Wang
bea07ebfca 微调 2016-06-01 11:21:18 +08:00
Ward Bell
ae2d8f2730 docs(template-syntax): add brief example of HTML sanitization in binding.
Also clarified interpolation v. property binding example for PR #1564
2016-05-31 18:36:22 -07:00
Zhimin(Rex) YE
9ec2bbb8ae template-syntax review is half way@line 1228 2016-05-31 22:50:33 +01:00
Zhimin YE (Rex)
7cb918a800 partial review of template-syntax.jade. 2016-05-31 17:00:09 +01:00
Zhicheng Wang
c3c1fc6627 修正合并中的一个小错误 2016-05-27 17:40:58 +08:00
Zhicheng Wang
cb95a74253 Rex的版本出现jade编译错误,恢复到Wang的版本 2016-05-27 12:40:10 +08:00
Zhimin(Rex) YE
cbea511cad Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-05-26 23:48:22 +01:00
Patrice Chalin
a664f46231 docs(template-syntax): review and update Dart to new doc design (#1465)
* ts template-syntax.jade without docregion tags
* update guide/template-syntax for dart and ts
* clarify style property naming in Dart
2016-05-25 15:09:45 -07:00
Zhicheng Wang
cb756a5a05 统一了大量Attribute和Property的翻译
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00
Zhicheng Wang
86d151c40e 把QuickStart改成“快速起步” 2016-05-18 13:30:07 +08:00
Zhicheng Wang
2368b8f4c3 文字微调
食谱批量替换为菜谱
2016-05-17 15:46:28 +08:00
Zhicheng Wang
db9d68ced7 基础知识-模板 一审完毕 2016-05-16 21:34:36 +08:00
Zhicheng Wang
0d3cb23139 基础知识-用户输入 一审完毕 2016-05-16 15:17:45 +08:00
Zhicheng Wang
d76964ed91 基础知识-显示数据 一审完毕 2016-05-16 14:40:27 +08:00
Zhicheng Wang
15c927b29f “教程-主从结构”一审完毕
把内置批量替换为内建
2016-05-11 20:34:47 +08:00
Zhicheng Wang
a870e4401b 部分“格式(form)”改为“形式” 2016-05-11 19:34:38 +08:00
Zhicheng Wang
f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Zhicheng Wang
99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08:00
Zhicheng Wang
48e03ae748 完成了模板语法章 2016-05-09 09:58:40 +08:00
Zhicheng Wang
a2d6add5fe 翻译了大部分“模板语法”章 2016-05-08 21:00:37 +08:00