Manually merging in changes for #111

diff --git a/lang/eu.js b/lang/eu.js
index 8b67472f83f19c15e12a089c22987fb65dd20621..ff3a8c4e364083bd02992033a10fcf11748d8169 100644 (file)
--- a/lang/eu.js
+++ b/lang/eu.js
@@ -5,10 +5,11 @@
             weekdays : "igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),
             weekdaysShort : "ig._al._ar._az._og._ol._lr.".split("_"),
             longDateFormat : {
+                LT : "HH:mm",
                 L : "YYYY-MM-DD",
-                LL : "YYYYko MMMMren D\\a",
-                LLL : "YYYYko MMMMren D\\a HH:mm",
-                LLLL : "dddd, YYYYko MMMMren D\\a HH:mm"
+                LL : "YYYYko MMMMren D[a]",
+                LLL : "YYYYko MMMMren D[a] LT",
+                LLLL : "dddd, YYYYko MMMMren D[a] LT"
             },
             meridiem : {
                 AM : 'AM',
@@ -16,6 +17,14 @@
                 PM : 'PM',
                 pm : 'pm'
             },
+            calendar : {
+                sameDay : '[gaur] LT[etan]',
+                nextDay : '[bihar] LT[etan]',
+                nextWeek : 'dddd LT[etan]',
+                lastDay : '[atzo] LT[etan]',
+                lastWeek : '[aurreko] dddd LT[etan]',
+                sameElse : 'L'
+            },
             relativeTime : {
                 future : "%s barru",
                 past : "duela %s",

diff --git a/lang/test/eu.js b/lang/test/eu.js
index ceb10640edf8533abe6fc2c5fab69eb94b921e63..c0a944d6fcb13f4df9fa523367f37be3e2fc37bc 100644 (file)
--- a/lang/test/eu.js
+++ b/lang/test/eu.js
@@ -160,6 +160,63 @@ test("now from now", 1, function() {
 
 test("fromNow", 2, function() {
     moment.lang('eu');
-    equal(moment().add({s:30}).fromNow(), "segundo batzuk barru", "segundo batzuk barru");
-    equal(moment().add({d:5}).fromNow(), "5 egun barru", "5 egun barru");
+    equal(moment().add({s:30}).fromNow(), "segundo batzuk barru", "in seconds");
+    equal(moment().add({d:5}).fromNow(), "5 egun barru", "in 5 days");
+});
+
+test("calendar day", 6, function() {
+    moment.lang('eu');
+
+    var a = moment().hours(2).minutes(0).seconds(0);
+
+    equal(moment(a).calendar(),                     "gaur 02:00etan",  "today at the same time");
+    equal(moment(a).add({ m: 25 }).calendar(),      "gaur 02:25etan",  "now plus 25 min");
+    equal(moment(a).add({ h: 1 }).calendar(),       "gaur 03:00etan",  "now plus 1 hour");
+    equal(moment(a).add({ d: 1 }).calendar(),       "bihar 02:00etan", "tomorrow at the same time");
+    equal(moment(a).subtract({ h: 1 }).calendar(),  "gaur 01:00etan",  "now minus 1 hour");
+    equal(moment(a).subtract({ d: 1 }).calendar(),  "atzo 02:00etan",  "yesterday at the same time");
+});
+
+test("calendar next week", 15, function() {
+    moment.lang('eu');
+
+    var i;
+    var m;
+
+    for (i = 2; i < 7; i++) {
+        m = moment().add({ d: i });
+        equal(m.calendar(),       m.format('dddd LT[etan]'),  "Today + " + i + " days current time");
+        m.hours(0).minutes(0).seconds(0).milliseconds(0);
+        equal(m.calendar(),       m.format('dddd LT[etan]'),  "Today + " + i + " days beginning of day");
+        m.hours(23).minutes(59).seconds(59).milliseconds(999);
+        equal(m.calendar(),       m.format('dddd LT[etan]'),  "Today + " + i + " days end of day");
+    }
+});
+
+test("calendar last week", 15, function() {
+    moment.lang('eu');
+
+    for (i = 2; i < 7; i++) {
+        m = moment().subtract({ d: i });
+        equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  "Today - " + i + " days current time");
+        m.hours(0).minutes(0).seconds(0).milliseconds(0);
+        equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  "Today - " + i + " days beginning of day");
+        m.hours(23).minutes(59).seconds(59).milliseconds(999);
+        equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  "Today - " + i + " days end of day");
+    }
+});
+
+test("calendar all else", 4, function() {
+    moment.lang('eu');
+    var weeksAgo = moment().subtract({ w: 1 });
+    var weeksFromNow = moment().add({ w: 1 });
+    
+    equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "1 week ago");
+    equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 1 week");
+
+    weeksAgo = moment().subtract({ w: 2 });
+    weeksFromNow = moment().add({ w: 2 });
+    
+    equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
+    equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
 });