From: Carl Richter Date: Wed, 20 May 2020 19:34:21 +0000 (+0200) Subject: [locale] de, de-at, de-ch: add german translation for week (#5520) X-Git-Tag: 2.27.0~13 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=57f9a8fdf532415a788328be3709a088c0321717;p=thirdparty%2Fmoment.git [locale] de, de-at, de-ch: add german translation for week (#5520) --- diff --git a/src/locale/de-at.js b/src/locale/de-at.js index c8465d5bd..596ae7fbd 100644 --- a/src/locale/de-at.js +++ b/src/locale/de-at.js @@ -13,6 +13,7 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) { h: ['eine Stunde', 'einer Stunde'], d: ['ein Tag', 'einem Tag'], dd: [number + ' Tage', number + ' Tagen'], + w: ['eine Woche', 'einer Woche'], M: ['ein Monat', 'einem Monat'], MM: [number + ' Monate', number + ' Monaten'], y: ['ein Jahr', 'einem Jahr'], @@ -62,6 +63,8 @@ export default moment.defineLocale('de-at', { hh: '%d Stunden', d: processRelativeTime, dd: processRelativeTime, + w: processRelativeTime, + ww: '%d Wochen', M: processRelativeTime, MM: processRelativeTime, y: processRelativeTime, diff --git a/src/locale/de-ch.js b/src/locale/de-ch.js index f6c454cd3..87fcbde66 100644 --- a/src/locale/de-ch.js +++ b/src/locale/de-ch.js @@ -12,6 +12,7 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) { h: ['eine Stunde', 'einer Stunde'], d: ['ein Tag', 'einem Tag'], dd: [number + ' Tage', number + ' Tagen'], + w: ['eine Woche', 'einer Woche'], M: ['ein Monat', 'einem Monat'], MM: [number + ' Monate', number + ' Monaten'], y: ['ein Jahr', 'einem Jahr'], @@ -61,6 +62,8 @@ export default moment.defineLocale('de-ch', { hh: '%d Stunden', d: processRelativeTime, dd: processRelativeTime, + w: processRelativeTime, + ww: '%d Wochen', M: processRelativeTime, MM: processRelativeTime, y: processRelativeTime, diff --git a/src/locale/de.js b/src/locale/de.js index cc9cd3b0f..39f9447eb 100644 --- a/src/locale/de.js +++ b/src/locale/de.js @@ -12,6 +12,7 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) { h: ['eine Stunde', 'einer Stunde'], d: ['ein Tag', 'einem Tag'], dd: [number + ' Tage', number + ' Tagen'], + w: ['eine Woche', 'einer Woche'], M: ['ein Monat', 'einem Monat'], MM: [number + ' Monate', number + ' Monaten'], y: ['ein Jahr', 'einem Jahr'], @@ -61,6 +62,8 @@ export default moment.defineLocale('de', { hh: '%d Stunden', d: processRelativeTime, dd: processRelativeTime, + w: processRelativeTime, + ww: '%d Wochen', M: processRelativeTime, MM: processRelativeTime, y: processRelativeTime, diff --git a/src/test/locale/de-at.js b/src/test/locale/de-at.js index e7065442b..2fdbac1ed 100644 --- a/src/test/locale/de-at.js +++ b/src/test/locale/de-at.js @@ -431,3 +431,46 @@ test('weeks year starting sunday formatted', function (assert) { 'Jan 15 2012 should be week 2' ); }); + +test('duration humanize week threshold', function (assert) { + assert.equal( + moment.duration(1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize(true, { d: 7, w: 4 }), + 'vor einer Woche', + 'a week ago' + ); + assert.equal( + moment.duration(1, 'week').humanize(true, { d: 7, w: 4 }), + 'in einer Woche', + 'in a week' + ); + assert.equal( + moment.duration(2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(-2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(2, 'week').humanize(true, { d: 7, w: 4 }), + 'in 2 Wochen', + 'in 2 week' + ); + assert.equal( + moment.duration(-2, 'week').humanize(true, { d: 7, w: 4 }), + 'vor 2 Wochen', + '2 weeks ago' + ); +}); diff --git a/src/test/locale/de-ch.js b/src/test/locale/de-ch.js index 84df55524..4eca5815b 100644 --- a/src/test/locale/de-ch.js +++ b/src/test/locale/de-ch.js @@ -436,3 +436,46 @@ test('weeks year starting sunday formatted', function (assert) { 'Jan 15 2012 should be week 2' ); }); + +test('duration humanize week threshold', function (assert) { + assert.equal( + moment.duration(1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize(true, { d: 7, w: 4 }), + 'vor einer Woche', + 'a week ago' + ); + assert.equal( + moment.duration(1, 'week').humanize(true, { d: 7, w: 4 }), + 'in einer Woche', + 'in a week' + ); + assert.equal( + moment.duration(2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(-2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(2, 'week').humanize(true, { d: 7, w: 4 }), + 'in 2 Wochen', + 'in 2 week' + ); + assert.equal( + moment.duration(-2, 'week').humanize(true, { d: 7, w: 4 }), + 'vor 2 Wochen', + '2 weeks ago' + ); +}); diff --git a/src/test/locale/de.js b/src/test/locale/de.js index 777fde894..7d28bc6bb 100644 --- a/src/test/locale/de.js +++ b/src/test/locale/de.js @@ -435,3 +435,46 @@ test('weeks year starting sunday formatted', function (assert) { 'Jan 15 2012 should be week 2' ); }); + +test('duration humanize week threshold', function (assert) { + assert.equal( + moment.duration(1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize({ d: 7, w: 4 }), + 'eine Woche', + 'a week' + ); + assert.equal( + moment.duration(-1, 'week').humanize(true, { d: 7, w: 4 }), + 'vor einer Woche', + 'a week ago' + ); + assert.equal( + moment.duration(1, 'week').humanize(true, { d: 7, w: 4 }), + 'in einer Woche', + 'in a week' + ); + assert.equal( + moment.duration(2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(-2, 'week').humanize({ d: 7, w: 4 }), + '2 Wochen', + '2 weeks' + ); + assert.equal( + moment.duration(2, 'week').humanize(true, { d: 7, w: 4 }), + 'in 2 Wochen', + 'in 2 week' + ); + assert.equal( + moment.duration(-2, 'week').humanize(true, { d: 7, w: 4 }), + 'vor 2 Wochen', + '2 weeks ago' + ); +});