1 files changed, 15 insertions, 0 deletions
diff --git a/js/vendor/momentjs/locale/zh-cn.js b/js/vendor/momentjs/locale/zh-cn.js
index b8a0bd2ea..da834165b 100644
--- a/js/vendor/momentjs/locale/zh-cn.js
+++ b/js/vendor/momentjs/locale/zh-cn.js
@@ -30,6 +30,21 @@
             lll : 'YYYY年MMMD日LT',
             llll : 'YYYY年MMMD日ddddLT'
         },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
         meridiem : function (hour, minute, isLower) {
             var hm = hour * 100 + minute;
             if (hm < 600) {