From 63420bc7d441b676f90f08c185d1c7bbe55d2d58 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Le Duigou Date: Mon, 10 Jun 2019 10:03:33 +0200 Subject: [PATCH] [locale] (br) Breton move from 12-hour to 24-hour notation (#4975) * Breton : move from 12-hour to 24-hour notation #4974 https://github.com/moment/moment/issues/4974 * Replace [e] by : --- src/locale/br.js | 8 ++++---- src/test/locale/br.js | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/locale/br.js b/src/locale/br.js index 7208f7939..6a67a8736 100644 --- a/src/locale/br.js +++ b/src/locale/br.js @@ -56,12 +56,12 @@ export default moment.defineLocale('br', { weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'), weekdaysParseExact : true, longDateFormat : { - LT : 'h[e]mm A', - LTS : 'h[e]mm:ss A', + LT : 'HH:mm', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D [a viz] MMMM YYYY', - LLL : 'D [a viz] MMMM YYYY h[e]mm A', - LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A' + LLL : 'D [a viz] MMMM YYYY HH:mm', + LLLL : 'dddd, D [a viz] MMMM YYYY HH:mm' }, calendar : { sameDay : '[Hiziv da] LT', diff --git a/src/test/locale/br.js b/src/test/locale/br.js index b31d66d2f..ebd9cdc44 100644 --- a/src/test/locale/br.js +++ b/src/test/locale/br.js @@ -39,8 +39,8 @@ test('format', function (assert) { ['DDDo [devezh] [ar] [vloaz]', '45vet devezh ar vloaz'], ['L', '14/02/2010'], ['LL', '14 a viz C\'hwevrer 2010'], - ['LLL', '14 a viz C\'hwevrer 2010 3e25 PM'], - ['LLLL', 'Sul, 14 a viz C\'hwevrer 2010 3e25 PM'] + ['LLL', '14 a viz C\'hwevrer 2010 15:25'], + ['LLLL', 'Sul, 14 a viz C\'hwevrer 2010 15:25'] ], b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)), i; @@ -158,12 +158,13 @@ test('calendar day', function (assert) { var a = moment().hours(12).minutes(0).seconds(0); - assert.equal(moment(a).calendar(), 'Hiziv da 12e00 PM', 'today at the same time'); - assert.equal(moment(a).add({m: 25}).calendar(), 'Hiziv da 12e25 PM', 'Now plus 25 min'); - assert.equal(moment(a).add({h: 1}).calendar(), 'Hiziv da 1e00 PM', 'Now plus 1 hour'); - assert.equal(moment(a).add({d: 1}).calendar(), 'Warc\'hoazh da 12e00 PM', 'tomorrow at the same time'); - assert.equal(moment(a).subtract({h: 1}).calendar(), 'Hiziv da 11e00 AM', 'Now minus 1 hour'); - assert.equal(moment(a).subtract({d: 1}).calendar(), 'Dec\'h da 12e00 PM', 'yesterday at the same time'); + assert.equal(moment(a).calendar(), 'Hiziv da 12:00', 'today at the same time'); + assert.equal(moment(a).add({m: 25}).calendar(), 'Hiziv da 12:25', 'Now plus 25 min'); + assert.equal(moment(a).add({h: 1}).calendar(), 'Hiziv da 13:00', 'Now plus 1 hour'); + assert.equal(moment(a).add({h: 3}).calendar(), 'Hiziv da 15:00', 'Now plus 3 hour'); + assert.equal(moment(a).subtract({h: 1}).calendar(), 'Hiziv da 11:00', 'Now minus 1 hour'); + assert.equal(moment(a).add({d: 1}).calendar(), 'Warc\'hoazh da 12:00', 'tomorrow at the same time'); + assert.equal(moment(a).subtract({d: 1}).calendar(), 'Dec\'h da 12:00', 'yesterday at the same time'); }); test('calendar next week', function (assert) { -- 2.47.3