111 Commits

Author SHA1 Message Date
Zhicheng Wang
6264d3bcde 批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐 2016-07-07 08:22:36 +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
Foxandxss
37b377ddb3 docs: update node and npm version recommendations
closes #1821
2016-07-05 23:09:37 -07: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
3c5a045633 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
Patrice Chalin
0ba3d5d8d6 docs(dart/{quickstart,toh-[56]}): fix project names (#1773)
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).

Fixes #378.
2016-07-01 11:05:45 -07:00
Zhimin YE (Rex)
d5728d8b1c minor correction to quickstart.jade and review of router.jade to line 903. 2016-06-29 17:04:22 +01:00
Zhicheng Wang
64b9e476fb 把alternative统一改为备选或替代品(取决于语境) 2016-06-21 07:54:34 +08:00
Rex
77cdd8bde8 review all "我们" keyword, making the translations more natural. 2016-06-20 10:59:00 +01:00
Zhimin YE (Rex)
e8a462435c Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/news.jade
2016-06-16 09:03:59 +01:00
Foxandxss
6821f89a1c docs(quickstart): add a section to installing typings manually 2016-06-15 15:15:00 -07:00
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhimin(Rex) YE
ce299be58b Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/quickstart.jade
2016-06-02 22:29:17 +01:00
Patrice Chalin
b48cde3a43 chore(_util-fns): generalize makeExample, drop makeProjExample (#1510)
+ Rename adjustExample{Path|Title} to adjustTsExample*4Dart
+ `makeExample` can now work with both doc folder relative and project
relative paths.
2016-06-02 17:06:03 +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
Patrice Chalin
5e50b2ef10 chore(util-fns): minor cleanup and refactoring (#1562)
This only impacts language dependent variable and path definitions:
- Removed deprecated variable.
- Hoisted useful variable definitions from quickstart into _util-fns.
- Minor fix in regexp of path translation function
2016-05-31 15:25:59 -07:00
Zhicheng Wang
752a152731 Merge remote-tracking branch 'origin/master'
upgrade.jade的附录没有翻译

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/index.jade
2016-05-30 21:46:16 +08:00
Foxandxss
888dcf362a chore: remove note against node 6
closes #1540
2016-05-29 12:46:55 -07:00
Zhimin YE (Rex)
21b13126da Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/quickstart.jade
2016-05-26 14:10:36 +01:00
Zhicheng Wang
33aed368c9 微调 2016-05-25 21:18:25 +08:00
Vikash Verma
551ac6dc9d docs: Fix typo (#1504) 2016-05-25 12:17:02 +01:00
Zhimin YE (Rex)
17d6eeb1e2 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
2016-05-25 11:13:25 +01:00
Foxandxss
81ebdfb8ef docs: add strong advice on node and npm versions 2016-05-21 15:56:09 -07:00
Zhicheng Wang
ae3b205c77 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/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.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
2016-05-21 21:02:15 +08:00
Patrice Chalin
6d2d52c588 docs(dart): cleanup 'live example' links (#1449)
This fixes various issues such as:
- missing space in Dart version between the live demo and demo source
links.
- Live example link directing to Plunker for Dart.

The main mixins (`liveExampleLink`*) used to support the generation of
links now assume reasonable default values for their arguments, and in
most cases the defaults are used.

* Dart example links: use http vs https

As agree to with @kwalrath.
2016-05-20 16:18:58 -07:00
Zhicheng Wang
29df35d724 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-20 15:34:27 +08:00
Ward Bell
3423ad8491 chore: more conversion of es6-shim to core-js 2016-05-19 23:18:18 -07:00
Foxandxss
bd52aa3f34 docs: complete es6-shim to core-js migration
closes #1442
2016-05-19 19:12:14 -07:00
Zhicheng Wang
aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +08:00
Zhicheng Wang
64f6b9e34a 修改一些翻译问题 2016-05-19 17:21:12 +08:00
Zhicheng Wang
6d810d4676 修改一个jade语法错 -_- 2016-05-19 17:03:55 +08:00
Zhicheng Wang
15110fa926 QuickStart冲突太多,重新翻译了一遍 2016-05-19 16:32:43 +08:00
Zhicheng Wang
5f1f27e09c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
2016-05-19 13:33:02 +08:00
Patrice Chalin
5b1a84be4c chore(docs): revise makeExcerpt mixin, add makeProjExample mixin
Be more DRY when referencing examples and excerpts. E.g.,
```jade
+makeExcerpt('quickstart/ts/app/app.component.ts', 'import',
'app/app.component.ts (import)')
```
can now be just
```jade
+makeExcerpt('app/app.component.ts', 'import')
```
Defined new mixin for examples named `makeProjExample` using this new
scheme.
The original `makeExample` has been left untouched.

Applied new mixins to quickstart.

closes #1420
2016-05-18 10:27:51 -07:00
Zhicheng Wang
bb60da5cf4 更新了翻译状态
文字微调
2016-05-18 13:37:37 +08:00
Zhicheng Wang
86d151c40e 把QuickStart改成“快速起步” 2016-05-18 13:30:07 +08:00
Kathy Walrath
2810218b88 docs(quickstart): edit Dart & TS QuickStarts
closes #1411
2016-05-17 14:17:43 -07:00
Ward Bell
f5a9edc68c docs(quickstart): say 'My First Angular 2 App' 2016-05-16 23:16:11 -07:00
Patrice Chalin
fedc39dd52 docs(quickstart-ts/dart): updated prose and example code; consolidate for TS&Dart
closes #1396
2016-05-15 19:26:45 -07:00
Zhicheng Wang
9dccc57409 解决格式化问题
重命名
2016-05-13 15:06:35 +08:00
Zhicheng Wang
74547be9e2 修改了翻译的一些小bug 2016-05-13 13:29:08 +08:00
Zhicheng Wang
3634128fff 初步实现了对照翻译功能:自动隐藏原文,并把原文的文本内容设置为译文的title 2016-05-13 13:02:01 +08:00
Foxandxss
96238bbfab docs(cb-webpack): add guide chapter about webpack 2016-05-12 17:22:14 -07:00
Ward Bell
2e486cc046 docs(typings): add typings.d.ts for module.id and __moduleName; update docs
closes #1355 and #1312
2016-05-11 13:20:42 -07:00
Zhicheng Wang
a870e4401b 部分“格式(form)”改为“形式” 2016-05-11 19:34:38 +08:00
Zhicheng Wang
bca76787bb 部分监听改为监视 —— 监听只适用于listen的翻译 2016-05-11 19:30:44 +08:00
Zhicheng Wang
479a70d90d QuickStart一审完毕 2016-05-11 15:56:17 +08:00
Zhicheng Wang
f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Zhicheng Wang
9b1544bb70 文字微调 2016-05-11 14:46:40 +08:00
Foxandxss
142ad5dd19 docs(quickstart): fix broken file-listings and reveal some systemjs when not verbose
Closes PRs #1304 and #1324 and issues #1303 and #1321
2016-05-10 21:17:49 -07:00