Skip to content

Commit

Permalink
Merge branch 'hotfix/1.7.1' of github.com:timrwood/moment into hotfix…
Browse files Browse the repository at this point in the history 
…/1.7.1

* 'hotfix/1.7.1' of github.com:timrwood/moment:
  remove trailing comma from ru.js, fixes moment#424
  putting '} else {' on the same line
  Support for Chuvash suffix changes in future fromNow
  Estonian i18n
  • Loading branch information
@timrwood
timrwood committed Sep 5, 2012
2 parents 8c394b0 + c86ddbc commit 7fcb2b7
Show file tree
Hide file tree
Showing 6 changed files with 331 additions and 5 deletions.
6 changes: 5 additions & 1 deletion lang/cv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
sameElse: 'L'
},
relativeTime : {
future : "%sран",
future : function(output) {
var affix = /сехет$/i.exec(output)
? "рен" : /çул$/i.exec(output) ? "тан" : "ран";
return output + affix;
},
past : "%s каялла",
s : "пĕр-ик çеккунт",
m : "пĕр минут",
Expand Down
67 changes: 67 additions & 0 deletions lang/et.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// moment.js language configuration
// language : estonian (et)
// author : Henry Kehlmann : https://github.com/madhenry
(function () {

function translate(number, withoutSuffix, key, isFuture) {
var num = number;

switch (key) {
case 's':
return (isFuture || withoutSuffix) ? 'paari sekundi' : 'paar sekundit';
default:
}

return '';
}

var lang = {
months : "jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),
monthsShort : "jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),
weekdays : "pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),
weekdaysShort : "P_E_T_K_N_R_L".split("_"),
weekdaysMin : "P_E_T_K_N_R_L".split("_"),
longDateFormat : {
LT : "H:mm",
L : "DD.MM.YYYY",
LL : "D. MMMM YYYY",
LLL : "D. MMMM YYYY LT",
LLLL : "dddd, D. MMMM YYYY LT"
},
calendar : {
sameDay : '[Täna,] LT',
nextDay : '[Homme,] LT',
nextWeek : '[Järgmine] dddd LT',
lastDay : '[Eile,] LT',
lastWeek : '[Eelmine] dddd LT',
sameElse : 'L'
},
relativeTime : {
future : "%s pärast",
past : "%s tagasi",
s : translate,
m : "minut",
mm : "%d minutit",
h : "tund",
hh : "%d tundi",
d : "päev",
dd : "%d päeva",
M : "kuu",
MM : "%d kuud",
y : "aasta",
yy : "%d aastat"
},
ordinal : function (number) {
return '.';
}
};

// Node
if (typeof module !== 'undefined' && module.exports) {
module.exports = lang;
}
// Browser
if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
this.moment.lang('et', lang);
}
}());
2 changes: 1 addition & 1 deletion lang/ru.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
weekdaysCaseReplace = function (m, format) {
var weekdays = {
'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
},

nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую)? ?\] ?dddd/).test(format) ?
Expand Down
9 changes: 7 additions & 2 deletions moment.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1048,10 +1048,15 @@
humanize : function (withSuffix) {
var difference = +this,
rel = this.lang().relativeTime,
output = relativeTime(difference, !withSuffix, this.lang());
output = relativeTime(difference, !withSuffix, this.lang()),
fromNow = difference <= 0 ? rel.past : rel.future;

if (withSuffix) {
output = (difference <= 0 ? rel.past : rel.future).replace(/%s/i, output);
if (typeof fromNow === 'function') {
output = fromNow(output);
} else {
output = fromNow.replace(/%s/i, output);
}
}

return output;
Expand Down
4 changes: 3 additions & 1 deletion test/lang/cv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,12 @@ exports["lang:cv"] = {
},

"fromNow" : function(test) {
test.expect(2);
test.expect(4);
moment.lang('cv');
test.equal(moment().add({s:30}).fromNow(), "пĕр-ик çеккунтран", "in a few seconds");
test.equal(moment().add({d:5}).fromNow(), "5 кунран", "in 5 days");
test.equal(moment().add({h:2}).fromNow(), "2 сехетрен", "in 2 hours, the right suffix!");
test.equal(moment().add({y:3}).fromNow(), "3 çултан", "in 3 years, the right suffix!");
test.done();
},

Expand Down
248 changes: 248 additions & 0 deletions test/lang/et.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
var moment = require("../../moment");


/**************************************************
English
*************************************************/

exports["lang:et"] = {
"parse" : function(test) {
test.expect(96);
moment.lang('et');
var tests = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split("_");
var i;
function equalTest(input, mmm, i) {
test.equal(moment(input, mmm).month(), i, input + ' peaks olema kuu ' + (i + 1));
}
for (i = 0; i < 12; i++) {
tests[i] = tests[i].split(' ');
equalTest(tests[i][0], 'MMM', i);
equalTest(tests[i][1], 'MMM', i);
equalTest(tests[i][0], 'MMMM', i);
equalTest(tests[i][1], 'MMMM', i);
equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
}
test.done();
},

"format" : function(test) {
test.expect(18);
moment.lang('et');
var a = [
['dddd, Do MMMM YYYY, H:mm:ss', 'pühapäev, 14. veebruar 2010, 15:25:50'],
['ddd, h', 'P, 3'],
['M Mo MM MMMM MMM', '2 2. 02 veebruar veebr'],
['YYYY YY', '2010 10'],
['D Do DD', '14 14. 14'],
['d do dddd ddd dd', '0 0. pühapäev P P'],
['DDD DDDo DDDD', '45 45. 045'],
['w wo ww', '8 8. 08'],
['h hh', '3 03'],
['H HH', '15 15'],
['m mm', '25 25'],
['s ss', '50 50'],
['a A', 'pm PM'],
['\\a\\a\\st\\a DDDo päev', 'aasta 45. päev'],
['L', '14.02.2010'],
['LL', '14. veebruar 2010'],
['LLL', '14. veebruar 2010 15:25'],
['LLLL', 'pühapäev, 14. veebruar 2010 15:25']
],
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
i;
for (i = 0; i < a.length; i++) {
test.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
}
test.done();
},

"format ordinal" : function(test) {
test.expect(31);
moment.lang('et');
test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
test.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
test.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
test.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
test.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
test.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
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.');
test.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
test.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
test.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
test.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
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.');
test.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
test.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
test.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
test.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
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();
},

"format month" : function(test) {
test.expect(12);
moment.lang('et');
var expected = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split("_");
var i;
for (i = 0; i < expected.length; i++) {
test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
}
test.done();
},

"format week" : function(test) {
test.expect(7);
moment.lang('et');
var expected = 'pühapäev P P_esmaspäev E E_teisipäev T T_kolmapäev K K_neljapäev N N_reede R R_laupäev L L'.split("_");
var i;
for (i = 0; i < expected.length; i++) {
test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
}
test.done();
},

"from" : function(test) {
test.expect(30);
moment.lang('et');
var start = moment([2007, 1, 28]);
test.equal(start.from(moment([2007, 1, 28]).add({s:44}), true), "paari sekundi", "44 seconds = paari sekundi");
test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true), "minut", "45 seconds = minut");
test.equal(start.from(moment([2007, 1, 28]).add({s:89}), true), "minut", "89 seconds = minut");
test.equal(start.from(moment([2007, 1, 28]).add({s:90}), true), "2 minutit", "90 seconds = 2 minutit");
test.equal(start.from(moment([2007, 1, 28]).add({m:44}), true), "44 minutit", "44 minutes = 44 minutit");
test.equal(start.from(moment([2007, 1, 28]).add({m:45}), true), "tund", "45 minutes = tund");
test.equal(start.from(moment([2007, 1, 28]).add({m:89}), true), "tund", "89 minutes = tund");
test.equal(start.from(moment([2007, 1, 28]).add({m:90}), true), "2 tundi", "90 minutes = 2 tundi");
test.equal(start.from(moment([2007, 1, 28]).add({h:5}), true), "5 tundi", "5 hours = 5 tundi");
test.equal(start.from(moment([2007, 1, 28]).add({h:21}), true), "21 tundi", "21 hours = 21 tundi");
test.equal(start.from(moment([2007, 1, 28]).add({h:22}), true), "päev", "22 hours = päev");
test.equal(start.from(moment([2007, 1, 28]).add({h:35}), true), "päev", "35 hours = päev");
test.equal(start.from(moment([2007, 1, 28]).add({h:36}), true), "2 päeva", "36 hours = 2 päeva");
test.equal(start.from(moment([2007, 1, 28]).add({d:1}), true), "päev", "1 day = päev");
test.equal(start.from(moment([2007, 1, 28]).add({d:5}), true), "5 päeva", "5 days = 5 päeva");
test.equal(start.from(moment([2007, 1, 28]).add({d:25}), true), "25 päeva", "25 days = 25 päeva");
test.equal(start.from(moment([2007, 1, 28]).add({d:26}), true), "kuu", "26 days = kuu");
test.equal(start.from(moment([2007, 1, 28]).add({d:30}), true), "kuu", "30 days = kuu");
test.equal(start.from(moment([2007, 1, 28]).add({d:45}), true), "kuu", "45 days = kuu");
test.equal(start.from(moment([2007, 1, 28]).add({d:46}), true), "2 kuud", "46 days = 2 kuud");
test.equal(start.from(moment([2007, 1, 28]).add({d:74}), true), "2 kuud", "75 days = 2 kuud");
test.equal(start.from(moment([2007, 1, 28]).add({d:76}), true), "3 kuud", "76 days = 3 kuud");
test.equal(start.from(moment([2007, 1, 28]).add({M:1}), true), "kuu", "1 month = kuu");
test.equal(start.from(moment([2007, 1, 28]).add({M:5}), true), "5 kuud", "5 months = 5 kuud");
test.equal(start.from(moment([2007, 1, 28]).add({d:344}), true), "11 kuud", "344 days = 11 kuud");
test.equal(start.from(moment([2007, 1, 28]).add({d:345}), true), "aasta", "345 days = aasta");
test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "aasta", "547 days = aasta");
test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 aastat", "548 days = 2 aastat");
test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true), "aasta", "1 year = aasta");
test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true), "5 aastat", "5 years = 5 aastat");
test.done();
},

