remove am/AM/pm/PM from meridiem

Changing to a function.
#222 #228

diff --git a/lang/ca.js b/lang/ca.js
index 42e2f1332bb54e0654987adaeb648a6b6545e4b9..e97110639b1d45c0518eaaf48e603c737c1b6450 100644 (file)
--- a/lang/ca.js
+++ b/lang/ca.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : function () {
                     return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';

diff --git a/lang/da.js b/lang/da.js
index c6a76b466c046458d6a7cb80fd1071e143631c12..1fef05168fa0c18947e246c7b883100620f3b2fa 100644 (file)
--- a/lang/da.js
+++ b/lang/da.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY h:mm A",
                 LLLL : "dddd D. MMMM, YYYY h:mm A"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : '[I dag kl.] LT',
                 nextDay : '[I morgen kl.] LT',

diff --git a/lang/de.js b/lang/de.js
index b1742c1815dc40de6a8c5988083b3e75508e2237..2461d9630e910ee1ff9957261a4b4b90d285a093 100644 (file)
--- a/lang/de.js
+++ b/lang/de.js
@@ -11,12 +11,6 @@
                 LLL : "D. MMMM YYYY LT",
                 LLLL : "dddd, D. MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: "[Heute um] LT",
                 sameElse: "L",

diff --git a/lang/en-gb.js b/lang/en-gb.js
index 2a2be53d54e28ebb7e4cb691ef33e3337894ca09..1554ba0e8f60c27fe312f321811430c6ba1c3842 100644 (file)
--- a/lang/en-gb.js
+++ b/lang/en-gb.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd, D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : '[Today at] LT',
                 nextDay : '[Tomorrow at] LT',

diff --git a/lang/es.js b/lang/es.js
index 6da12ad71f0ca47519f030c897cd66418c0fce98..0a5df707a91517fab5910672f8bc8f592a7cd572 100644 (file)
--- a/lang/es.js
+++ b/lang/es.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : function () {
                     return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';

diff --git a/lang/eu.js b/lang/eu.js
index ff3a8c4e364083bd02992033a10fcf11748d8169..ee52287a2a716ec8305b1c514ddd0a90afbecc1f 100644 (file)
--- a/lang/eu.js
+++ b/lang/eu.js
@@ -11,12 +11,6 @@
                 LLL : "YYYYko MMMMren D[a] LT",
                 LLLL : "dddd, YYYYko MMMMren D[a] LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : '[gaur] LT[etan]',
                 nextDay : '[bihar] LT[etan]',

diff --git a/lang/fi.js b/lang/fi.js
index fff2d16a9d429bcf1a1b5b3688a86cad2c87aaa2..3a4ef042a3695960578de700d7cb73beb973fc0c 100644 (file)
--- a/lang/fi.js
+++ b/lang/fi.js
@@ -55,12 +55,6 @@
                 LLL : "Do MMMMt\\a YYYY, klo LT",
                 LLLL : "dddd, Do MMMMt\\a YYYY, klo LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : '[tänään] [klo] LT',
                 nextDay : '[huomenna] [klo] LT',

diff --git a/lang/fr.js b/lang/fr.js
index c9b08ed2b83f01086cf56378d6c11fc00ffe627c..932dbc440b13553c79c9f1a91f75e6e47ce32463 100644 (file)
--- a/lang/fr.js
+++ b/lang/fr.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: "[Aujourd'hui à] LT",
                 nextDay: '[Demain à] LT',

diff --git a/lang/gl.js b/lang/gl.js
index ccde1d3828833df5f486a08c1f913abc70f2bf86..54ffd2e6282cf80a4aae6bdcbe318c4dab0c20b2 100644 (file)
--- a/lang/gl.js
+++ b/lang/gl.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : function () {
                     return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';

diff --git a/lang/it.js b/lang/it.js
index 9f4843069573246f1064ce9dd20fe971cad9de08..094a259c1072833050c28eb9f864adafeae5d3d1 100644 (file)
--- a/lang/it.js
+++ b/lang/it.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd, D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: '[Oggi alle] LT',
                 nextDay: '[Domani alle] LT',

diff --git a/lang/kr.js b/lang/kr.js
index 39b68421c64b93c347353974def13b15189bc5bd..6f4146c698b5edc05a2e299bf5aee2f2c2604c0e 100644 (file)
--- a/lang/kr.js
+++ b/lang/kr.js
@@ -11,12 +11,9 @@
                 LLL : "YYYY년 MMMM D일 LT",
                 LLLL : "YYYY년 MMMM D일 dddd LT"
             },
-                       meridiem : {
-                               AM : '오전',
-                               am : '오전',
-                               PM : '오후',
-                               pm : '오후'
-                       },
+            meridiem : function(hour, minute, isUpper) {
+                return hour < 12 ? '오전' : '오후';
+            },
             calendar : {
                 sameDay : '오늘 LT',
                 nextDay : '내일 LT',

diff --git a/lang/nb.js b/lang/nb.js
index 96940e645bbd95c822f5d2e1c3a8a3fb315cbea3..d5a7f1d6774a2ec2f705a58e393e6f52106b02eb 100644 (file)
--- a/lang/nb.js
+++ b/lang/nb.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: '[I dag klokken] LT',
                 nextDay: '[I morgen klokken] LT',

diff --git a/lang/nl.js b/lang/nl.js
index fda822745dfe9d3d175f0ab635053a36df7fffd3..a52b3d2c6edda6ff5108e1551d0d3083e9034950 100644 (file)
--- a/lang/nl.js
+++ b/lang/nl.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: '[Vandaag om] LT',
                 nextDay: '[Morgen om] LT',

diff --git a/lang/pl.js b/lang/pl.js
index 324c8b55c517d04219b650504554af564c3e834a..a81a3e2b29306e25606782408b991b55dd744f83 100644 (file)
--- a/lang/pl.js
+++ b/lang/pl.js
@@ -33,12 +33,6 @@
             LLL : "D MMMM YYYY LT",
             LLLL : "dddd, D MMMM YYYY LT"
         },
-        meridiem : {
-            AM : 'AM',
-            am : 'am',
-            PM : 'PM',
-            pm : 'pm'
-        },
         calendar : {
             sameDay: '[Dziś o] LT',
             nextDay: '[Jutro o] LT',

diff --git a/lang/pt.js b/lang/pt.js
index 42fc9f1dd56013587c504a7592a510530b7c2058..7410dc9531e58595c93137ee11425423f1a8ba7f 100644 (file)
--- a/lang/pt.js
+++ b/lang/pt.js
@@ -11,12 +11,6 @@
                 LLL : "D \\de MMMM \\de YYYY LT",
                 LLLL : "dddd, D \\de MMMM \\de YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: '[Hoje às] LT',
                 nextDay: '[Amanhã às] LT',

diff --git a/lang/sv.js b/lang/sv.js
index 6a005986298ffc59d00b4bfdac067c7b78abe025..bde95daa653b5cd5852a319b6089442160c51c0c 100644 (file)
--- a/lang/sv.js
+++ b/lang/sv.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay: '[Idag klockan] LT',
                 nextDay: '[Imorgon klockan] LT',

diff --git a/lang/tr.js b/lang/tr.js
index 4295b667017347ebbd494d32bac7a84ca8e46623..b20765bd17b13b2907ac7fedb7c4f76fdfc3c263 100644 (file)
--- a/lang/tr.js
+++ b/lang/tr.js
@@ -11,12 +11,6 @@
                 LLL : "D MMMM YYYY LT",
                 LLLL : "dddd, D MMMM YYYY LT"
             },
-            meridiem : {
-                AM : 'AM',
-                am : 'am',
-                PM : 'PM',
-                pm : 'pm'
-            },
             calendar : {
                 sameDay : '[bugün saat] LT',
                 nextDay : '[yarın saat] LT',

diff --git a/lang/zh-cn.js b/lang/zh-cn.js
index 2a33484d638f911b4c47d081c5d3f91c69b0a862..fb76e09a8c45b2077cc19e9b925e9f6750b2ba74 100644 (file)
--- a/lang/zh-cn.js
+++ b/lang/zh-cn.js
@@ -11,11 +11,18 @@
                 LLL : "YYYY年MMMMD日LT",
                 LLLL : "YYYY年MMMMD日ddddLT"
             },
-            meridiem : {
-                AM : '上午',
-                am : '上午',
-                PM : '下午',
-                pm : '下午'
+            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',

diff --git a/lang/zh-tw.js b/lang/zh-tw.js
index b452a16543b2231f85ea03a6a1be817cce2e3505..45d4501fec29204e1397079dce806349eaa685e6 100644 (file)
--- a/lang/zh-tw.js
+++ b/lang/zh-tw.js
@@ -11,11 +11,18 @@
                 LLL : "YYYY年MMMMD日LT",
                 LLLL : "YYYY年MMMMD日ddddLT"
             },
-            meridiem : {
-                AM : '上午',
-                am : '上午',
-                PM : '下午',
-                pm : '下午'
+            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',

diff --git a/moment.js b/moment.js
index 693f5bc7bffea7721c51520797e808e8c1d920cf..3f0d671c9738544b9bd19c6d965c94a3049de4e6 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -165,9 +165,9 @@
                 return currentYear;
             // AM / PM
             case 'a' :
-                return currentHours > 11 ? meridiem.pm : meridiem.am;
+                return meridiem ? meridiem(currentHours, currentMinutes, false) : (currentHours > 11 ? 'pm' : 'am');
             case 'A' :
-                return currentHours > 11 ? meridiem.PM : meridiem.AM;
+                return meridiem ? meridiem(currentHours, currentMinutes, true) : (currentHours > 11 ? 'PM' : 'AM');
             // 24 HOUR
             case 'H' :
                 return currentHours;
@@ -501,7 +501,7 @@
         if (languages[key]) {
             for (i = 0; i < paramsToParse.length; i++) {
                 param = paramsToParse[i];
-                moment[param] = languages[key][param] || moment[param];
+                moment[param] = languages[key][param] || languages.en[param];
             }
         } else {
             if (hasModule) {
@@ -524,12 +524,7 @@
             LLL : "MMMM D YYYY LT",
             LLLL : "dddd, MMMM D YYYY LT"
         },
-        meridiem : {
-            AM : 'AM',
-            am : 'am',
-            PM : 'PM',
-            pm : 'pm'
-        },
+        meridiem : false,
         calendar : {
             sameDay : '[Today at] LT',
             nextDay : '[Tomorrow at] LT',

diff --git a/test/lang/zh-cn.js b/test/lang/zh-cn.js
index c2dcf10dff4881c91c6c072600746fcd87ea0bfd..311163f7bb6f958e50e792beb6c34467b00e4b5d 100644 (file)
--- a/test/lang/zh-cn.js
+++ b/test/lang/zh-cn.js
@@ -147,12 +147,12 @@ exports["lang:zh-cn"] = {
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
-        test.equal(moment(a).calendar(),                     "今天上午2点00",     "today at the same time");
-        test.equal(moment(a).add({ m: 25 }).calendar(),      "今天上午2点25",     "Now plus 25 min");
-        test.equal(moment(a).add({ h: 1 }).calendar(),       "今天上午3点00",     "Now plus 1 hour");
-        test.equal(moment(a).add({ d: 1 }).calendar(),       "明天上午2点00",     "tomorrow at the same time");
-        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "今天上午1点00",     "Now minus 1 hour");
-        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "昨天上午2点00",     "yesterday at the same time");
+        test.equal(moment(a).calendar(),                     "今天早上2点00",     "today at the same time");
+        test.equal(moment(a).add({ m: 25 }).calendar(),      "今天早上2点25",     "Now plus 25 min");
+        test.equal(moment(a).add({ h: 1 }).calendar(),       "今天早上3点00",     "Now plus 1 hour");
+        test.equal(moment(a).add({ d: 1 }).calendar(),       "明天早上2点00",     "tomorrow at the same time");
+        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "今天早上1点00",     "Now minus 1 hour");
+        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "昨天早上2点00",     "yesterday at the same time");
         test.done();
     },
 
@@ -203,6 +203,25 @@ exports["lang:zh-cn"] = {
 
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+    "meridiem" : function(test) {
+        test.expect(10);
+        moment.lang('zh-cn');
+
+        test.equal(moment([2011, 2, 23,  0, 0]).format('a'), "早上", "morning");
+        test.equal(moment([2011, 2, 23,  9, 0]).format('a'), "上午", "before noon");
+        test.equal(moment([2011, 2, 23, 12, 0]).format('a'), "中午", "noon");
+        test.equal(moment([2011, 2, 23, 13, 0]).format('a'), "下午", "after noon");
+        test.equal(moment([2011, 2, 23, 18, 0]).format('a'), "晚上", "night");
+
+        test.equal(moment([2011, 2, 23,  0, 0]).format('A'), "早上", "morning");
+        test.equal(moment([2011, 2, 23,  9, 0]).format('A'), "上午", "before noon");
+        test.equal(moment([2011, 2, 23, 12, 0]).format('A'), "中午", "noon");
+        test.equal(moment([2011, 2, 23, 13, 0]).format('A'), "下午", "afternoon");
+        test.equal(moment([2011, 2, 23, 18, 0]).format('A'), "晚上", "night");
+
+        test.done();
     }
 };

diff --git a/test/lang/zh-tw.js b/test/lang/zh-tw.js
index bb519d098001385311b6328467891245be81cfcf..c4e550d7eaa9c79c720cd35813c03d0b4d3d7cd7 100644 (file)
--- a/test/lang/zh-tw.js
+++ b/test/lang/zh-tw.js
@@ -147,12 +147,12 @@ exports["lang:zh-tw"] = {
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
-        test.equal(moment(a).calendar(),                     "今天上午2點00",     "today at the same time");
-        test.equal(moment(a).add({ m: 25 }).calendar(),      "今天上午2點25",     "Now plus 25 min");
-        test.equal(moment(a).add({ h: 1 }).calendar(),       "今天上午3點00",     "Now plus 1 hour");
-        test.equal(moment(a).add({ d: 1 }).calendar(),       "明天上午2點00",     "tomorrow at the same time");
-        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "今天上午1點00",     "Now minus 1 hour");
-        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "昨天上午2點00",     "yesterday at the same time");
+        test.equal(moment(a).calendar(),                     "今天早上2點00",     "today at the same time");
+        test.equal(moment(a).add({ m: 25 }).calendar(),      "今天早上2點25",     "Now plus 25 min");
+        test.equal(moment(a).add({ h: 1 }).calendar(),       "今天早上3點00",     "Now plus 1 hour");
+        test.equal(moment(a).add({ d: 1 }).calendar(),       "明天早上2點00",     "tomorrow at the same time");
+        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "今天早上1點00",     "Now minus 1 hour");
+        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "昨天早上2點00",     "yesterday at the same time");
         test.done();
     },
 
@@ -203,6 +203,25 @@ exports["lang:zh-tw"] = {
 
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+    "meridiem" : function(test) {
+        test.expect(10);
+        moment.lang('zh-cn');
+
+        test.equal(moment([2011, 2, 23,  0, 0]).format('a'), "早上", "morning");
+        test.equal(moment([2011, 2, 23,  9, 0]).format('a'), "上午", "before noon");
+        test.equal(moment([2011, 2, 23, 12, 0]).format('a'), "中午", "noon");
+        test.equal(moment([2011, 2, 23, 13, 0]).format('a'), "下午", "after noon");
+        test.equal(moment([2011, 2, 23, 18, 0]).format('a'), "晚上", "night");
+
+        test.equal(moment([2011, 2, 23,  0, 0]).format('A'), "早上", "morning");
+        test.equal(moment([2011, 2, 23,  9, 0]).format('A'), "上午", "before noon");
+        test.equal(moment([2011, 2, 23, 12, 0]).format('A'), "中午", "noon");
+        test.equal(moment([2011, 2, 23, 13, 0]).format('A'), "下午", "afternoon");
+        test.equal(moment([2011, 2, 23, 18, 0]).format('A'), "晚上", "night");
+
+        test.done();
     }
 };