From e42729f16545e00fde7d664987ff25b64bec26ea Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 19 Nov 2015 19:15:52 +0800
Subject: [PATCH] fix placeholder

---
 components/datepicker/locale/en_US.js |  2 +-
 components/timepicker/index.jsx       |  5 +++--
 components/timepicker/locale.js       | 12 ------------
 components/timepicker/locale/en_US.js |  4 +++-
 components/timepicker/locale/zh_CN.js |  4 +++-
 5 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 components/timepicker/locale.js

diff --git a/components/datepicker/locale/en_US.js b/components/datepicker/locale/en_US.js
index 6576859159..cb67d925d1 100644
--- a/components/datepicker/locale/en_US.js
+++ b/components/datepicker/locale/en_US.js
@@ -5,7 +5,7 @@ import CalendarLocale from 'rc-calendar/lib/locale/en_US';
 // 统一合并为完整的 Locale
 let locale = objectAssign({}, GregorianCalendarLocale);
 locale.lang = objectAssign({
-  placeholder: 'Please select a date'
+  placeholder: 'Select a date'
 }, CalendarLocale);
 
 // All settings at:
diff --git a/components/timepicker/index.jsx b/components/timepicker/index.jsx
index cf8d429dc0..f1d346adee 100644
--- a/components/timepicker/index.jsx
+++ b/components/timepicker/index.jsx
@@ -8,7 +8,7 @@ const AntTimepicker = React.createClass({
   getDefaultProps() {
     return {
       format: 'HH:mm:ss',
-      placeholder: '请选择时间',
+      placeholder: '',
       prefixCls: 'ant-timepicker',
       onChange() {},
       locale: {},
@@ -64,16 +64,17 @@ const AntTimepicker = React.createClass({
     return locale;
   },
 
-
   render() {
     const { format } = this.props;
     const formatter = new DateTimeFormat(format);
+    const placeholder = this.props.placeholder || this.getLocale().lang.placeholder;
     return (
       <TimePicker
         {...this.props}
         inputClassName={`ant-input ${this.getSizeClass()}`}
         formatter={formatter}
         defaultValue={this.getDefaultValue(formatter)}
+        placeholder={placeholder}
         onChange={this.handleChange}
       />
     );
diff --git a/components/timepicker/locale.js b/components/timepicker/locale.js
deleted file mode 100644
index 372c1beebd..0000000000
--- a/components/timepicker/locale.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import objectAssign from 'object-assign';
-import GregorianCalendarLocale from 'gregorian-calendar/lib/locale/zh_CN';
-import CalendarLocale from 'rc-time-picker/lib/locale/zh_CN';
-
-// 统一合并为完整的 Locale
-let locale = objectAssign({}, GregorianCalendarLocale);
-locale.lang = objectAssign({}, CalendarLocale);
-
-// All settings at:
-// https://github.com/ant-design/ant-design/issues/424
-
-export default locale;
diff --git a/components/timepicker/locale/en_US.js b/components/timepicker/locale/en_US.js
index 33b2aebeb7..7abd8877d0 100644
--- a/components/timepicker/locale/en_US.js
+++ b/components/timepicker/locale/en_US.js
@@ -4,7 +4,9 @@ import TimepickerLocale from 'rc-time-picker/lib/locale/en_US';
 
 // 统一合并为完整的 Locale
 let locale = objectAssign({}, GregorianCalendarLocale);
-locale.lang = objectAssign({}, TimepickerLocale);
+locale.lang = objectAssign({
+  placeholder: 'Select a time'
+}, TimepickerLocale);
 
 // All settings at:
 // https://github.com/ant-design/ant-design/issues/424
diff --git a/components/timepicker/locale/zh_CN.js b/components/timepicker/locale/zh_CN.js
index 1705c5cd54..4560232f2a 100644
--- a/components/timepicker/locale/zh_CN.js
+++ b/components/timepicker/locale/zh_CN.js
@@ -4,7 +4,9 @@ import TimepickerLocale from 'rc-time-picker/lib/locale/zh_CN';
 
 // 统一合并为完整的 Locale
 let locale = objectAssign({}, GregorianCalendarLocale);
-locale.lang = objectAssign({}, TimepickerLocale);
+locale.lang = objectAssign({
+  placeholder: '请选择时间'
+}, TimepickerLocale);
 
 // All settings at:
 // https://github.com/ant-design/ant-design/issues/424