From: youenn.bouglouan Date: Mon, 21 Dec 2020 14:03:37 +0000 (+0100) Subject: updated locale file in src/ and src/test/ folders, reverted changes in locale/ folder X-Git-Tag: 2.30.0~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec974739cee5fc493f62b9b26ddbcc4450df052;p=thirdparty%2Fmoment.git updated locale file in src/ and src/test/ folders, reverted changes in locale/ folder --- diff --git a/locale/nb.js b/locale/nb.js index 1f271aae2..74da7aff5 100644 --- a/locale/nb.js +++ b/locale/nb.js @@ -47,13 +47,13 @@ ss: '%d sekunder', m: 'ett minutt', mm: '%d minutter', - h: 'én time', + h: 'en time', hh: '%d timer', - d: 'én dag', + d: 'en dag', dd: '%d dager', - w: 'én uke', + w: 'en uke', ww: '%d uker', - M: 'én måned', + M: 'en måned', MM: '%d måneder', y: 'ett år', yy: '%d år', diff --git a/src/locale/nb.js b/src/locale/nb.js index c218f518f..cce3aaa9f 100644 --- a/src/locale/nb.js +++ b/src/locale/nb.js @@ -40,13 +40,13 @@ export default moment.defineLocale('nb', { ss: '%d sekunder', m: 'ett minutt', mm: '%d minutter', - h: 'en time', + h: 'én time', hh: '%d timer', - d: 'en dag', + d: 'én dag', dd: '%d dager', - w: 'en uke', + w: 'én uke', ww: '%d uker', - M: 'en måned', + M: 'én måned', MM: '%d måneder', y: 'ett år', yy: '%d år', diff --git a/src/test/locale/nb.js b/src/test/locale/nb.js index 123cbb39b..b2b684843 100644 --- a/src/test/locale/nb.js +++ b/src/test/locale/nb.js @@ -178,12 +178,12 @@ test('from', function (assert) { ); assert.equal( start.from(moment([2007, 1, 28]).add({ m: 45 }), true), - 'en time', + 'én time', '45 minutes = an hour' ); assert.equal( start.from(moment([2007, 1, 28]).add({ m: 89 }), true), - 'en time', + 'én time', '89 minutes = an hour' ); assert.equal( @@ -203,12 +203,12 @@ test('from', function (assert) { ); assert.equal( start.from(moment([2007, 1, 28]).add({ h: 22 }), true), - 'en dag', + 'én dag', '22 hours = a day' ); assert.equal( start.from(moment([2007, 1, 28]).add({ h: 35 }), true), - 'en dag', + 'én dag', '35 hours = a day' ); assert.equal( @@ -218,7 +218,7 @@ test('from', function (assert) { ); assert.equal( start.from(moment([2007, 1, 28]).add({ d: 1 }), true), - 'en dag', + 'én dag', '1 day = a day' ); assert.equal( @@ -233,17 +233,17 @@ test('from', function (assert) { ); assert.equal( start.from(moment([2007, 1, 28]).add({ d: 26 }), true), - 'en måned', + 'én måned', '26 days = a month' ); assert.equal( start.from(moment([2007, 1, 28]).add({ d: 30 }), true), - 'en måned', + 'én måned', '30 days = a month' ); assert.equal( start.from(moment([2007, 1, 28]).add({ d: 43 }), true), - 'en måned', + 'én måned', '43 days = a month' ); assert.equal( @@ -263,7 +263,7 @@ test('from', function (assert) { ); assert.equal( start.from(moment([2007, 1, 28]).add({ M: 1 }), true), - 'en måned', + 'én måned', '1 month = a month' ); assert.equal(