"suffix" : function(test) {
test.expect(2);
moment.lang('et');
test.equal(moment(30000).from(0), "paari sekundi pärast", "prefix");
test.equal(moment(0).from(30000), "paar sekundit tagasi", "suffix");
test.done();
},

"now from now" : function(test) {
test.expect(1);
moment.lang('et');
test.equal(moment().fromNow(), "paar sekundit tagasi", "now from now should display as in the past");
test.done();
},

"fromNow" : function(test) {
test.expect(2);
moment.lang('et');
test.equal(moment().add({s:30}).fromNow(), "paari sekundi pärast", "paari sekundi pärast");
test.equal(moment().add({d:5}).fromNow(), "5 päeva pärast", "5 päeva pärast");
test.done();
},

"calendar day" : function(test) {
test.expect(6);
moment.lang('et');

var a = moment().hours(2).minutes(0).seconds(0);

test.equal(moment(a).calendar(), "Täna, 2:00", "today at the same time");
test.equal(moment(a).add({ m: 25 }).calendar(), "Täna, 2:25", "Now plus 25 min");
test.equal(moment(a).add({ h: 1 }).calendar(), "Täna, 3:00", "Now plus 1 hour");
test.equal(moment(a).add({ d: 1 }).calendar(), "Homme, 2:00", "tomorrow at the same time");
test.equal(moment(a).subtract({ h: 1 }).calendar(), "Täna, 1:00", "Now minus 1 hour");
test.equal(moment(a).subtract({ d: 1 }).calendar(), "Eile, 2:00", "yesterday at the same time");
test.done();
},

