From: Øystein Date: Thu, 5 Nov 2015 14:40:58 +0000 (+0100) Subject: Added dot after days and [kl.] on time formats for "nn" locale X-Git-Tag: 2.11.0~25^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1294c4c64e41af6fb3b4a2aef0c8094e7b6c996a;p=thirdparty%2Fmoment.git Added dot after days and [kl.] on time formats for "nn" locale --- diff --git a/src/locale/nn.js b/src/locale/nn.js index 3f284b3cb..822a44c09 100644 --- a/src/locale/nn.js +++ b/src/locale/nn.js @@ -14,9 +14,9 @@ export default moment.defineLocale('nn', { LT : 'HH:mm', LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' + LL : 'D. MMMM YYYY', + LLL : 'D. MMMM YYYY [kl.] H:mm', + LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm' }, calendar : { sameDay: '[I dag klokka] LT', diff --git a/src/test/locale/nn.js b/src/test/locale/nn.js index faf8222a2..a9289952e 100644 --- a/src/test/locale/nn.js +++ b/src/test/locale/nn.js @@ -38,13 +38,13 @@ test('format', function (assert) { ['[the] DDDo [day of the year]', 'the 45. day of the year'], ['LTS', '15:25:50'], ['L', '14.02.2010'], - ['LL', '14 februar 2010'], - ['LLL', '14 februar 2010 15:25'], - ['LLLL', 'sundag 14 februar 2010 15:25'], + ['LL', '14. februar 2010'], + ['LLL', '14. februar 2010 kl. 15:25'], + ['LLLL', 'sundag 14. februar 2010 kl. 15:25'], ['l', '14.2.2010'], - ['ll', '14 feb 2010'], - ['lll', '14 feb 2010 15:25'], - ['llll', 'sun 14 feb 2010 15:25'] + ['ll', '14. feb 2010'], + ['lll', '14. feb 2010 kl. 15:25'], + ['llll', 'sun 14. feb 2010 kl. 15:25'] ], b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)), i;