From 61df1eb1dc2415b8e1fb5402444751383dfe0024 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Tue, 26 Jan 2016 10:24:15 +0800
Subject: [PATCH] fix: should pass formatter to rc-calendar #917

---
 components/date-picker/RangePicker.jsx | 1 +
 components/date-picker/demo/range.md   | 2 +-
 components/date-picker/index.jsx       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx
index c9c7c1b7c6..0d5bab5266 100644
--- a/components/date-picker/RangePicker.jsx
+++ b/components/date-picker/RangePicker.jsx
@@ -78,6 +78,7 @@ export default React.createClass({
 
     const calendar = (
       <RangeCalendar prefixCls="ant-calendar"
+        formatter={this.getFormatter()}
         className={calendarClassName}
         timePicker={timePicker}
         disabledDate={disabledDate}
diff --git a/components/date-picker/demo/range.md b/components/date-picker/demo/range.md
index c4c4d13de5..db9a4ac2ed 100644
--- a/components/date-picker/demo/range.md
+++ b/components/date-picker/demo/range.md
@@ -16,6 +16,6 @@ function onChange(value) {
 ReactDOM.render(<div>
   <RangePicker style={{width: 184}} onChange={onChange} />
   <br />
-  <RangePicker showTime format="yyyy-MM-dd HH:mm:ss" onChange={onChange} />
+  <RangePicker showTime format="yyyy/MM/dd HH:mm:ss" onChange={onChange} />
 </div>, mountNode);
 ````
diff --git a/components/date-picker/index.jsx b/components/date-picker/index.jsx
index 6cb6cdde2b..f44698aea1 100644
--- a/components/date-picker/index.jsx
+++ b/components/date-picker/index.jsx
@@ -69,6 +69,7 @@ function createPicker(TheCalendar, defaultFormat) {
 
       const calendar = (
         <TheCalendar
+          formatter={this.getFormatter()}
           disabledDate={this.props.disabledDate}
           locale={locale.lang}
           timePicker={timePicker}