"calendar next week" : function(test) {
test.expect(15);
moment.lang('et');

var i;
var m;

for (i = 2; i < 7; i++) {
m = moment().add({ d: i });
test.equal(m.calendar(), m.format('[Järgmine] dddd LT'), "Today + " + i + " days current time");
m.hours(0).minutes(0).seconds(0).milliseconds(0);
test.equal(m.calendar(), m.format('[Järgmine] dddd LT'), "Today + " + i + " days beginning of day");
m.hours(23).minutes(59).seconds(59).milliseconds(999);
test.equal(m.calendar(), m.format('[Järgmine] dddd LT'), "Today + " + i + " days end of day");
}
test.done();
},

"calendar last week" : function(test) {
test.expect(15);
moment.lang('et');

for (i = 2; i < 7; i++) {
m = moment().subtract({ d: i });
test.equal(m.calendar(), m.format('[Eelmine] dddd LT'), "Today - " + i + " days current time");
m.hours(0).minutes(0).seconds(0).milliseconds(0);
test.equal(m.calendar(), m.format('[Eelmine] dddd LT'), "Today - " + i + " days beginning of day");
m.hours(23).minutes(59).seconds(59).milliseconds(999);
test.equal(m.calendar(), m.format('[Eelmine] dddd LT'), "Today - " + i + " days end of day");
}
test.done();
},

"calendar all else" : function(test) {
test.expect(4);
moment.lang('en');
var weeksAgo = moment().subtract({ w: 1 });
var weeksFromNow = moment().add({ w: 1 });

test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "1 nädal tagasi");
test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "1 nädala pärast");

weeksAgo = moment().subtract({ w: 2 });
weeksFromNow = moment().add({ w: 2 });

test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "2 nädalat tagasi");
test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "2 nädala pärast");
test.done();
}
};

0 comments on commit 7fcb2b7

Please sign in to comment.