Breton : move from 12-hour to 24-hour notation moment#4974 moment#4974

jbleduigou · Jan 29, 2019 · f246c98 · f246c98
1 parent 0aae724
commit f246c98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git 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[e]mm',
+        LTS : 'HH[e]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[e]mm',
+        LLLL : 'dddd, D [a viz] MMMM YYYY HH[e]mm'
     },
     calendar : {
         sameDay : '[Hiziv da] LT',

diff --git 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 15e25'],
+            ['LLLL',                               'Sul, 14 a viz C\'hwevrer 2010 15e25']
         ],
         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 12e00',        'today at the same time');
+    assert.equal(moment(a).add({m: 25}).calendar(),      'Hiziv da 12e25',        'Now plus 25 min');
+    assert.equal(moment(a).add({h: 1}).calendar(),       'Hiziv da 13e00',         'Now plus 1 hour');
+    assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hiziv da 11e00',         'Now plus 1 hour');
+    assert.equal(moment(a).add({d: 1}).calendar(),       'Warc\'hoazh da 12e00',  'tomorrow at the same time');
+    assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hiziv da 11e00',        'Now minus 1 hour');
+    assert.equal(moment(a).subtract({d: 1}).calendar(),  'Dec\'h da 12e00',       'yesterday at the same time');
 });
 
 test('calendar next week', function (assert) {