From c995b2c6e31224d8e751c05359d24fb3176a1b12 Mon Sep 17 00:00:00 2001 From: Enrico Date: Fri, 20 Nov 2015 18:10:53 +0100 Subject: [PATCH 1/2] fix german translation --- .../Resources/translations/difference.de.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml b/src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml index 8585f99..46fa38d 100644 --- a/src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml +++ b/src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml @@ -27,9 +27,9 @@ compound: second: "{1} %count% Sekunde|[2,Inf] %count% Sekunden" minute: "{1} %count% Minute|[2,Inf] %count% Minuten" hour: "{1} %count% Stunde|[2,Inf] %count% Stunden" - day: "{1} %count% Tag|[2,Inf] %count% Tage" + day: "{1} %count% Tag|[2,Inf] %count% Tagen" week: "{1} %count% Woche|[2,Inf] %count% Wochen" - month: "{1} %count% Monat|[2,Inf] %count% Monate" - year: "{1} %count% Jahr|[2,Inf] %count% Jahre" - past: "%value% vor" - future: "%value% ab jetzt" + month: "{1} %count% Monat|[2,Inf] %count% Monaten" + year: "{1} %count% Jahr|[2,Inf] %count% Jahren" + past: "vor %value%" + future: "in %value%" From ecae2fa1da5f1fe7c9c58214b2872097be304a4d Mon Sep 17 00:00:00 2001 From: Enrico Date: Fri, 20 Nov 2015 18:14:04 +0100 Subject: [PATCH 2/2] change tests to new translation --- tests/Coduo/PHPHumanizer/Tests/DateTimeTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Coduo/PHPHumanizer/Tests/DateTimeTest.php b/tests/Coduo/PHPHumanizer/Tests/DateTimeTest.php index 5b1d83e..02d7c5f 100644 --- a/tests/Coduo/PHPHumanizer/Tests/DateTimeTest.php +++ b/tests/Coduo/PHPHumanizer/Tests/DateTimeTest.php @@ -233,14 +233,14 @@ public function preciseDifferenceDataProvider() array("2014-04-26 13:00:00", "2016-04-27 13:00:00", '2 lata, 1 dzień od teraz', 'pl'), // German - array("2014-04-26 13:00:00", "2014-04-26 12:58:15", '1 Minute, 45 Sekunden vor', 'de'), - array("2014-04-26 13:00:00", "2014-04-26 11:20:00", '1 Stunde, 40 Minuten vor', 'de'), - array("2014-04-26 13:00:00", "2014-04-27 13:15:00", '1 Tag, 15 Minuten ab jetzt', 'de'), - array("2014-04-26 13:00:00", "2014-05-03 15:00:00", '7 Tage, 2 Stunden ab jetzt', 'de'), - array("2014-04-26 13:00:00", "2015-04-28 17:00:00", '1 Jahr, 2 Tage, 4 Stunden ab jetzt', 'de'), - array("2014-04-26 13:00:00", "2014-04-28 23:00:00", '2 Tage, 10 Stunden ab jetzt', 'de'), - array("2014-04-26 13:00:00", "2014-04-25 11:20:00", '1 Tag, 1 Stunde, 40 Minuten vor', 'de'), - array("2014-04-26 13:00:00", "2016-04-27 13:00:00", '2 Jahre, 1 Tag ab jetzt', 'de'), + array("2014-04-26 13:00:00", "2014-04-26 12:58:15", 'vor 1 Minute, 45 Sekunden', 'de'), + array("2014-04-26 13:00:00", "2014-04-26 11:20:00", 'vor 1 Stunde, 40 Minuten', 'de'), + array("2014-04-26 13:00:00", "2014-04-27 13:15:00", 'in 1 Tag, 15 Minuten', 'de'), + array("2014-04-26 13:00:00", "2014-05-03 15:00:00", 'in 7 Tagen, 2 Stunden', 'de'), + array("2014-04-26 13:00:00", "2015-04-28 17:00:00", 'in 1 Jahr, 2 Tagen, 4 Stunden', 'de'), + array("2014-04-26 13:00:00", "2014-04-28 23:00:00", 'in 2 Tagen, 10 Stunden', 'de'), + array("2014-04-26 13:00:00", "2014-04-25 11:20:00", 'vor 1 Tag, 1 Stunde, 40 Minuten', 'de'), + array("2014-04-26 13:00:00", "2016-04-27 13:00:00", 'in 2 Jahren, 1 Tag', 'de'), // Turkish array("2014-04-26 13:00:00", "2014-04-26 12:58:15", '1 dakika, 45 saniye önce', 'tr'),