From 74992ba592a30a54b7fef5560e623126c6c1cfe1 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 9 Aug 2017 12:18:28 +0800
Subject: [PATCH] Changelog: update for 1.4.2

---
 CHANGELOG.en-US.md          | 16 ++++++++++++++++
 CHANGELOG.zh-CN.md          | 15 +++++++++++++++
 examples/docs/en-US/i18n.md |  1 +
 examples/docs/zh-CN/i18n.md |  1 +
 4 files changed, 33 insertions(+)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 34de28448..53c042472 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,21 @@
 ## Changelog
 
+### 1.4.2
+
+*2017-08-09*
+
+- Fixed Select marking option of `value` equal to `0` as selected when the initial value is null and bound to an object-typed value, #6143
+- Fixed Step style issue when `status` is `error`, #6155 @wacky6
+- Fixed Cascader selecting parent item when moving mouse quickly after clicking a leaf item, #6199
+- Fixed Menu not hiding submenus when collapsed, #6200
+- Fixed status of the inner native input of Switch not syncing with the component, #6205 @wacky6
+- Fixed wrong button positioning of Slider after window is resized, #6263
+- Fixed Autocomplete not hiding dropdown menu on blur, #6256
+- Fixed hitting enter on jumper of Pagination not trigger page change event in IE, #6306 @qingdengyue
+- Fixed InputNumber style issue when its `size` is `large` or `small`, #6310 @JeremyWuuuuu
+- Fixed i18n failure for some texts in DatePicker, #6328
+- Fixed Slider value changing to minimum when its button is clicked, #6359
+
 ### 1.4.1
 
 *2017-07-28*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 4f8ec3dcf..7432f586d 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,20 @@
 ## 更新日志
 
+### 1.4.2
+*2017-08-09*
+
+- 修复绑定值为对象类型时，初始值为 null 的 Select 会选中 value 为 `0` 的问题，#6143
+- 修复 `status` 为 `error` 的 Step 样式问题，#6155 @wacky6
+- 修复当 Cascader 的 `expand-trigger` 为 `hover` 时，点击选择条目后快速移动会再次选到父级元素的问题，#6199
+- 修复 Menu 在 collaspse 时不能收起子级菜单的问题，#6200
+- 修复 Switch 内部的原生 input 状态与组件不同步的问题，#6205 @wacky6
+- 修复 Slider 在 resize 窗口后滑块位置不准的问题，#6263
+- 修复 Autocomplete 在 blur 时不会收起下拉框的问题，#6256
+- 修复 Pagination 的 jumper 在 IE 下敲击回车无法触发翻页的问题，#6306 @qingdengyue
+- 修复 InputNumber 当 `size` 为 `large` 和 `small` 时的样式问题，#6310 @JeremyWuuuuu
+- 修复 DatePicker 的部分格式化文字 i18n 不生效的问题，#6328
+- 修复点击 Slider 的滑块会使其移动至起点的问题，#6359
+
 ### 1.4.1
 *2017-07-28*
 
diff --git a/examples/docs/en-US/i18n.md b/examples/docs/en-US/i18n.md
index 821e075ca..7c61b87fe 100644
--- a/examples/docs/en-US/i18n.md
+++ b/examples/docs/en-US/i18n.md
@@ -205,6 +205,7 @@ Currently Element ships with the following languages:
   <li>Afrikaans (af-ZA)</li>
   <li>Estonian (ee)</li>
   <li>Slovenian (sl)</li>
+  <li>Arabic (ar)</li>
 </ul>
 
 If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/ElemeFE/element/tree/master/src/locale/lang) and create a pull request.
diff --git a/examples/docs/zh-CN/i18n.md b/examples/docs/zh-CN/i18n.md
index 871fd656a..3d27379aa 100644
--- a/examples/docs/zh-CN/i18n.md
+++ b/examples/docs/zh-CN/i18n.md
@@ -217,6 +217,7 @@ ElementLocale.i18n((key, value) => i18n.t(key, value))
   <li>南非荷兰语（af-ZA）</li>
   <li>爱沙尼亚语（ee）</li>
   <li>斯洛文尼亚语（sl）</li>
+  <li>阿拉伯语（ar）</li>
 </ul>
 
 如果你需要使用其他的语言，欢迎贡献 PR：只需在 [这里](https://github.com/ElemeFE/element/tree/master/src/locale/lang) 添加一个语言配置文件即可。