From: Gabriel Dibble <gdibble@gmail.com>
Date: Thu, 23 May 2013 03:58:52 +0000 (-0600)
Subject: test updates for en-GB time formatting
X-Git-Tag: 2.1.0~31^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F797%2Fhead;p=thirdparty%2Fmoment.git

test updates for en-GB time formatting

ex. 2:00 AM >>> 02:00
---

diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js
index f176f8c0c..a721a4d63 100644
--- a/test/lang/en-gb.js
+++ b/test/lang/en-gb.js
@@ -56,12 +56,12 @@ exports["lang:en-gb"] = {
                 ['[the] DDDo [day of the year]',       'the 45th day of the year'],
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 February 2010'],
-                ['LLL',                                '14 February 2010 3:25 PM'],
-                ['LLLL',                               'Sunday, 14 February 2010 3:25 PM'],
+                ['LLL',                                '14 February 2010 15:25'],
+                ['LLLL',                               'Sunday, 14 February 2010 15:25'],
                 ['l',                                  '14/2/2010'],
                 ['ll',                                 '14 Feb 2010'],
-                ['lll',                                '14 Feb 2010 3:25 PM'],
-                ['llll',                               'Sun, 14 Feb 2010 3:25 PM']
+                ['lll',                                '14 Feb 2010 15:25'],
+                ['llll',                               'Sun, 14 Feb 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;
@@ -191,12 +191,12 @@ exports["lang:en-gb"] = {
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
-        test.equal(moment(a).calendar(),                     "Today at 2:00 AM",     "today at the same time");
-        test.equal(moment(a).add({ m: 25 }).calendar(),      "Today at 2:25 AM",     "Now plus 25 min");
-        test.equal(moment(a).add({ h: 1 }).calendar(),       "Today at 3:00 AM",     "Now plus 1 hour");
-        test.equal(moment(a).add({ d: 1 }).calendar(),       "Tomorrow at 2:00 AM",  "tomorrow at the same time");
-        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "Today at 1:00 AM",     "Now minus 1 hour");
-        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "Yesterday at 2:00 AM", "yesterday at the same time");
+        test.equal(moment(a).calendar(),                     "Today at 02:00",      "today at the same time");
+        test.equal(moment(a).add({ m: 25 }).calendar(),      "Today at 02:25",      "Now plus 25 min");
+        test.equal(moment(a).add({ h: 1 }).calendar(),       "Today at 03:00",      "Now plus 1 hour");
+        test.equal(moment(a).add({ d: 1 }).calendar(),       "Tomorrow at 02:00",   "tomorrow at the same time");
+        test.equal(moment(a).subtract({ h: 1 }).calendar(),  "Today at 01:00",      "Now minus 1 hour");
+        test.equal(moment(a).subtract({ d: 1 }).calendar(),  "Yesterday at 02:00",  "yesterday at the same time");
         test.done();
     },