From: Iskren Chernev Date: Mon, 5 Nov 2012 10:24:24 +0000 (-0800) Subject: Fixed code style to keep jshint happy X-Git-Tag: 2.0.0~45^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F500%2Fhead;p=thirdparty%2Fmoment.git Fixed code style to keep jshint happy --- diff --git a/lang/sl.js b/lang/sl.js index cdd07c553..1d8d80c21 100644 --- a/lang/sl.js +++ b/lang/sl.js @@ -2,63 +2,68 @@ // language : slovenian (sl) // author : Robert Sedovšek : https://github.com/sedovsek (function () { - translate = function (number, withoutSuffix, key) { + var translate = function (number, withoutSuffix, key) { var result = number + " "; switch (key) { - case 'm': - return withoutSuffix ? 'ena minuta' : 'eno minuto'; - case 'mm': - if (number === 1) { - return result + 'minuta' - } else if (number === 2) { - return result + 'minuti' - } else if ((number === 3) || (number === 4)) { - return result + 'minute' - } else { - return result + 'minut' - } - case 'h': - return withoutSuffix ? 'ena ura' : 'eno uro'; - case 'hh': - if (number === 1) { - return result + 'ura' - } else if (number === 2) { - return result + 'uri' - } else if ((number === 3) || (number === 4)) { - return result + 'ure' - } else { - return result + 'ur' - } - case 'dd': - if (number === 1) { - return result + 'dan' - } else { - return result + 'dni' - } - case 'MM': - if (number === 1) { - return result + 'mesec' - } else if (number === 2) { - return result + 'meseca' - } else if ((number === 3) || (number === 4)) { - return result + 'mesece' - } else { - return result + 'mesecev' - } - case 'yy': - if (number === 1) { - return result + 'leto' - } else if (number === 2) { - return result + 'leti' - } else if ((number === 3) || (number === 4)) { - return result + 'leta' - } else { - return result + 'let' - } + case 'm': + return withoutSuffix ? 'ena minuta' : 'eno minuto'; + case 'mm': + if (number === 1) { + result += 'minuta'; + } else if (number === 2) { + result += 'minuti'; + } else if (number === 3 || number === 4) { + result += 'minute'; + } else { + result += 'minut'; + } + return result; + case 'h': + return withoutSuffix ? 'ena ura' : 'eno uro'; + case 'hh': + if (number === 1) { + result += 'ura'; + } else if (number === 2) { + result += 'uri'; + } else if (number === 3 || number === 4) { + result += 'ure'; + } else { + result += 'ur'; + } + return result; + case 'dd': + if (number === 1) { + result += 'dan'; + } else { + result += 'dni'; + } + return result; + case 'MM': + if (number === 1) { + result += 'mesec'; + } else if (number === 2) { + result += 'meseca'; + } else if (number === 3 || number === 4) { + result += 'mesece'; + } else { + result += 'mesecev'; + } + return result; + case 'yy': + if (number === 1) { + result += 'leto'; + } else if (number === 2) { + result += 'leti'; + } else if (number === 3 || number === 4) { + result += 'leta'; + } else { + result += 'let'; + } + return result; } }, - lang = { + lang = { months : "januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"), monthsShort : "jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"), weekdays : "nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"), @@ -74,35 +79,35 @@ calendar : { sameDay : '[danes ob] LT', nextDay : '[jutri ob] LT', - + nextWeek : function () { switch (this.day()) { - case 0: - return '[v] [nedeljo] [ob] LT'; - case 3: - return '[v] [sredo] [ob] LT'; - case 6: - return '[v] [soboto] [ob] LT'; - case 1: - case 2: - case 4: - case 5: - return '[v] dddd [ob] LT'; - } + case 0: + return '[v] [nedeljo] [ob] LT'; + case 3: + return '[v] [sredo] [ob] LT'; + case 6: + return '[v] [soboto] [ob] LT'; + case 1: + case 2: + case 4: + case 5: + return '[v] dddd [ob] LT'; + } }, lastDay : '[včeraj ob] LT', lastWeek : function () { switch (this.day()) { - case 0: - case 3: - case 6: - return '[prejšnja] dddd [ob] LT'; - case 1: - case 2: - case 4: - case 5: - return '[prejšnji] dddd [ob] LT'; - } + case 0: + case 3: + case 6: + return '[prejšnja] dddd [ob] LT'; + case 1: + case 2: + case 4: + case 5: + return '[prejšnji] dddd [ob] LT'; + } }, sameElse : 'L' }, diff --git a/test/lang/sl.js b/test/lang/sl.js index af99c3662..55b7cf152 100644 --- a/test/lang/sl.js +++ b/test/lang/sl.js @@ -39,7 +39,7 @@ exports["lang:en"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. nedelja ned. ne'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], @@ -72,7 +72,7 @@ exports["lang:en"] = { test.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.'); test.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.'); test.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.'); - + test.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.'); test.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.'); test.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.'); @@ -83,7 +83,7 @@ exports["lang:en"] = { test.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.'); test.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.'); test.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.'); - + test.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.'); test.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.'); test.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.'); @@ -94,7 +94,7 @@ exports["lang:en"] = { test.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.'); test.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.'); test.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.'); - + test.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.'); test.done(); }, @@ -184,9 +184,9 @@ exports["lang:en"] = { "calendar day" : function(test) { test.expect(6); moment.lang('sl'); - + var a = moment().hours(2).minutes(0).seconds(0); - + test.equal(moment(a).calendar(), "danes ob 2:00", "today at the same time"); test.equal(moment(a).add({ m: 25 }).calendar(), "danes ob 2:25", "Now plus 25 min"); test.equal(moment(a).add({ h: 1 }).calendar(), "danes ob 3:00", "Now plus 1 hour"); @@ -199,7 +199,7 @@ exports["lang:en"] = { "calendar next week" : function(test) { test.expect(15); moment.lang('sl'); - + var i; var m; @@ -218,7 +218,7 @@ exports["lang:en"] = { return '[v] dddd [ob] LT'; } } - + for (i = 2; i < 7; i++) { m = moment().add({ d: i }); test.equal(m.calendar(), m.format(makeFormat(m)), "Today + " + i + " days current time"); @@ -250,7 +250,7 @@ exports["lang:en"] = { return '[prejšnji] dddd [ob] LT'; } } - + for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); test.equal(m.calendar(), m.format(makeFormat(m)), "Today - " + i + " days current time"); @@ -267,13 +267,13 @@ exports["lang:en"] = { moment.lang('sl'); var weeksAgo = moment().subtract({ w: 1 }); var weeksFromNow = moment().add({ w: 1 }); - + test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "1 week ago"); test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "in 1 week"); - + weeksAgo = moment().subtract({ w: 2 }); weeksFromNow = moment().add({ w: 2 }); - + test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "2 weeks ago"); test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "in 2 weeks"); test.done();