Merge branch 'master' of https://github.com/angular/angular-cn into dreamapple-contribute

This commit is contained in:
dreamapple 2016-07-05 14:39:46 +08:00
commit 5bd5c3cf00
8 changed files with 31 additions and 30 deletions

View File

@ -17,7 +17,8 @@ p 运行这部分的#[+liveExampleLink2('在线例子', 'toh-1')]。
Create a folder called `angular2-tour-of-heroes` and follow the [QuickStart](../quickstart.html) steps
which provide the prerequisites, the folder structure, and the core files for our Tour of Heroes.
创建一个名为`angular2-tour-of-heroes`的文件夹,并且遵循[“快速起步”](../quickstart.html)中的步骤初始化它 —— 环境准备、目录结构,并放进我们《英雄指南》的核心文件。
创建一个名为`angular2-tour-of-heroes`的文件夹,并且遵循[“快速起步”](../quickstart.html)中的步骤初始化它 ——
环境准备、目录结构,并放进我们《英雄指南》的核心文件。
include ../_quickstart_repo
:marked

View File

@ -227,6 +227,8 @@ code-example(language="bash").
That's a lot of styles! We can put them inline as shown here, or we can move them out to their own file which will make it easier to code our component.
We'll do this in a later chapter. For now let's keep rolling.
其实有很多种写法!我们可以像这里这样把模板内联进去,或者把模板移到单独的文件中 —— 这样能让编写组件变得更容易。后面的章节中我们会尝试使用独立模板,但现在我们先不管它。
When we assign styles to a component they are scoped to that specific component.
Our styles will only apply to our `AppComponent` and won't "leak" to the outer HTML.

View File

