Merge pull request moment#229 from baryon/master

I fixed the merge conflicts and updated the jp language file to use the new meridiem function.
kevinelong · Apr 2, 2012 · 00722f8 · 00722f8
2 parents 8745eb7 + d75cdac
commit 00722f8
Show file tree

Hide file tree

Showing 13 changed files with 299 additions and 33 deletions.
diff --git a/lang/jp.js b/lang/jp.js
@@ -0,0 +1,57 @@
+(function () {
+    var lang = {
+            months : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+            monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+            weekdays : "日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),
+            weekdaysShort : "日_月_火_水_木_金_土".split("_"),
+            longDateFormat : {
+                LT : "Ah:mm",
+                L : "YYYY/MM/DD",
+                LL : "YYYY年M月D日",
+                LLL : "YYYY年M月D日 LT",
+                LLLL : "YYYY年M月D日 dddd LT"
+            },
+            meridiem : function (hour, minute, isLower) {
+                if (hour < 12) {
+                    return "午前";
+                } else {
+                    return "午後";
+                }
+            },
+            calendar : {
+                sameDay : '[今日] LT',
+                nextDay : '[明日] LT',
+                nextWeek : '[来週]dddd LT', 
+                lastDay : '[昨日] LT',
+                lastWeek : '[前週]dddd LT', 
+                sameElse : 'L'
+            },
+            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年"
+            },
+            ordinal : function (number) {
+                    return '';
+            }
+        };
+
+    // Node
+    if (typeof module !== 'undefined') {
+        module.exports = lang;
+    }
+    // Browser
+    if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
+        this.moment.lang('jp', lang);
+    }
+}());
diff --git a/lang/zh-cn.js b/lang/zh-cn.js
@@ -1,15 +1,15 @@
 (function () {
     var lang = {
             months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
-            monthsShort : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+            monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
             weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
             weekdaysShort : "周日_周一_周二_周三_周四_周五_周六".split("_"),
             longDateFormat : {
                 LT : "Ah点mm",
-                L : "YYYY年MMMMD日",
-                LL : "YYYY年MMMMD日",
-                LLL : "YYYY年MMMMD日LT",
-                LLLL : "YYYY年MMMMD日ddddLT"
+                L : "YYYY年MMMD日",
+                LL : "YYYY年MMMD日",
+                LLL : "YYYY年MMMD日LT",
+                LLLL : "YYYY年MMMD日ddddLT"
             },
             meridiem : function (hour, minute, isLower) {
                 if (hour < 9) {

diff --git a/lang/zh-tw.js b/lang/zh-tw.js
@@ -1,15 +1,15 @@
 (function () {
     var lang = {
             months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
-            monthsShort : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+            monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
             weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
             weekdaysShort : "週日_週一_週二_週三_週四_週五_週六".split("_"),
             longDateFormat : {
                 LT : "Ah點mm",
-                L : "YYYY年MMMMD日",
-                LL : "YYYY年MMMMD日",
-                LLL : "YYYY年MMMMD日LT",
-                LLLL : "YYYY年MMMMD日ddddLT"
+                L : "YYYY年MMMD日",
+                LL : "YYYY年MMMD日",
+                LLL : "YYYY年MMMD日LT",
+                LLLL : "YYYY年MMMD日ddddLT"
             },
             meridiem : function (hour, minute, isLower) {
                 if (hour < 9) {

diff --git a/min/lang-all.min.js b/min/lang-all.min.js
diff --git a/min/lang/jp.js b/min/lang/jp.js
diff --git a/min/lang/zh-cn.js b/min/lang/zh-cn.js
diff --git a/min/lang/zh-tw.js b/min/lang/zh-tw.js
diff --git a/min/moment.min.js b/min/moment.min.js
diff --git a/min/moment.min.pretty.js b/min/moment.min.pretty.js
@@ -195,7 +195,7 @@
             return a != null ? (this._d["set" + c + b](a), this) : this._d["get" + c + b]();
         };
     }
-    var c, d = Math.round, e = {}, f = typeof module != "undefined", g = "months|monthsShort|monthsParse|weekdays|weekdaysShort|longDateFormat|calendar|relativeTime|ordinal|meridiem".split("|"), h, i = /^\/?Date\((\-?\d+)/i, j = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|ZZ?|LT|LL?L?L?)/g, k = /[^A-Z]/g, l = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g, m = /(\\)?(MM?M?M?|dd?d?d|DD?D?D?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|ZZ?|T)/g, n = /(\\)?([0-9]+|([a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+|([\+\-]\d\d:?\d\d))/gi, o = /\d{4}.\d\d.\d\d(T(\d\d(.\d\d(.\d\d)?)?)?([\+\-]\d\d:?\d\d)?)?/, p = "YYYY-MM-DDTHH:mm:ssZ", q = [ [ "HH:mm:ss", /T\d\d:\d\d:\d\d/ ], [ "HH:mm", /T\d\d:\d\d/ ], [ "HH", /T\d\d/ ] ], r = /([\+\-]|\d\d)/gi, s = "1.5.0", t = "Month|Date|Hours|Minutes|Seconds|Milliseconds".split("|");
+    var c, d = Math.round, e = {}, f = typeof module != "undefined", g = "months|monthsShort|monthsParse|weekdays|weekdaysShort|longDateFormat|calendar|relativeTime|ordinal|meridiem".split("|"), h, i = /^\/?Date\((\-?\d+)/i, j = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|ZZ?|LT|LL?L?L?)/g, k = /[^A-Z]/g, l = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g, m = /(\\)?(MM?M?M?|dd?d?d|DD?D?D?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|ZZ?|T)/g, n = /(\\)?([0-9]+|([a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+|([\+\-]\d\d:?\d\d))/gi, o = /^\s*\d{4}-\d\d-\d\d(T(\d\d(:\d\d(:\d\d)?)?)?([\+\-]\d\d:?\d\d)?)?/, p = "YYYY-MM-DDTHH:mm:ssZ", q = [ [ "HH:mm:ss", /T\d\d:\d\d:\d\d/ ], [ "HH:mm", /T\d\d:\d\d/ ], [ "HH", /T\d\d/ ] ], r = /([\+\-]|\d\d)/gi, s = "1.5.0", t = "Month|Date|Hours|Minutes|Seconds|Milliseconds".split("|");
     c = function(c, d) {
         if (c === null || c === "") return null;
         var e, f;
@@ -337,7 +337,7 @@
             return this.zone() < c([ this.year() ]).zone() || this.zone() < c([ this.year(), 5 ]).zone();
         },
         day: function(a) {
-            var b = this._d.getDay();
+            var b = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
             return a == null ? b : this.add({
                 d: a - b
             });

diff --git a/moment.js b/moment.js
@@ -17,7 +17,7 @@
         nonuppercaseLetters = /[^A-Z]/g,
         timezoneRegex = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g,
         tokenCharacters = /(\\)?(MM?M?M?|dd?d?d|DD?D?D?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|ZZ?|T)/g,
-        inputCharacters = /(\\)?([0-9]{1,2}\uC6D4|[0-9]+|([a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+|([\+\-]\d\d:?\d\d))/gi,
+        inputCharacters = /(\\)?([0-9]{1,2}[\u6708\uC6D4]|[0-9]+|([a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+|([\+\-]\d\d:?\d\d))/gi,
         isoRegex = /^\s*\d{4}-\d\d-\d\d(T(\d\d(:\d\d(:\d\d)?)?)?([\+\-]\d\d:?\d\d)?)?/,
         isoFormat = 'YYYY-MM-DDTHH:mm:ssZ',
         isoTimes = [