From 43f1bcb657c83a5f3d177aad94d44b47c67cc584 Mon Sep 17 00:00:00 2001
From: coalchan <coalchan@gmail.com>
Date: Mon, 3 Sep 2018 23:04:32 +0800
Subject: [PATCH 1/2] Add Chinese translation of mixin-class-composition

---
 _zh-cn/tour/mixin-class-composition.md | 74 +++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/_zh-cn/tour/mixin-class-composition.md b/_zh-cn/tour/mixin-class-composition.md
index 99e4119c92..63445b86d4 100644
--- a/_zh-cn/tour/mixin-class-composition.md
+++ b/_zh-cn/tour/mixin-class-composition.md
@@ -1,6 +1,6 @@
 ---
 layout: tour
-title: Class Composition with Mixins
+title: 通过混入来组合类
 
 discourse: false
 
@@ -13,3 +13,75 @@ language: zh-cn
 next-page: higher-order-functions
 previous-page: traits
 ---
+
+当某个特质被用于组合类时，被称为混入。
+
+```tut
+abstract class A {
+  val message: String
+}
+class B extends A {
+  val message = "I'm an instance of class B"
+}
+trait C extends A {
+  def loudMessage = message.toUpperCase()
+}
+class D extends B with C
+
+val d = new D
+println(d.message)  // I'm an instance of class B
+println(d.loudMessage)  // I'M AN INSTANCE OF CLASS B
+```
+
+类`D`有一个父类`B`和一个混入`C`。一个类只能有一个父类但是可以有多个混入（分别使用关键字`extend`和`with`）。混入和某个父类可能有相同的父类。
+
+现在，让我们看一个更有趣的例子，其中使用了抽象类：
+
+```tut
+abstract class AbsIterator {
+  type T
+  def hasNext: Boolean
+  def next(): T
+}
+```
+
+该类中有一个抽象的类型`T`和标准的迭代器方法。
+
+接下来，我们将实现一个具体的类（所有的抽象成员`T`、`hasNext`和`next`都会被实现）：
+
+```tut
+class StringIterator(s: String) extends AbsIterator {
+  type T = Char
+  private var i = 0
+  def hasNext = i < s.length
+  def next() = {
+    val ch = s charAt i
+    i += 1
+    ch
+  }
+}
+```
+
+`StringIterator`带有一个`String`类型参数的构造器，可用于对字符串进行迭代。（例如查看一个字符串是否包含某个字符）：
+
+现在我们创建一个特质，也继承于`AbsIterator`。
+
+```tut
+trait RichIterator extends AbsIterator {
+  def foreach(f: T => Unit): Unit = while (hasNext) f(next())
+}
+```
+
+该特质实现了`foreach`方法——只要还有元素可以迭代（`while (hasNext)`），就会一直对下个元素(`next()`) 调用传入的函数`f: T => Unit`。因为`RichIterator`是个特质，可以不必实现`AbsIterator`中的抽象成员。
+
+下面我们要把`StringIterator`和`RichIterator` 中的功能组合成一个类。
+
+```tut
+object StringIteratorTest extends App {
+  class RichStringIter extends StringIterator("Scala") with RichIterator
+  val richStringIter = new RichStringIter
+  richStringIter foreach println
+}
+```
+
+新的类`RichStringIter`有一个父类`StringIterator`和一个混入`RichIterator`。如果是单一继承，我们将不会达到这样的灵活性。
\ No newline at end of file

From 653fd279f274b237227d74a0365ed771f1bb0a36 Mon Sep 17 00:00:00 2001
From: coalchan <coalchan@gmail.com>
Date: Mon, 10 Sep 2018 09:34:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Add=20'=EF=BC=88mixin=EF=BC=89'=20in=20titl?=
 =?UTF-8?q?e=20of=20mixin-class-composition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _zh-cn/tour/mixin-class-composition.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_zh-cn/tour/mixin-class-composition.md b/_zh-cn/tour/mixin-class-composition.md
index 63445b86d4..0932b8622d 100644
--- a/_zh-cn/tour/mixin-class-composition.md
+++ b/_zh-cn/tour/mixin-class-composition.md
@@ -1,6 +1,6 @@
 ---
 layout: tour
-title: 通过混入来组合类
+title: 通过混入（mixin）来组合类
 
 discourse: false