From: Gregor Rayman Date: Sat, 18 Jan 2014 00:42:56 +0000 (+0100) Subject: Litunanian day names in calendars with weeks not starting on Monday X-Git-Tag: 2.7.0~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39c08ad1887ce2d3212f4feef682105241a78152;p=thirdparty%2Fmoment.git Litunanian day names in calendars with weeks not starting on Monday --- diff --git a/lang/lt.js b/lang/lt.js index 3377375cd..3c11b89bd 100644 --- a/lang/lt.js +++ b/lang/lt.js @@ -23,7 +23,7 @@ "y" : "metai_metų_metus", "yy": "metai_metų_metus" }, - weekDays = "pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis_sekmadienis".split("_"); + weekDays = "sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"); function translateSeconds(number, withoutSuffix, key, isFuture) { if (withoutSuffix) { @@ -62,7 +62,7 @@ function relativeWeekDay(moment, format) { var nominative = format.indexOf('dddd HH:mm') === -1, - weekDay = weekDays[moment.weekday()]; + weekDay = weekDays[moment.day()]; return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + "į"; } diff --git a/test/lang/lt.js b/test/lang/lt.js index 516939111..7d2e5f067 100644 --- a/test/lang/lt.js +++ b/test/lang/lt.js @@ -135,6 +135,17 @@ exports["lang:lt"] = { test.done(); }, + "format week on US calendar" : function (test) { + test.expect(7); + moment.lang("lt", {week: {dow: 0, doy: 6}}); // Tests, whether the weekday names are correct, even if the week does not start on Monday + var expected = 'sekmadienis Sek S_pirmadienis Pir P_antradienis Ant A_trečiadienis Tre T_ketvirtadienis Ket K_penktadienis Pen Pn_šeštadienis Šeš Š'.split("_"), i; + for (i = 0; i < expected.length; i++) { + test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); + } + moment.lang("lt", {week: {dow: 1, doy: 4}}); + test.done(); + }, + "from" : function (test) { test.expect(37); @@ -370,4 +381,5 @@ exports["lang:lt"] = { test.done(); } + };