From: jbleduigou Date: Wed, 24 Apr 2013 08:28:35 +0000 (+0200) Subject: And more X-Git-Tag: 2.1.0~38^2~2^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=358e266a783f5717d16bec6641aea1c2c6ae661e;p=thirdparty%2Fmoment.git And more --- diff --git a/lang/br.js b/lang/br.js index c359c2133..653b168c1 100644 --- a/lang/br.js +++ b/lang/br.js @@ -2,6 +2,35 @@ // language : breton (br) // author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou +function relativeTimeWithMutation(number, withoutSuffix, key) { + var format = { + 'mm' : "munutenn", + 'MM' : "miz", + 'dd' : "devezh", + 'yy' : "bloaz" + }; + return number + ' ' + mutation(format[key], number); +} + +function mutation(text, number) { + if (number === 2) { + return softMutation(text); + } + return text; +} + +function softMutation(text) { + var mutationTable = { + 'm' : 'v', + 'b' : 'v', + 'd' : 'z' + }; + if (mutationTable[text.charAt(0)] === undefined) { + return text; + } + return mutationTable[text.charAt(0)] + text.substring(1); +} + require('../moment').lang('br', { months : "Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"), monthsShort : "Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"), @@ -16,27 +45,27 @@ require('../moment').lang('br', { LLLL : "dddd, D [a viz] MMMM YYYY LT" }, calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', + sameDay : '[Hiziv da] LT', + nextDay : '[Warc\'hoazh da] LT', + nextWeek : 'dddd [da] LT', + lastDay : '[Dec\'h da] LT', + lastWeek : 'dddd [paset da] LT', sameElse : 'L' }, relativeTime : { - future : "in %s", - past : "%s ago", - s : "a few seconds", - m : "a minute", - mm : "%d minutes", - h : "an hour", - hh : "%d hours", - d : "a day", - dd : "%d days", - M : "a month", - MM : "%d months", - y : "a year", - yy : "%d years" + future : "a-benn %s", + past : "%s 'zo", + s : "un nebeud segondennoù", + m : "ur vunutenn", + mm : relativeTimeWithMutation, + h : "un eur", + hh : "%d eur", + d : "un devezh", + dd : relativeTimeWithMutation, + M : "ur miz", + MM : relativeTimeWithMutation, + y : "ur vloaz", + yy : relativeTimeWithMutation }, ordinal : function (number) { var output = (number === 1) ? 'añ' : 'vet'; diff --git a/test/lang/br.js b/test/lang/br.js index e57995230..5506df57c 100644 --- a/test/lang/br.js +++ b/test/lang/br.js @@ -116,5 +116,141 @@ exports["lang:br"] = { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); + }, + + "format week" : function(test) { + test.expect(7); + moment.lang('br'); + var expected = "Sul Sul Su_Lun Lun Lu_Meurzh Meu Me_Merc'her Mer Mer_Yaou Yao Ya_Gwener Gwe Gw_Sadorn Sad Sa".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('br'); + var start = moment([2007, 1, 28]); + test.equal(start.from(moment([2007, 1, 28]).add({s:44}), true), "un nebeud segondennoù", "44 seconds = a few seconds"); + test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true), "ur vunutenn", "45 seconds = a minute"); + test.equal(start.from(moment([2007, 1, 28]).add({s:89}), true), "ur vunutenn", "89 seconds = a minute"); + test.equal(start.from(moment([2007, 1, 28]).add({s:90}), true), "2 vunutenn", "90 seconds = 2 minutes"); + test.equal(start.from(moment([2007, 1, 28]).add({m:44}), true), "44 munutenn", "44 minutes = 44 minutes"); + test.equal(start.from(moment([2007, 1, 28]).add({m:45}), true), "un eur", "45 minutes = an hour"); + test.equal(start.from(moment([2007, 1, 28]).add({m:89}), true), "un eur", "89 minutes = an hour"); + test.equal(start.from(moment([2007, 1, 28]).add({m:90}), true), "2 eur", "90 minutes = 2 hours"); + test.equal(start.from(moment([2007, 1, 28]).add({h:5}), true), "5 eur", "5 hours = 5 hours"); + test.equal(start.from(moment([2007, 1, 28]).add({h:21}), true), "21 eur", "21 hours = 21 hours"); + test.equal(start.from(moment([2007, 1, 28]).add({h:22}), true), "un devezh", "22 hours = a day"); + test.equal(start.from(moment([2007, 1, 28]).add({h:35}), true), "un devezh", "35 hours = a day"); + test.equal(start.from(moment([2007, 1, 28]).add({h:36}), true), "2 zevezh", "36 hours = 2 days"); + test.equal(start.from(moment([2007, 1, 28]).add({d:1}), true), "un devezh", "1 day = a day"); + test.equal(start.from(moment([2007, 1, 28]).add({d:5}), true), "5 devezh", "5 days = 5 days"); + test.equal(start.from(moment([2007, 1, 28]).add({d:25}), true), "25 devezh", "25 days = 25 days"); + test.equal(start.from(moment([2007, 1, 28]).add({d:26}), true), "ur miz", "26 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d:30}), true), "ur miz", "30 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d:45}), true), "ur miz", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d:46}), true), "2 viz", "46 days = 2 months"); + test.equal(start.from(moment([2007, 1, 28]).add({d:74}), true), "2 viz", "75 days = 2 months"); + test.equal(start.from(moment([2007, 1, 28]).add({d:76}), true), "3 miz", "76 days = 3 months"); + test.equal(start.from(moment([2007, 1, 28]).add({M:1}), true), "ur miz", "1 month = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({M:5}), true), "5 miz", "5 months = 5 months"); + test.equal(start.from(moment([2007, 1, 28]).add({d:344}), true), "11 miz", "344 days = 11 months"); + test.equal(start.from(moment([2007, 1, 28]).add({d:345}), true), "ur vloaz", "345 days = a year"); + test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "ur vloaz", "547 days = a year"); + test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 vloaz", "548 days = 2 years"); + test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true), "ur vloaz", "1 year = a year"); + test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true), "5 bloaz", "5 years = 5 years"); + test.done(); + }, + + "suffix" : function(test) { + test.expect(2); + moment.lang('br'); + test.equal(moment(30000).from(0), "a-benn un nebeud segondennoù", "prefix"); + test.equal(moment(0).from(30000), "un nebeud segondennoù 'zo", "suffix"); + test.done(); + }, + + "now from now" : function(test) { + test.expect(1); + moment.lang('br'); + test.equal(moment().fromNow(), "un nebeud segondennoù 'zo", "now from now should display as in the past"); + test.done(); + }, + + "fromNow" : function(test) { + test.expect(2); + moment.lang('br'); + test.equal(moment().add({s:30}).fromNow(), "a-benn un nebeud segondennoù", "in a few seconds"); + test.equal(moment().add({d:5}).fromNow(), "a-benn 5 devezh", "in 5 days"); + test.done(); + }, + + "calendar day" : function(test) { + test.expect(6); + moment.lang('br'); + + var a = moment().hours(2).minutes(0).seconds(0); + + test.equal(moment(a).calendar(), "Hiziv da 2e00 AM", "today at the same time"); + test.equal(moment(a).add({ m: 25 }).calendar(), "Hiziv da 2e25 AM", "Now plus 25 min"); + test.equal(moment(a).add({ h: 1 }).calendar(), "Hiziv da 3e00 AM", "Now plus 1 hour"); + test.equal(moment(a).add({ d: 1 }).calendar(), "Warc'hoazh da 2e00 AM", "tomorrow at the same time"); + test.equal(moment(a).subtract({ h: 1 }).calendar(), "Hiziv da 1e00 AM", "Now minus 1 hour"); + test.equal(moment(a).subtract({ d: 1 }).calendar(), "Dec'h da 2e00 AM", "yesterday at the same time"); + test.done(); + }, + + "calendar next week" : function(test) { + test.expect(15); + moment.lang('br'); + + var i; + var m; + + for (i = 2; i < 7; i++) { + m = moment().add({ d: i }); + test.equal(m.calendar(), m.format('dddd [da] LT'), "Today + " + i + " days current time"); + m.hours(0).minutes(0).seconds(0).milliseconds(0); + test.equal(m.calendar(), m.format('dddd [da] LT'), "Today + " + i + " days beginning of day"); + m.hours(23).minutes(59).seconds(59).milliseconds(999); + test.equal(m.calendar(), m.format('dddd [da] LT'), "Today + " + i + " days end of day"); + } + test.done(); + }, + + "calendar last week" : function(test) { + test.expect(15); + moment.lang('br'); + + for (i = 2; i < 7; i++) { + m = moment().subtract({ d: i }); + test.equal(m.calendar(), m.format('dddd [paset da] LT'), "Today - " + i + " days current time"); + m.hours(0).minutes(0).seconds(0).milliseconds(0); + test.equal(m.calendar(), m.format('dddd [paset da] LT'), "Today - " + i + " days beginning of day"); + m.hours(23).minutes(59).seconds(59).milliseconds(999); + test.equal(m.calendar(), m.format('dddd [paset da] LT'), "Today - " + i + " days end of day"); + } + test.done(); + }, + + "calendar all else" : function(test) { + test.expect(4); + moment.lang('br'); + 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(); } };