diff --git a/web/_config.yml b/web/_config.yml index e41d84ac..fae89aee 100644 --- a/web/_config.yml +++ b/web/_config.yml @@ -15,7 +15,7 @@ lessons: url: basics2.html desc: Case classes, objects, packages, apply, update, Functions are Objects (uniform access principle), pattern matching. desc_ru: Case классы, объекты, пакеты, apply, update, Функции как Объекты (единый принцип доступа), сопоставление с образцом. - desc_zh_cn: 样本类（Case classes），对象，包，应用，更新，函数即对象（统一访问原则），模式匹配（pattern matching）。 + desc_zh_cn: 样本类，对象，包，应用，更新，函数即对象（统一访问原则），模式匹配。 - title: Collections title_ru: Коллекции @@ -39,7 +39,7 @@ lessons: url: type-basics.html desc: Basic Types and type polymorphism, type inference, variance, bounds, quantification desc_ru: Основные типы и полиморфизм типов, вывод типов, изменчивость, пределы, квантификация - desc_zh_cn: 基本类型和类型多态性，类型推断，TODO方差，突飞猛进，量化 + desc_zh_cn: 基本类型和类型多态性，类型推断，变性，边界，量化 - title: Advanced types title_ru: Дополнительные типы @@ -47,7 +47,7 @@ lessons: url: advanced-types.html desc: Advanced Types, view bounds, higher-kinded types, recursive types, structural types desc_ru: Дополнительные типы, видимое ограничение, типы высшего порядка, рекурсивные типы, структурные типы - desc_zh_cn: TODO高级类型，视图界限，更高kinded类型，递归类型，结构类型 + desc_zh_cn: 高级类型，视界，更高kinded类型，递归类型，结构类型 - title: Simple Build Tool title_ru: Simple Build Tool diff --git a/web/_layouts/default.html b/web/_layouts/default.html index 5ebbf622..f14c7a51 100644 --- a/web/_layouts/default.html +++ b/web/_layouts/default.html @@ -31,7 +31,7 @@

- Built at @twitter by @stevej, @marius, and @lahosken with much help from @evanm, @sprsquish, @kevino, @zuercher, @timtrueman, @wickman and @mccv; Russian translation by appigram
+ Built at @twitter by @stevej, @marius, and @lahosken with much help from @evanm, @sprsquish, @kevino, @zuercher, @timtrueman, @wickman and @mccv; Russian translation by appigram; Chinese simple translation by jasonqu
Licensed under the Apache License v2.0.

diff --git a/web/_layouts/post.html b/web/_layouts/post.html index e300f36d..970450c5 100644 --- a/web/_layouts/post.html +++ b/web/_layouts/post.html @@ -43,7 +43,7 @@

{{ page.title }}

- Built at @twitter by @stevej, @marius, and @lahosken with much help from @evanm, @sprsquish, @kevino, @zuercher, @timtrueman, @wickman and @mccv; Russian translation by appigram
+ Built at @twitter by @stevej, @marius, and @lahosken with much help from @evanm, @sprsquish, @kevino, @zuercher, @timtrueman, @wickman and @mccv; Russian translation by appigram; Chinese simple translation by jasonqu
Licensed under the Apache License v2.0.

diff --git a/web/zh_cn/advanced-types.textile b/web/zh_cn/advanced-types.textile index eb28d912..dfc8d9a5 100644 --- a/web/zh_cn/advanced-types.textile +++ b/web/zh_cn/advanced-types.textile @@ -7,14 +7,14 @@ layout: post 课程内容： -* "View bounds":#viewbounds ("type classes") -* "Other Type Bounds":#otherbounds -* "Higher kinded types & ad-hoc polymorphism":#higher -* "F-bounded polymorphism / recursive types":#fbounded -* "Structural types":#structural -* "Abstract types members":#abstractmem -* "Type erasures & manifests":#manifest -* "Case study: Finagle":#finagle +* "视界":#viewbounds ("类型类") +* "其他类型限制":#otherbounds +* "高阶类型 和 特设多态性":#higher +* "F-界多态性 / 递归类型":#fbounded +* "结构类型":#structural +* "抽象类型成员":#abstractmem +* "类型擦除和清单":#manifest +* "案例分析: Finagle":#finagle h2(#viewbounds). 视界（“类型类”） @@ -152,7 +152,7 @@ res37: Ordering[Int] = scala.math.Ordering$Int$@3a9291cf 相结合后往往会使用更少的代码，尤其是串联视图的时候。 -h2(#higher). Higher-kinded types & ad-hoc polymorphism 高阶类型 和 特设多态性 +h2(#higher). 高阶类型 和 特设多态性 Scala可以对“更高阶”的类型进行抽象。例如，假设您需要用几种类型的容器处理几种类型的数据。你可能定义了一个Container的接口，它可以被实现为几种类型的容器：Option、List等。你要定义可以使用这些容器里的值的接口，但不想确定值的类型。 @@ -319,7 +319,7 @@ scala> (new MakeFoo[String]).make res10: String = "" -h2(#finagle). Case study: Finagle +h2(#finagle). 案例分析: Finagle 参见: https://github.com/twitter/finagle