introduces a local time format #17

diff --git a/lang/test/en.js b/lang/test/en.js
index 2fbb8f956b772c6eb9a55adb9f7be36db2149248..a31938f2dd2202d2fe6e5b2a7f1073f31434093c 100644 (file)
--- a/lang/test/en.js
+++ b/lang/test/en.js
@@ -171,23 +171,23 @@ test("relativeDate", 14, function() {
     };
 
     moment.lang('en');
-    equal(getTodayAtTwo().relativeDate(), "Today at 02:00", "today at the same time");
-    equal(getTodayAtTwo().add({ m: 25 }).relativeDate(), "Today at 02:25", "Now plus 25 min");
-    equal(getTodayAtTwo().add({ h: 1 }).relativeDate(), "Today at 03:00", "Now plus 1 hour");
-    equal(getTodayAtTwo().add({ d: 1 }).relativeDate(), "Tomorrow at 02:00", "tomorrow at the same time");
-    equal(getTodayAtTwo().subtract({ h: 1 }).relativeDate(), "Today at 01:00", "Now minus 1 hour");
-    equal(getTodayAtTwo().subtract({ d: 1 }).relativeDate(), "Yesterday at 02:00", "yesterday at the same time");
+    equal(getTodayAtTwo().relativeDate(), "Today at 2:00 AM", "today at the same time");
+    equal(getTodayAtTwo().add({ m: 25 }).relativeDate(), "Today at 2:25 AM", "Now plus 25 min");
+    equal(getTodayAtTwo().add({ h: 1 }).relativeDate(), "Today at 3:00 AM", "Now plus 1 hour");
+    equal(getTodayAtTwo().add({ d: 1 }).relativeDate(), "Tomorrow at 2:00 AM", "tomorrow at the same time");
+    equal(getTodayAtTwo().subtract({ h: 1 }).relativeDate(), "Today at 1:00 AM", "Now minus 1 hour");
+    equal(getTodayAtTwo().subtract({ d: 1 }).relativeDate(), "Yesterday at 2:00 AM", "yesterday at the same time");
 
     var nextTomorrow = getTodayAtTwo().add({ d: 2 });
-    equal(nextTomorrow.relativeDate(), prefixDay(nextTomorrow, " at 02:00"), "now + 2days at the same time");
+    equal(nextTomorrow.relativeDate(), prefixDay(nextTomorrow, " at 2:00 AM"), "now + 2days at the same time");
 
     var previousYesterday = getTodayAtTwo().subtract({ d: 2 });
-    equal(previousYesterday.relativeDate(), prefixDay(previousYesterday, " at 02:00", "last"), "now - 2days at the same time");
+    equal(previousYesterday.relativeDate(), prefixDay(previousYesterday, " at 2:00 AM", "last"), "now - 2days at the same time");
 
     // Next / Last week
     equal(
         getTodayAtTwo().add({ w: 1 }).relativeDate(),
-        prefixDay(getTodayAtTwo().add({ w: 1 }), " at 02:00"),
+        prefixDay(getTodayAtTwo().add({ w: 1 }), " at 2:00 AM"),
         "next week at the same time"
     );
     equal(
@@ -197,7 +197,7 @@ test("relativeDate", 14, function() {
     );
     equal(
         getTodayAtTwo().subtract({ w: 1 }).relativeDate(),
-        prefixDay(getTodayAtTwo().add({ w: 1 }), " at 02:00", "last"),
+        prefixDay(getTodayAtTwo().add({ w: 1 }), " at 2:00 AM", "last"),
         "last week at the same time"
     );
     equal(

diff --git a/moment.js b/moment.js
index 467af6fa3633372ed16d0ceaa1494ee6ab1f7462..4437d79c98fae1b4178aeebfcc609e7cca82ffbb 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -77,7 +77,7 @@
             currentMinutes = date.getMinutes(),
             currentSeconds = date.getSeconds(),
             currentZone = date.getTimezoneOffset(),
-            charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|ZZ?|LL?L?L?)/g,
+            charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|ZZ?|LL?L?L?|XXXX)/g,
             nonuppercaseLetters = /[^A-Z]/g,
             timezoneRegex = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g,
             ordinal = moment.ordinal,
@@ -183,6 +183,7 @@
             case 'LL' :
             case 'LLL' :
             case 'LLLL' :
+            case 'XXXX':
                 return formatDate(date, moment.longDateFormat[input]);
             // DEFAULT
             default :
@@ -394,10 +395,11 @@
         weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
         weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
         longDateFormat : { 
+            XXXX: "h:mm A",
             L : "MM/DD/YYYY",
             LL : "MMMM D YYYY",
-            LLL : "MMMM D YYYY h:mm A",
-            LLLL : "dddd, MMMM D YYYY h:mm A"
+            LLL : "MMMM D YYYY XXXX",
+            LLLL : "dddd, MMMM D YYYY XXXX"
         },
         meridiem : {
             AM : 'AM',
@@ -565,7 +567,7 @@
             }
 
             if (arrayKey) {
-                return moment.relativeDate[arrayKey].replace('%weekday', this.format('dddd')).replace('%time', this.format('HH:mm'));
+                return moment.relativeDate[arrayKey].replace('%weekday', this.format('dddd')).replace('%time', this.format('XXXX'));
             }
 
             return this.format('L');