Commit Graph

189 Commits

Author SHA1 Message Date
Zhicheng Wang 032a5215f8 翻译了更多router内容 2017-04-25 21:11:56 +08:00
Zhicheng Wang 5aace56c76 语言微调
翻译了一部分router章
2017-04-25 15:50:47 +08:00
Zhicheng Wang aec0892cf7 翻译完了testing章 2017-04-24 21:13:13 +08:00
Zhicheng Wang d7aa1e95c8 为live example添加翻译脚本
翻译了一部分测试章节
2017-04-23 09:34:51 +08:00
Zhicheng Wang 9db69011c3 修订完router 2017-04-15 22:15:28 +08:00
Zhicheng Wang 26ba602922 为方法加上括号 2017-04-15 15:58:08 +08:00
Zhicheng Wang f5c85b3e82 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_scripts-include.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.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/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/learning-angular.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	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
#	public/events.jade
#	public/news.jade
#	public/presskit.jade
2017-04-15 15:34:47 +08:00
Ward Bell a56c4a0b08 chore(aio): blank line before each list-item; - becomes * (#3481) 2017-04-01 00:25:27 +02:00
Jesús Rodríguez f7c89d07b1 chore: remove dart remains (#3468) 2017-03-30 16:13:42 -07:00
Filipe Silva 15036913bb docs: followup amends for 4.0 release (#3431) 2017-03-24 17:58:36 +00:00
Ward Bell 0fc40284dd [WIP] docs(toh): copyedits to conform to Google doc standards (#3032) (#3077) 2017-03-21 11:08:09 -07:00
Zhicheng Wang 67ec249772 fix: 修正链接,去掉重复的英文 2017-03-14 14:43:15 +08:00
Kapunahele Wong dfd360dc12 docs(routing-nav): copy edits (#3336) 2017-03-09 12:54:42 -08:00
Zhicheng Wang cb38d7613c fix: 不再使用重复id设置anchor(#198) 2017-03-03 15:29:00 +08:00
Zhicheng Wang 7711fa6557 不再使用li进行切换,而是全面转换到li内嵌p元素 2017-02-26 21:44:00 +08:00
Zhicheng Wang cb17c8afe3 把Angular 2替换为Angular
把Angular 1替换为AngularJS
2017-02-26 17:12:55 +08:00
Zhicheng Wang 6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.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/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Jesús Rodríguez 11701c009f chore: fix a few standing typos (#3280) 2017-02-21 17:45:02 -10:00
Deborah Kurata c5c4ad0c4d Update router.jade (#3265) 2017-02-19 21:00:26 -10:00
Appie 8e2c3d3d99 docs(router): add missing backstick (#3211) 2017-02-08 21:04:59 +01:00
Appie 88da94e1f4 docs(router): add missing backstick (#3210) 2017-02-08 21:04:04 +01:00
Deborah Kurata d35dab25cc docs(router): fix misspelling (#3212) 2017-02-07 20:52:25 +01:00
Josh Schneider 905733593b docs (router): fix type in router.jade (#3205)
Fix "Since the admin dashboard RouterLink is an empty path route in the AdminModule," ... "AdminModule" s/b "AdminComponent," AFICT.
2017-02-06 18:59:21 -08:00
Kanstantsin Klimashevich eb372a9b39 docs(router): fix Router.forRoot -> RouterModule.forRoot (#3172) 2017-02-05 23:25:05 +01:00
Josh Schneider b021012a9b Fix typo in router.jade (#3183) 2017-02-02 17:43:48 -08:00
Filipe Silva 1101f07ef2 refactor: add src folder (#3171)
* boilerplate, gulpfile, quickstart

* move ts files up to cookbooks

* move rest of ts files

* fix tsconfig, default build task, json file

* fix js examples

* fix webpack example

* remove a2docs.css references

* fix aot examples

* fix webpack run task

* fix cb-i18n

* fix upgrade examples

* fix unit tests

* fix comment in deployment index

* removed unused typings.json

* fix plunkers

* fix js example paths

* fix ts quickstart/setup prose

* add src folder note to setup

* broadly replace app/ -> src/app/

* broadly replace main.ts

* broadly replaced index.html

* broadly replace tsconfig

* replace systemjs

* fix filetrees

* Minor prose fixes to aot, i18n cookbooks

* remove char harp was complaining about

* update new reactive forms example

* fix quickstart jade error

* fix mistakes uncovered by CI

* fix bad filename errors

* edit style guide 04-06 rule to use src

* add changelog

* Incorporate Jesus's feedback

* fix snippet headers in toh1/2

* chore: tweak changelog and setup text
2017-02-02 19:38:17 +01:00
Patrice Chalin b793d1d531 docs(router): copyedits and moved code excerpt earlier (#3133)
- Copyedits
- Link directly to APP_BASE_HREF API entry, no need for a callout.
- Put dragon-anchor routerLink example *before* the detailed bulleted
list that analyzes it.
2017-01-26 22:12:18 +00:00
Jesús Rodríguez 35bbeb2e01 chore: s/falsey/falsy (#3093) 2017-01-13 21:01:51 -08:00
Zhicheng Wang 97d1bd7741 fix APP_BASE_HREF's link 2017-01-04 15:39:48 +08:00
Ward Bell ce174a26fb docs(router): chalin router copyedits #3054 (#3060)
* docs(router): chalin copyedits
* docs(router): bell copy edits + routing module order & inspect config
2017-01-01 00:25:52 -08:00
Patrice Chalin ec2b07ef8c docs(router): copyedits (#3025) 2016-12-21 23:20:21 -08:00
Ward Bell bc91b35bd9 docs(router): heavy copy edits (#3021) 2016-12-21 12:08:39 -08:00
Brandon 397c337378 docs(router): Added section for named outlets and secondary routes (#2842) 2016-12-20 15:26:09 -08:00
Brandon a74f8fb3b1 docs(router): Added wildcard route to live example (#2897) 2016-12-20 13:35:06 -08:00
Ward Bell 5e3807615d docs(router): fix typo originally identified by PR #2945 (#2962) 2016-12-12 22:30:59 -08:00
Shai Reznik 2b1df0487d docs(router): fix a typo (#2958) 2016-12-12 21:57:19 -08:00
Shai Reznik 38b22eee62 docs(router): fix typo (#2959) 2016-12-12 21:56:48 -08:00
Victor Berchet cf97326344 fix(router): fix Resolve docs and Resolve.resolve signature (#2954) 2016-12-09 05:56:14 -08:00
Ward Bell 79dc1f2dc8 chore: use common instructions for popping out plunker window-button (#2886)
To see the browser title or address bar changes.
Instructions are a little more complicated when the plunker is in embedded style
2016-11-28 21:23:28 -08:00
Rodrigo Quesada fd9a331127 Corrected RouterOutlet description (#2856)
<router-outlet> does not wrap the views, the views are inserted next to it, not within.
2016-11-28 13:37:06 -08:00
Rex 798d3f9216 Merge pull request #141 from dusthub/master
fix translation repeated
2016-11-27 20:14:00 +00:00
dusthub f38478893a fix translation repeated 2016-11-27 15:58:08 +08:00
rexebin edda524d0d Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	.travis.yml
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_next-item.jade
#	public/_includes/_util-fns.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_examples/package.json
#	public/docs/_examples/quickstart/dart/lib/app_component.dart
#	public/docs/_examples/quickstart/e2e-spec.ts
#	public/docs/_examples/quickstart/js/app/app.component.js
#	public/docs/_examples/quickstart/ts/app/app.component.ts
#	public/docs/_examples/quickstart/ts/index.html
#	public/docs/_examples/toh-5/dart/lib/dashboard_component.html
#	public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/guide/_data.json
#	public/docs/dart/latest/guide/index.jade
#	public/docs/dart/latest/quickstart.jade
#	public/docs/index.jade
#	public/docs/js/latest/quickstart.jade
#	public/docs/ts/_cache/glossary.jade
#	public/docs/ts/_cache/guide/dependency-injection.jade
#	public/docs/ts/_cache/guide/index.jade
#	public/docs/ts/_cache/quickstart.jade
#	public/docs/ts/_cache/tutorial/toh-pt5.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/_quickstart_repo.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.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/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.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/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/events.jade
#	public/resources/images/devguide/quickstart/hello-angular.png
#	scripts/cache.sh
#	tools/plunker-builder/indexHtmlTranslator.js
2016-11-26 21:43:16 +00:00
Rex YE 7f022c153b fix aot-compiler, router and upgrade 2016-11-22 15:21:36 +00:00
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Kenny John Jacob 7febba6209 docs(router): fix missing anchor id (#2817)
The link *Importing from the router library* (https://angular.io/docs/ts/latest/guide/router.html#import) does not work.

I supposed that this was the corresponding section to be linked to.
2016-11-17 21:54:55 +01:00
Patrice Chalin 0dfda08306 docs: in links use href=foo#bar not foo#!#bar (#2807) 2016-11-15 15:36:34 -08:00
Brandon Roberts 1afe5dc97d docs(router): Updated usage of observables in router tutorial and developer guide
Moved route configuration into separate variable for consistency
Added async pipe to handle subscriptions for list items
2016-11-14 11:05:29 -08:00
Adrian Irwin 37f93bc0cb docs(router): fixed verbiage and example of how routed views are related to the router outlet 2016-11-03 17:25:55 -07:00
rexebin de3b5cd6ce translate: router - pre-loading... 2016-11-03 22:44:27 +00:00