From 162bcf3acaa15ca5b1a5578615b809b496301760 Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Mon, 16 Nov 2015 20:10:29 +0800
Subject: [PATCH] upgrade calendar

---
 components/calendar/Constants.js |  4 +---
 components/calendar/index.jsx    | 13 +++++++------
 package.json                     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/components/calendar/Constants.js b/components/calendar/Constants.js
index fc56dc22db..dbd68b60a5 100644
--- a/components/calendar/Constants.js
+++ b/components/calendar/Constants.js
@@ -1,3 +1 @@
-export default {
-  PREFIX_CLS: 'ant-fullcalendar',
-};
+export const PREFIX_CLS = 'ant-fullcalendar';
diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx
index f083dc4de8..c77e024743 100644
--- a/components/calendar/index.jsx
+++ b/components/calendar/index.jsx
@@ -1,6 +1,6 @@
 import React, {PropTypes, Component} from 'react';
 import GregorianCalendar from 'gregorian-calendar';
-import CalendarLocale from 'rc-calendar/lib/locale/zh_CN';
+import zhCn from '../datepicker/locale/zh_CN';
 import FullCalendar from 'rc-calendar/lib/FullCalendar';
 import {PREFIX_CLS} from './Constants';
 import Header from './Header';
@@ -14,15 +14,15 @@ function zerofixed (v) {
 
 class Calendar extends Component {
   constructor(props) {
-    super();
+    super(props);
     this.state = {
       value: this.parseDateFromValue(props.value || new Date()),
       mode: props.mode,
     };
   }
   parseDateFromValue(value) {
-    const date = new GregorianCalendar();
-    date.setTime(value);
+    const date = new GregorianCalendar(this.props.locale);
+    date.setTime(+value);
     return date;
   }
   componentWillReceiveProps(nextProps) {
@@ -93,12 +93,13 @@ class Calendar extends Component {
           fullscreen={fullscreen}
           type={type}
           value={value}
-          locale={locale}
+          locale={locale.lang}
           prefixCls={prefixCls}
           onTypeChange={this.setType.bind(this)}
           onValueChange={this.setValue.bind(this)}/>
         <FullCalendar
           {...props}
+          locale={locale.lang}
           type={type}
           prefixCls={prefixCls}
           showHeader={false}
@@ -126,7 +127,7 @@ Calendar.propTypes = {
 Calendar.defaultProps = {
   monthCellRender: noop,
   dateCellRender: noop,
-  locale: CalendarLocale,
+  locale: zhCn,
   fullscreen: true,
   prefixCls: PREFIX_CLS,
   onPanelChange: noop,
diff --git a/package.json b/package.json
index 6489d77b5a..fdc868cf5c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "gregorian-calendar-format": "~4.0.4",
     "object-assign": "~4.0.1",
     "rc-animate": "~2.0.2",
-    "rc-calendar": "4.0.0-alpha19",
+    "rc-calendar": "4.0.0-alpha20",
     "rc-checkbox": "~1.1.1",
     "rc-collapse": "~1.4.3",
     "rc-dialog": "~5.2.2",