@ -117,14 +117,7 @@ code-example(language="bash").
case sensitivity on the server or in source control.
这里我们使用小写**[中线命名法](../guide/glossary.html#!#dash-case)**(也叫**[烤串命名法](../guide/glossary.html#!#kebab-case)**)拼写文件名,所以不用担心它在服务器或者版本控制系统中出现大小写问题。
<!-- TODO
.l-sub-section
:marked
Learn more about naming conventions in the chapter [Naming Conventions]
要了解命名约定的更多知识,参见[命名约定]一章
:marked
-->
:marked
We begin by importing the `Component` and `Input` decorators from Angular because we're going to need them soon.

View File

@ -339,11 +339,10 @@ code-example(language="bash").
这个`RouteConfig`是一个*路由定义*的数组。
此刻我们只有一个路由定义,但别急,后面还会添加更多。
This *route definition* has three parts:
“路由定义”包括三个部分:
This *route definition* has two parts:
“路由定义”包括两个部分:
* **path**: the router matches this route's path to the URL in the browser address bar (`/heroes`).
* **path**: 路由器会用它来匹配路由中指定的路径和浏览器地址栏中的当前路径,如`/heroes`。
@ -504,6 +503,8 @@ code-example(language="bash").
.l-sub-section
:marked
**Redirect**
**重定向**
We want the app to show the dashboard when it starts and
we want to see a nice URL in the browser address bar that says `/dashboard`.

View File

@ -15,10 +15,10 @@
## 感恩
本中文网站能够达到现在的质量首先要感谢Angular开发组的项目经理Naomi的鼎力支持。她不但邀请我们加入了Angular项目组还让我们与各位文档作者之间建立了直接的沟通渠道这种沟通渠道非常宝贵让我们得以准确理解所涉及到的各个技术细节并减轻了保持同步更新时的额外工作量。
本网站能够及时推出要感谢Google中国区的负责人栾跃和与我们的接口人程路他们的专业性和高效率让我们得以心无旁骛的完成翻译工作。也是在他们的大力帮助下本网站才能最终作为官方中文版推出。
本中文网站能够达到现在的质量首先要感谢Google公司Angular产品开发部门的项目经理Naomi Black的鼎力支持。她不但邀请我们加入了Angular项目组还让我们与各位文档作者之间建立了直接的沟通渠道。这种沟通渠道非常宝贵让我们得以准确理解所涉及到的各个技术细节并减轻了保持同步更新时的额外工作量。
本网站能够及时推出要感谢Google开发技术推广部大中华区的负责人栾跃、以及负责和我们进行项目协调沟通的Google开发技术推广部中国团队的项目经理程路。他们的专业性和高效率让我们得以心无旁骛的完成翻译工作。也是在他们的大力帮助下本网站才能最终作为官方中文版推出。
最后,要特别感谢我们各自的家人。同步、高质量的翻译是个耗时耗力的工作,如果没有她们的支持,此工作将无法完成。
## 支持我们
@ -40,6 +40,7 @@
- 张旋 (来自Angular中文社区)
- Hantsy (来自Github)
- iloveyo123u1 (来自Github)
- 123来自Angular中文社区
- 另外还有一些做好事不留名的活雷锋
想让你的名字也出现在这里吗?请提供[反馈、纠错](https://github.com/angular/angular-cn/issues)。

View File

@ -2,11 +2,11 @@
:marked
## 官方论坛
- **[bbs.angular.cn](https://bbs.angular.cn)** 本论坛正在建设中,我们明年会发布一个更好的版本并开源。
- **[bbs.angular.cn](http://bbs.angular.cn)** 本论坛正在建设中,我们明年会发布一个更好的版本并开源。
## 官方微信
- (敬请期待)
![官方微信](./wechat.jpg)
## 友军QQ群

View File

@ -9,9 +9,9 @@
:marked
Welcome to angular.cn!
欢迎光临Angular中文官网
欢迎光临angular.cn
This official site and the developer guides you will find here are the result of hard work and dedication by members of Angular's Chinese developer community. More than just a linguistic translation, this site was localized and updated by developers who use and know Angular, and understand the concepts as engineers. Led by friends Zhicheng WANG (Ralph) and Zhimin YE (Rex), united by a commitment to open source software and helping developers, the [angular.cn team](./about.html) is motivated by the desire to make Angular more accessible to the millions of Chinese-speaking developers worldwide.
This official site and the developer guides you will find here are the result of hard work and dedication by members of Angular's Chinese developer community. More than just a linguistic translation, this site was localized and updated by developers who use and know Angular, and understand the concepts as engineers. Led by friends Zhicheng WANG (Ralph) and Zhimin YE (Rex), united by a commitment to open source software and helping developers, the [angular.cn](./about.html) team is motivated by the desire to make Angular more accessible to the millions of Chinese-speaking developers worldwide.
这份官方网站和《Angular 2 开发指南》的中文版是中国的Angular开发者社区共同努力奉献的成果。它们来自深谙Angular设计理念的工程师故此这份中文版不仅是语言上的简单汉化。出于对“开源精神”和“共享精神”的执着与推崇汪志成和叶志敏共同带领[angular.cn团队](./about.html)奋力工作力争让全世界的中文开发者与Angular实现零距离的亲密接触。
@ -22,10 +22,10 @@
As a champion of open technology, Google has invested a lot and will continue to invest in the advancement of Angular, for the benefits of our users in China and around the world.
作为开源技术的倡导者Google已经并将继续投资于对Angular的完善和演进工作造福并回馈中国区的用户以及全世界的用户。
We are happy to see that Angulars Chinese developer community has grown to its current large size, fueled by not only the passion for technologies among developers, but also by the desire to make this technology effective for real businesses. Many companies in China have already built their businesses based on Angular technology. We hope that the updated materials on this official site will continue to inspire and help putting this technology into more real world business services and applications in China. If your business already runs on Angular, we invite you to join our developer community here, and become involved in our effort in continuing improving and enhancing this technology. We welcome your comments and suggestions at any time. Please send your remarks to Google Developer Relations China teams contact email at: devrel-china-contact@google.com
We are happy to see that Angulars Chinese developer community has grown to its current large size, fueled by not only the passion for technologies among developers, but also by the desire to make this technology effective for real businesses. Many companies in China have already built their businesses based on Angular technology. We hope that the updated materials on this official site will continue to inspire and help putting this technology into more real world business services and applications in China. If your business already runs on Angular, we invite you to join our [community](./follow.html) and become involved. We want to hear from you.
看到中国的Angular开发社区已经如此繁荣我们非常高兴。这不仅仅是出于开发者对技术的固有热情更是因为我们希望“用Angular高效实现商业需求”的宏伟愿景。事实上许多中国公司的业务早已基于Angular技术。我们希望通过对官网内容的持续更新鼓励并协助大家把Angular更多的应用于现实世界中的业务服务与应用程序。如果您的业务大厦已经构建在Angular的基础之上我们欢迎您加入[中文社区](./follow.html),期待听到您的心声!
看到中国的Angular开发社区已经如此繁荣我们非常高兴。这不仅仅是出于开发者对技术的固有热情更是因为我们希望“用Angular高效实现商业需求”的宏伟愿景。事实上许多中国公司的业务早已基于Angular技术。我们希望通过对官网内容的持续更新鼓励并协助大家把Angular更多的应用于现实世界中的业务服务与应用程序。如果您的业务大厦已经构建在Angular的基础之上我们欢迎您加入[中文社区](./follow.html)参与到我们持续增强和优化此项技术的努力中来。我们随时欢迎您的意见和建议请发邮件到Google的技术推广部联系我们我们的邮箱是[devrel-china-contact@google.com](mailto:devrel-china-contact@google.com)。
Angular succeeds because it is built by and for developers who come from many different backgrounds. We hope that these materials will help you to learn and understand Angular, and to contribute back to the framework in future. We are excited to see what you will build with Angular here in China, and how the framework itself will change as the result of your enthusiasm.
@ -43,11 +43,11 @@
Naomi Black与Brad Green
## 栾跃代表Google大中华区技术推广部(DevRel)的致辞
## 栾跃代表Google开发技术推广部的致辞
.l-sub-section
:marked
**这是谷歌开发技术推广部大中华区的主管栾跃发来的致辞。DevRel部门也会安排专人来全职运营Angular中文社区包括组织线上线下的活动、对外合作等。希望大家多多捧场。**
**这是开发技术推广部的主管栾跃发来的致辞。该部门也会安排专人来全职运营Angular中文社区包括组织线上线下的活动、对外合作等。希望大家多多捧场。**
:marked
Hello to Developer Friends of the Angular.CN community!
@ -84,16 +84,19 @@
## 授权方式
本文档遵循[“保持署名—非商用”创意共享4.0许可证CC BY-NC 4.0](http://creativecommons.org/licenses/by-nc/4.0/deed.zh)授权方式,你不用知会我们就可以转载,但必须保持署名(特别是:不得去掉本页入口链接,也不得修改本页内容),并且不得用于商业目的。如果需要进行任何商业推广,请接洽我们的[联系人程路](mailto:lucheng@google.com)
本文档遵循[“保持署名—非商用”创意共享4.0许可证CC BY-NC 4.0](http://creativecommons.org/licenses/by-nc/4.0/deed.zh)授权方式,你不用知会我们就可以转载,但必须保持署名(特别是:链接到<https://angular.cn>,并且不得去掉本页入口链接,也不得修改本页内容),并且不得用于商业目的。如果需要进行任何商业推广,请接洽[Google开发技术推广部](mailto:devrel-china-contact@google.com),我们将给出积极的回应
本文档首发于[Angular中文网](https://angular.cn/)。如果你要进行转载请自行同步不过小心别DDoS了我们。
## 关于中文社区
## 关于我们
关于两位译者的简介请参见[这里](./about.html)。
两位译者汪志成和叶志敏的简介请参见[这里](./about.html)。
关于Angular中文社区的简介请参见[这里](./follow.html)。
Angular中文社区的简介和更多资源请参见[这里](./follow.html)。
## 工作预告
我们已经组织了一个九人专家组开始了对ng-book2的翻译工作出版社也将加快流程争取能尽早与各位见面。以我们一向的质量标准我敢保证这会是一份精品。同时我们也和Google中国的DevRel部门加强了合作未来还会有一系列线上和线下推广工作如果您有意为这些活动贡献力量请接洽我们的[联系人程路](mailto:lucheng@google.com)。
我们已经组织了一个九人专家组,开始了对[ng-book2](https://www.ng-book.com/2/)的翻译工作,出版社也将加快流程,争取能尽早与各位见面。以我们一向的质量标准,我敢保证这会是一份精品。敬请期待!
将来Google技术推广部还会有一系列线上和线下推广工作如果您有意为这些活动贡献力量请接洽[Google开发技术推广部](mailto:devrel-china-contact@google.com)。

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB