Merge branch master into develop-1.0.0

components/date-picker/locale/en_US.js

@@ -1,15 +1,17 @@
 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 = { ...GregorianCalendarLocale };
 locale.lang = {
   placeholder: 'Select date',
-  timePlaceholder: 'Select time',
   rangePlaceholder: ['Start date', 'End date'],
   ...CalendarLocale,
 };
 
+locale.timePickerLocale = { ...TimePickerLocale };
+
 // All settings at:
 // https://github.com/ant-design/ant-design/issues/424
 

components/date-picker/locale/zh_CN.js

@@ -1,15 +1,17 @@
 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 = { ...GregorianCalendarLocale };
 locale.lang = {
   placeholder: '请选择日期',
-  timePlaceholder: '请选择时间',
   rangePlaceholder: ['开始日期', '结束日期'],
   ...CalendarLocale,
 };
 
+locale.timePickerLocale = { ...TimePickerLocale };
+
 // should add whitespace between char in Button
 locale.lang.ok = '确 定';
 

components/date-picker/wrapPicker.jsx

@@ -97,7 +97,8 @@ export default function wrapPicker(Picker, defaultFormat) {
       const timePicker = props.showTime ? (
         <TimePicker
           prefixCls="ant-time-picker"
-          placeholder={locale.lang.timePlaceholder}
+          placeholder={locale.timePickerLocale.placeholder}
+          locale={locale.timePickerLocale}
           transitionName="slide-up" />
       ) : null;
 

package.json

@@ -76,7 +76,7 @@
     "atool-build": "^0.6.5",
     "babel-cli": "^6.2.0",
     "babel-core": "^6.2.1",
-    "babel-eslint": "^6.0.0-beta.6",
+    "babel-eslint": "^6.0.2",
     "babel-jest": "^6.0.1",
     "babel-loader": "^6.2.0",
     "babel-plugin-add-module-exports": "^0.1.1",
@@ -178,4 +178,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}