update a lot of stuff, WIP

1 files changed, 103 insertions, 68 deletions

diff --git a/js/vendor/momentjs/lang/zh-cn.js b/js/vendor/momentjs/lang/zh-cn.js
index e755416df..50a3ed93f 100644
--- a/js/vendor/momentjs/lang/zh-cn.js
+++ b/js/vendor/momentjs/lang/zh-cn.js
@@ -1,73 +1,108 @@
 // moment.js language configuration
 // language : chinese
 // author : suupic : https://github.com/suupic
+// author : Zeno Zeng : https://github.com/zenozeng
 
-require('../moment').lang('zh-cn', {
-    months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
-    monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
-    weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
-    weekdaysShort : "周日_周一_周二_周三_周四_周五_周六".split("_"),
-    weekdaysMin : "日_一_二_三_四_五_六".split("_"),
-    longDateFormat : {
-        LT : "Ah点mm",
-        L : "YYYY年MMMD日",
-        LL : "YYYY年MMMD日",
-        LLL : "YYYY年MMMD日LT",
-        LLLL : "YYYY年MMMD日ddddLT",
-        l : "YYYY年MMMD日",
-        ll : "YYYY年MMMD日",
-        lll : "YYYY年MMMD日LT",
-        llll : "YYYY年MMMD日ddddLT"
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 9) {
-            return "早上";
-        } else if (hour < 11 && minute < 30) {
-            return "上午";
-        } else if (hour < 13 && minute < 30) {
-            return "中午";
-        } else if (hour < 18) {
-            return "下午";
-        } else {
-            return "晚上";
-        }
-    },
-    calendar : {
-        sameDay : '[今天]LT',
-        nextDay : '[明天]LT',
-        nextWeek : '[下]ddddLT',
-        lastDay : '[昨天]LT',
-        lastWeek : '[上]ddddLT',
-        sameElse : 'L'
-    },
-    ordinal : function (number, period) {
-        switch (period) {
-        case "d" :
-        case "D" :
-        case "DDD" :
-            return number + "日";
-        case "M" :
-            return number + "月";
-        case "w" :
-        case "W" :
-            return number + "周";
-        default :
-            return number;
-        }
-    },
-    relativeTime : {
-        future : "%s内",
-        past : "%s前",
-        s : "几秒",
-        m : "1分钟",
-        mm : "%d分钟",
-        h : "1小时",
-        hh : "%d小时",
-        d : "1天",
-        dd : "%d天",
-        M : "1个月",
-        MM : "%d个月",
-        y : "1年",
-        yy : "%d年"
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(['moment'], factory); // AMD
+    } else if (typeof exports === 'object') {
+        module.exports = factory(require('../moment')); // Node
+    } else {
+        factory(window.moment); // Browser global
     }
-});
+}(function (moment) {
+    return moment.lang('zh-cn', {
+        months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+        monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+        weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
+        weekdaysShort : "周日_周一_周二_周三_周四_周五_周六".split("_"),
+        weekdaysMin : "日_一_二_三_四_五_六".split("_"),
+        longDateFormat : {
+            LT : "Ah点mm",
+            L : "YYYY-MM-DD",
+            LL : "YYYY年MMMD日",
+            LLL : "YYYY年MMMD日LT",
+            LLLL : "YYYY年MMMD日ddddLT",
+            l : "YYYY-MM-DD",
+            ll : "YYYY年MMMD日",
+            lll : "YYYY年MMMD日LT",
+            llll : "YYYY年MMMD日ddddLT"
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return "凌晨";
+            } else if (hm < 900) {
+                return "早上";
+            } else if (hm < 1130) {
+                return "上午";
+            } else if (hm < 1230) {
+                return "中午";
+            } else if (hm < 1800) {
+                return "下午";
+            } else {
+                return "晚上";
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? "[今天]Ah[点整]" : "[今天]LT";
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? "[明天]Ah[点整]" : "[明天]LT";
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? "[昨天]Ah[点整]" : "[昨天]LT";
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + "dddAh点整" : prefix + "dddAh点mm";
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + "dddAh点整" : prefix + "dddAh点mm";
+            },
+            sameElse : 'LL'
+        },
+        ordinal : function (number, period) {
+            switch (period) {
+            case "d":
+            case "D":
+            case "DDD":
+                return number + "日";
+            case "M":
+                return number + "月";
+            case "w":
+            case "W":
+                return number + "周";
+            default:
+                return number;
+            }
+        },
+        relativeTime : {
+            future : "%s内",
+            past : "%s前",
+            s : "几秒",
+            m : "1分钟",
+            mm : "%d分钟",
+            h : "1小时",
+            hh : "%d小时",
+            d : "1天",
+            dd : "%d天",
+            M : "1个月",
+            MM : "%d个月",
+            y : "1年",
+            yy : "%d年"
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+}));