[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 c8465d5bd8111443f8aa01ef6d9c8b9ae8e7dd85..596ae7fbdfba24cc5fd8c8011c94a7d1c189e203 100644 (file)
--- 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 f6c454cd3c95545784582ec8441f0d3407ee4036..87fcbde662b282a8b9fe9c2d3f01f9e2861b8cf4 100644 (file)
--- 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 cc9cd3b0f0a1ec069717cb283c5bdbafd55fc592..39f9447eb9950fae44d0a883c6d305a96eafea2f 100644 (file)
--- 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 e7065442baea648b747a2940bb0ef08d19b37ea5..2fdbac1ed535fce7a5331efac5d1a9614ca8e1c5 100644 (file)
--- 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 84df555244097bb8bf4da6019ea493c8d7c1e062..4eca5815b41d171b950459fe594df179400e7cb3 100644 (file)
--- 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 777fde89418818d3d1717d1984ca7fa652cfbdc7..7d28bc6bbca8b8591d1d60c3c88f9179ab29cfc7 100644 (file)
--- 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'
+    );
+});