From: Tim Wood Date: Fri, 14 Oct 2011 16:35:23 +0000 (-0700) Subject: Adding French unit tests X-Git-Tag: 1.0.1~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4d8a22d707d84c5b0280551280b00e0b08e3f3;p=thirdparty%2Fmoment.git Adding French unit tests Changing June and July abbreviated names from 'jui' + 'jui' to 'juin' + 'juil' to differentiate them. --- diff --git a/build.js b/build.js index 0d797ddbe..78bef8035 100755 --- a/build.js +++ b/build.js @@ -35,7 +35,7 @@ var JSHINT_CONFIG = { "white": true }; var LANG_MINIFY = "fr it pt".split(" "); -var LANG_TEST = "en pt".split(" "); +var LANG_TEST = "en fr pt".split(" "); var LANG_PREFIX = "var _date;if (typeof window === 'undefined') {_date = require('../underscore.date.js');module = QUnit.module;}"; diff --git a/lang/all.min.js b/lang/all.min.js index 68d4cc8a4..e97fec765 100644 --- a/lang/all.min.js +++ b/lang/all.min.js @@ -1 +1 @@ -(function(){var a={months:"Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Aout_Septembre_Octobre_Novembre_Décembre".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_Jui_Jui_Aou_Sep_Oct_Nov_Dec".split("_"),weekdays:"Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),weekdaysShort:"Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),relativeTime:{future:"in %s",past:"il y a %s",s:"secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"une année",yy:"%d années"},ordinal:function(a){return~~(a%100/10)===1?"er":"ème"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("fr",a)})(),function(){var a={months:"Gennaio_Febbraio_Marzo_Aprile_Maggio_Giugno_Luglio_Agosto_Settebre_Ottobre_Novembre_Dicembre".split("_"),monthsShort:"Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic".split("_"),weekdays:"Domenica_Lunedi_Martedi_Mercoledi_Giovedi_Venerdi_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),relativeTime:{future:"in %s",past:"%s fa",s:"secondi",m:"un minuto",mm:"%d minuti",h:"un ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinal:function(){return"º"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("it",a)}(),function(){var a={months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Feb_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),relativeTime:{future:"em %s",past:"%s atrás",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinal:function(a){return"º"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("pt",a)}() \ No newline at end of file +(function(){var a={months:"Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Aout_Septembre_Octobre_Novembre_Décembre".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_Juin_Juil_Aou_Sep_Oct_Nov_Dec".split("_"),weekdays:"Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),weekdaysShort:"Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),relativeTime:{future:"in %s",past:"il y a %s",s:"secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"une année",yy:"%d années"},ordinal:function(a){return~~(a%100/10)===1?"er":"ème"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("fr",a)})(),function(){var a={months:"Gennaio_Febbraio_Marzo_Aprile_Maggio_Giugno_Luglio_Agosto_Settebre_Ottobre_Novembre_Dicembre".split("_"),monthsShort:"Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic".split("_"),weekdays:"Domenica_Lunedi_Martedi_Mercoledi_Giovedi_Venerdi_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),relativeTime:{future:"in %s",past:"%s fa",s:"secondi",m:"un minuto",mm:"%d minuti",h:"un ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinal:function(){return"º"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("it",a)}(),function(){var a={months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Feb_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),relativeTime:{future:"em %s",past:"%s atrás",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinal:function(a){return"º"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("pt",a)}() \ No newline at end of file diff --git a/lang/fr.js b/lang/fr.js index b2d4e7bf7..60d3f7818 100644 --- a/lang/fr.js +++ b/lang/fr.js @@ -1,7 +1,7 @@ (function () { var lang = { months : "Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Aout_Septembre_Octobre_Novembre_Décembre".split("_"), - monthsShort : "Jan_Fev_Mar_Avr_Mai_Jui_Jui_Aou_Sep_Oct_Nov_Dec".split("_"), + monthsShort : "Jan_Fev_Mar_Avr_Mai_Juin_Juil_Aou_Sep_Oct_Nov_Dec".split("_"), weekdays : "Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"), weekdaysShort : "Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"), relativeTime : { diff --git a/lang/fr.min.js b/lang/fr.min.js index f3b1bcd66..c9ee738a8 100644 --- a/lang/fr.min.js +++ b/lang/fr.min.js @@ -1 +1 @@ -(function(){var a={months:"Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Aout_Septembre_Octobre_Novembre_Décembre".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_Jui_Jui_Aou_Sep_Oct_Nov_Dec".split("_"),weekdays:"Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),weekdaysShort:"Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),relativeTime:{future:"in %s",past:"il y a %s",s:"secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"une année",yy:"%d années"},ordinal:function(a){return~~(a%100/10)===1?"er":"ème"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("fr",a)})() \ No newline at end of file +(function(){var a={months:"Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Aout_Septembre_Octobre_Novembre_Décembre".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_Juin_Juil_Aou_Sep_Oct_Nov_Dec".split("_"),weekdays:"Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),weekdaysShort:"Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),relativeTime:{future:"in %s",past:"il y a %s",s:"secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"une année",yy:"%d années"},ordinal:function(a){return~~(a%100/10)===1?"er":"ème"}};typeof module!="undefined"&&(module.exports=a),typeof window!="undefined"&&this._date&&this._date.lang&&this._date.lang("fr",a)})() \ No newline at end of file diff --git a/test/lang.js b/test/lang.js index d332c3fc0..f7c1bbefa 100644 --- a/test/lang.js +++ b/test/lang.js @@ -134,6 +134,140 @@ test("fromNow", 2, function() { equal(_date().add({d:5}).fromNow(), "in 5 days", "in 5 days"); }); +/************************************************** + French + *************************************************/ + +module("lang:fr"); + +test("format", 15, function() { + _date.lang('fr'); + var a = [ + ['dddd, MMMM Do YYYY, h:mm:ss a', 'Dimanche, Février 14er 2010, 3:25:50 pm'], + ['ddd, hA', 'Dim, 3PM'], + ['M Mo MM MMMM MMM', '2 2ème 02 Février Fev'], + ['YYYY YY', '2010 10'], + ['D Do DD', '14 14er 14'], + ['d do dddd ddd', '0 0ème Dimanche Dim'], + ['DDD DDDo DDDD', '45 45ème 045'], + ['w wo ww', '8 8ème 08'], + ['h hh', '3 03'], + ['H HH', '15 15'], + ['m mm', '25 25'], + ['s ss', '50 50'], + ['a A', 'pm PM'], + ['z zz', 'PST PST'], + ['t\\he DDDo \\d\\ay of t\\he ye\\ar', 'the 45ème day of the year'] + ], + b = _date(new Date(2010, 1, 14, 15, 25, 50, 125)), + i; + for (i = 0; i < a.length; i++) { + equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]); + } +}); + +test("format ordinal", 31, function() { + _date.lang('fr'); + equal(_date([2011, 0, 1]).format('DDDo'), '1ème', '1ème'); + equal(_date([2011, 0, 2]).format('DDDo'), '2ème', '2ème'); + equal(_date([2011, 0, 3]).format('DDDo'), '3ème', '3ème'); + equal(_date([2011, 0, 4]).format('DDDo'), '4ème', '4ème'); + equal(_date([2011, 0, 5]).format('DDDo'), '5ème', '5ème'); + equal(_date([2011, 0, 6]).format('DDDo'), '6ème', '6ème'); + equal(_date([2011, 0, 7]).format('DDDo'), '7ème', '7ème'); + equal(_date([2011, 0, 8]).format('DDDo'), '8ème', '8ème'); + equal(_date([2011, 0, 9]).format('DDDo'), '9ème', '9ème'); + equal(_date([2011, 0, 10]).format('DDDo'), '10er', '10er'); + + equal(_date([2011, 0, 11]).format('DDDo'), '11er', '11er'); + equal(_date([2011, 0, 12]).format('DDDo'), '12er', '12er'); + equal(_date([2011, 0, 13]).format('DDDo'), '13er', '13er'); + equal(_date([2011, 0, 14]).format('DDDo'), '14er', '14er'); + equal(_date([2011, 0, 15]).format('DDDo'), '15er', '15er'); + equal(_date([2011, 0, 16]).format('DDDo'), '16er', '16er'); + equal(_date([2011, 0, 17]).format('DDDo'), '17er', '17er'); + equal(_date([2011, 0, 18]).format('DDDo'), '18er', '18er'); + equal(_date([2011, 0, 19]).format('DDDo'), '19er', '19er'); + equal(_date([2011, 0, 20]).format('DDDo'), '20ème', '20ème'); + + equal(_date([2011, 0, 21]).format('DDDo'), '21ème', '21ème'); + equal(_date([2011, 0, 22]).format('DDDo'), '22ème', '22ème'); + equal(_date([2011, 0, 23]).format('DDDo'), '23ème', '23ème'); + equal(_date([2011, 0, 24]).format('DDDo'), '24ème', '24ème'); + equal(_date([2011, 0, 25]).format('DDDo'), '25ème', '25ème'); + equal(_date([2011, 0, 26]).format('DDDo'), '26ème', '26ème'); + equal(_date([2011, 0, 27]).format('DDDo'), '27ème', '27ème'); + equal(_date([2011, 0, 28]).format('DDDo'), '28ème', '28ème'); + equal(_date([2011, 0, 29]).format('DDDo'), '29ème', '29ème'); + equal(_date([2011, 0, 30]).format('DDDo'), '30ème', '30ème'); + + equal(_date([2011, 0, 31]).format('DDDo'), '31ème', '31ème'); +}); + +test("format month", 12, function() { + _date.lang('fr'); + var expected = 'Janvier Jan_Février Fev_Mars Mar_Avril Avr_Mai Mai_Juin Juin_Juillet Juil_Aout Aou_Septembre Sep_Octobre Oct_Novembre Nov_Décembre Dec'.split("_"); + var i; + for (i = 0; i < expected.length; i++) { + equal(_date([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + } +}); + +test("format week", 7, function() { + _date.lang('fr'); + var expected = 'Dimanche Dim_Lundi Lun_Mardi Mar_Mercredi Mer_Jeudi Jeu_Vendredi Ven_Samedi Sam'.split("_"); + var i; + for (i = 0; i < expected.length; i++) { + equal(_date([2011, 0, 2 + i]).format('dddd ddd'), expected[i], expected[i]); + } +}); + +test("from", 30, function() { + _date.lang('fr'); + var start = _date([2007, 1, 28]); + equal(start.from(_date([2007, 1, 28]).add({s:44}), true), "secondes", "44 seconds = seconds"); + equal(start.from(_date([2007, 1, 28]).add({s:45}), true), "une minute", "45 seconds = a minute"); + equal(start.from(_date([2007, 1, 28]).add({s:89}), true), "une minute", "89 seconds = a minute"); + equal(start.from(_date([2007, 1, 28]).add({s:90}), true), "2 minutes", "90 seconds = 2 minutes"); + equal(start.from(_date([2007, 1, 28]).add({m:44}), true), "44 minutes", "44 minutes = 44 minutes"); + equal(start.from(_date([2007, 1, 28]).add({m:45}), true), "une heure", "45 minutes = an hour"); + equal(start.from(_date([2007, 1, 28]).add({m:89}), true), "une heure", "89 minutes = an hour"); + equal(start.from(_date([2007, 1, 28]).add({m:90}), true), "2 heures", "90 minutes = 2 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:5}), true), "5 heures", "5 hours = 5 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:21}), true), "21 heures", "21 hours = 21 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:22}), true), "un jour", "22 hours = a day"); + equal(start.from(_date([2007, 1, 28]).add({h:35}), true), "un jour", "35 hours = a day"); + equal(start.from(_date([2007, 1, 28]).add({h:36}), true), "2 jours", "36 hours = 2 days"); + equal(start.from(_date([2007, 1, 28]).add({d:1}), true), "un jour", "1 day = a day"); + equal(start.from(_date([2007, 1, 28]).add({d:5}), true), "5 jours", "5 days = 5 days"); + equal(start.from(_date([2007, 1, 28]).add({d:25}), true), "25 jours", "25 days = 25 days"); + equal(start.from(_date([2007, 1, 28]).add({d:26}), true), "un mois", "26 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:30}), true), "un mois", "30 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:45}), true), "un mois", "45 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:46}), true), "2 mois", "46 days = 2 months"); + equal(start.from(_date([2007, 1, 28]).add({d:75}), true), "2 mois", "75 days = 2 months"); + equal(start.from(_date([2007, 1, 28]).add({d:76}), true), "3 mois", "76 days = 3 months"); + equal(start.from(_date([2007, 1, 28]).add({M:1}), true), "un mois", "1 month = a month"); + equal(start.from(_date([2007, 1, 28]).add({M:5}), true), "5 mois", "5 months = 5 months"); + equal(start.from(_date([2007, 1, 28]).add({d:344}), true), "11 mois", "344 days = 11 months"); + equal(start.from(_date([2007, 1, 28]).add({d:345}), true), "une année", "345 days = a year"); + equal(start.from(_date([2007, 1, 28]).add({d:547}), true), "une année", "547 days = a year"); + equal(start.from(_date([2007, 1, 28]).add({d:548}), true), "2 années", "548 days = 2 years"); + equal(start.from(_date([2007, 1, 28]).add({y:1}), true), "une année", "1 year = a year"); + equal(start.from(_date([2007, 1, 28]).add({y:5}), true), "5 années", "5 years = 5 years"); +}); + +test("suffix", 2, function() { + _date.lang('fr'); + equal(_date(30000).from(0), "in secondes", "prefix"); + equal(_date(0).from(30000), "il y a secondes", "suffix"); +}); + +test("fromNow", 2, function() { + _date.lang('fr'); + equal(_date().add({s:30}).fromNow(), "in secondes", "in seconds"); + equal(_date().add({d:5}).fromNow(), "in 5 jours", "in 5 days"); +}); /************************************************** Portuguese *************************************************/ diff --git a/test/lang/fr.js b/test/lang/fr.js new file mode 100644 index 000000000..992410cc2 --- /dev/null +++ b/test/lang/fr.js @@ -0,0 +1,135 @@ + +/************************************************** + French + *************************************************/ + +module("lang:fr"); + +test("format", 15, function() { + _date.lang('fr'); + var a = [ + ['dddd, MMMM Do YYYY, h:mm:ss a', 'Dimanche, Février 14er 2010, 3:25:50 pm'], + ['ddd, hA', 'Dim, 3PM'], + ['M Mo MM MMMM MMM', '2 2ème 02 Février Fev'], + ['YYYY YY', '2010 10'], + ['D Do DD', '14 14er 14'], + ['d do dddd ddd', '0 0ème Dimanche Dim'], + ['DDD DDDo DDDD', '45 45ème 045'], + ['w wo ww', '8 8ème 08'], + ['h hh', '3 03'], + ['H HH', '15 15'], + ['m mm', '25 25'], + ['s ss', '50 50'], + ['a A', 'pm PM'], + ['z zz', 'PST PST'], + ['t\\he DDDo \\d\\ay of t\\he ye\\ar', 'the 45ème day of the year'] + ], + b = _date(new Date(2010, 1, 14, 15, 25, 50, 125)), + i; + for (i = 0; i < a.length; i++) { + equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]); + } +}); + +test("format ordinal", 31, function() { + _date.lang('fr'); + equal(_date([2011, 0, 1]).format('DDDo'), '1ème', '1ème'); + equal(_date([2011, 0, 2]).format('DDDo'), '2ème', '2ème'); + equal(_date([2011, 0, 3]).format('DDDo'), '3ème', '3ème'); + equal(_date([2011, 0, 4]).format('DDDo'), '4ème', '4ème'); + equal(_date([2011, 0, 5]).format('DDDo'), '5ème', '5ème'); + equal(_date([2011, 0, 6]).format('DDDo'), '6ème', '6ème'); + equal(_date([2011, 0, 7]).format('DDDo'), '7ème', '7ème'); + equal(_date([2011, 0, 8]).format('DDDo'), '8ème', '8ème'); + equal(_date([2011, 0, 9]).format('DDDo'), '9ème', '9ème'); + equal(_date([2011, 0, 10]).format('DDDo'), '10er', '10er'); + + equal(_date([2011, 0, 11]).format('DDDo'), '11er', '11er'); + equal(_date([2011, 0, 12]).format('DDDo'), '12er', '12er'); + equal(_date([2011, 0, 13]).format('DDDo'), '13er', '13er'); + equal(_date([2011, 0, 14]).format('DDDo'), '14er', '14er'); + equal(_date([2011, 0, 15]).format('DDDo'), '15er', '15er'); + equal(_date([2011, 0, 16]).format('DDDo'), '16er', '16er'); + equal(_date([2011, 0, 17]).format('DDDo'), '17er', '17er'); + equal(_date([2011, 0, 18]).format('DDDo'), '18er', '18er'); + equal(_date([2011, 0, 19]).format('DDDo'), '19er', '19er'); + equal(_date([2011, 0, 20]).format('DDDo'), '20ème', '20ème'); + + equal(_date([2011, 0, 21]).format('DDDo'), '21ème', '21ème'); + equal(_date([2011, 0, 22]).format('DDDo'), '22ème', '22ème'); + equal(_date([2011, 0, 23]).format('DDDo'), '23ème', '23ème'); + equal(_date([2011, 0, 24]).format('DDDo'), '24ème', '24ème'); + equal(_date([2011, 0, 25]).format('DDDo'), '25ème', '25ème'); + equal(_date([2011, 0, 26]).format('DDDo'), '26ème', '26ème'); + equal(_date([2011, 0, 27]).format('DDDo'), '27ème', '27ème'); + equal(_date([2011, 0, 28]).format('DDDo'), '28ème', '28ème'); + equal(_date([2011, 0, 29]).format('DDDo'), '29ème', '29ème'); + equal(_date([2011, 0, 30]).format('DDDo'), '30ème', '30ème'); + + equal(_date([2011, 0, 31]).format('DDDo'), '31ème', '31ème'); +}); + +test("format month", 12, function() { + _date.lang('fr'); + var expected = 'Janvier Jan_Février Fev_Mars Mar_Avril Avr_Mai Mai_Juin Juin_Juillet Juil_Aout Aou_Septembre Sep_Octobre Oct_Novembre Nov_Décembre Dec'.split("_"); + var i; + for (i = 0; i < expected.length; i++) { + equal(_date([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + } +}); + +test("format week", 7, function() { + _date.lang('fr'); + var expected = 'Dimanche Dim_Lundi Lun_Mardi Mar_Mercredi Mer_Jeudi Jeu_Vendredi Ven_Samedi Sam'.split("_"); + var i; + for (i = 0; i < expected.length; i++) { + equal(_date([2011, 0, 2 + i]).format('dddd ddd'), expected[i], expected[i]); + } +}); + +test("from", 30, function() { + _date.lang('fr'); + var start = _date([2007, 1, 28]); + equal(start.from(_date([2007, 1, 28]).add({s:44}), true), "secondes", "44 seconds = seconds"); + equal(start.from(_date([2007, 1, 28]).add({s:45}), true), "une minute", "45 seconds = a minute"); + equal(start.from(_date([2007, 1, 28]).add({s:89}), true), "une minute", "89 seconds = a minute"); + equal(start.from(_date([2007, 1, 28]).add({s:90}), true), "2 minutes", "90 seconds = 2 minutes"); + equal(start.from(_date([2007, 1, 28]).add({m:44}), true), "44 minutes", "44 minutes = 44 minutes"); + equal(start.from(_date([2007, 1, 28]).add({m:45}), true), "une heure", "45 minutes = an hour"); + equal(start.from(_date([2007, 1, 28]).add({m:89}), true), "une heure", "89 minutes = an hour"); + equal(start.from(_date([2007, 1, 28]).add({m:90}), true), "2 heures", "90 minutes = 2 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:5}), true), "5 heures", "5 hours = 5 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:21}), true), "21 heures", "21 hours = 21 hours"); + equal(start.from(_date([2007, 1, 28]).add({h:22}), true), "un jour", "22 hours = a day"); + equal(start.from(_date([2007, 1, 28]).add({h:35}), true), "un jour", "35 hours = a day"); + equal(start.from(_date([2007, 1, 28]).add({h:36}), true), "2 jours", "36 hours = 2 days"); + equal(start.from(_date([2007, 1, 28]).add({d:1}), true), "un jour", "1 day = a day"); + equal(start.from(_date([2007, 1, 28]).add({d:5}), true), "5 jours", "5 days = 5 days"); + equal(start.from(_date([2007, 1, 28]).add({d:25}), true), "25 jours", "25 days = 25 days"); + equal(start.from(_date([2007, 1, 28]).add({d:26}), true), "un mois", "26 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:30}), true), "un mois", "30 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:45}), true), "un mois", "45 days = a month"); + equal(start.from(_date([2007, 1, 28]).add({d:46}), true), "2 mois", "46 days = 2 months"); + equal(start.from(_date([2007, 1, 28]).add({d:75}), true), "2 mois", "75 days = 2 months"); + equal(start.from(_date([2007, 1, 28]).add({d:76}), true), "3 mois", "76 days = 3 months"); + equal(start.from(_date([2007, 1, 28]).add({M:1}), true), "un mois", "1 month = a month"); + equal(start.from(_date([2007, 1, 28]).add({M:5}), true), "5 mois", "5 months = 5 months"); + equal(start.from(_date([2007, 1, 28]).add({d:344}), true), "11 mois", "344 days = 11 months"); + equal(start.from(_date([2007, 1, 28]).add({d:345}), true), "une année", "345 days = a year"); + equal(start.from(_date([2007, 1, 28]).add({d:547}), true), "une année", "547 days = a year"); + equal(start.from(_date([2007, 1, 28]).add({d:548}), true), "2 années", "548 days = 2 years"); + equal(start.from(_date([2007, 1, 28]).add({y:1}), true), "une année", "1 year = a year"); + equal(start.from(_date([2007, 1, 28]).add({y:5}), true), "5 années", "5 years = 5 years"); +}); + +test("suffix", 2, function() { + _date.lang('fr'); + equal(_date(30000).from(0), "in secondes", "prefix"); + equal(_date(0).from(30000), "il y a secondes", "suffix"); +}); + +test("fromNow", 2, function() { + _date.lang('fr'); + equal(_date().add({s:30}).fromNow(), "in secondes", "in seconds"); + equal(_date().add({d:5}).fromNow(), "in 5 jours", "in 5 days"); +}); \ No newline at end of file