From f726979af9a3dfaab2c65e1ad5b395e4c3885249 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 7 Apr 2016 17:44:13 +0800
Subject: [PATCH 1/2] fix(DatePicker): showTime locale problem

close #1356
---
 components/date-picker/RangePicker.jsx | 3 ++-
 components/date-picker/index.jsx       | 3 ++-
 components/date-picker/locale/en_US.js | 4 +++-
 components/date-picker/locale/zh_CN.js | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx
index 57d1525a6d..a74eb2de2f 100644
--- a/components/date-picker/RangePicker.jsx
+++ b/components/date-picker/RangePicker.jsx
@@ -73,7 +73,8 @@ export default React.createClass({
     if (showTime) {
       timePicker = (<TimePicker
         prefixCls="ant-time-picker"
-        placeholder={locale.lang.timePlaceholder}
+        placeholder={locale.timePickerLocale.placeholder}
+        locale={locale.timePickerLocale}
         transitionName="slide-up" />);
     }
 
diff --git a/components/date-picker/index.jsx b/components/date-picker/index.jsx
index 9c45da4898..94129aa347 100644
--- a/components/date-picker/index.jsx
+++ b/components/date-picker/index.jsx
@@ -60,7 +60,8 @@ function createPicker(TheCalendar, defaultFormat) {
 
       const timePicker = this.props.showTime ? (<TimePicker
         prefixCls="ant-time-picker"
-        placeholder={locale.lang.timePlaceholder}
+        placeholder={locale.timePickerLocale.placeholder}
+        locale={locale.timePickerLocale}
         transitionName="slide-up" />)
         : null;
 
diff --git a/components/date-picker/locale/en_US.js b/components/date-picker/locale/en_US.js
index aff512e58b..b4644aff65 100644
--- a/components/date-picker/locale/en_US.js
+++ b/components/date-picker/locale/en_US.js
@@ -1,14 +1,16 @@
 import objectAssign from 'object-assign';
 import GregorianCalendarLocale from 'gregorian-calendar/lib/locale/en_US';
 import CalendarLocale from 'rc-calendar/lib/locale/en_US';
+import TimePickerLocale from '../../time-picker/locale/en_US';
 
 // 统一合并为完整的 Locale
 let locale = objectAssign({}, GregorianCalendarLocale);
 locale.lang = objectAssign({
   placeholder: 'Select date',
-  timePlaceholder: 'Select time',
 }, CalendarLocale);
 
+locale.timePickerLocale = objectAssign({}, TimePickerLocale);
+
 // All settings at:
 // https://github.com/ant-design/ant-design/issues/424
 
diff --git a/components/date-picker/locale/zh_CN.js b/components/date-picker/locale/zh_CN.js
index b6a9177c70..e63eaf457c 100644
--- a/components/date-picker/locale/zh_CN.js
+++ b/components/date-picker/locale/zh_CN.js
@@ -1,14 +1,16 @@
 import objectAssign from 'object-assign';
 import GregorianCalendarLocale from 'gregorian-calendar/lib/locale/zh_CN';
 import CalendarLocale from 'rc-calendar/lib/locale/zh_CN';
+import TimePickerLocale from '../../time-picker/locale/zh_CN';
 
 // 统一合并为完整的 Locale
 let locale = objectAssign({}, GregorianCalendarLocale);
 locale.lang = objectAssign({
   placeholder: '请选择日期',
-  timePlaceholder: '请选择时间',
 }, CalendarLocale);
 
+locale.timePickerLocale = objectAssign({}, TimePickerLocale);
+
 // should add whitespace between char in Button
 locale.lang.ok = '确 定';
 

From 7ff80f3dfea34e832017c561fd2e0a8b14d006cd Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 7 Apr 2016 17:46:56 +0800
Subject: [PATCH 2/2] fix eslint

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 4ecd683faf..875c617b33 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "autoprefixer": "^6.3.3",
     "babel-cli": "^6.2.0",
     "babel-core": "^6.2.1",
+    "babel-eslint": "^6.0.2",
     "babel-jest": "^6.0.1",
     "babel-loader": "^6.2.0",
     "babel-plugin-add-module-exports": "^0.1.1",