Added custom translations for specific suffixes

src/Jenssegers/Date/Date.php

@@ -99,32 +99,29 @@ public function diffForHumans(Carbon $since = null)
             $difference = floor($difference / $value);
         }
 
-        // Translate the unit part
-        $ago = $lang->choice("date::date.$unit", $difference);
-
-        // Translate the ending
+        // Select the suffix.
         if ($relative)
         {
-            if ($future)
-            {
-                return $lang->choice('date::date.after', $difference, array('time' => $ago));
-            }
-            else
-            {
-                return $lang->choice('date::date.before', $difference, array('time' => $ago));
-            }
+            $suffix = $future ? 'after' : 'before';
         }
         else
         {
-            if ($future)
-            {
-                return $lang->choice('date::date.from now', $difference, array('time' => $ago));
-            }
-            else
-            {
-                return $lang->choice('date::date.ago', $difference, array('time' => $ago));
-            }
+            $suffix = $future ? 'from_now' : 'ago';
+        }
+
+        // Some languages have different unit translations when used in combination
+        // with a specific suffix. Here we will check if there is an optional
+        // translation for that specific suffix and use it if it exists.
+        if ($lang->get("date::date.${unit}_${suffix}") != "${unit}_${suffix}")
+        {
+            $ago = $lang->choice("date::date.${unit}_${suffix}", $difference);
         }
+        else
+        {
+            $ago = $lang->choice("date::date.$unit", $difference);
+        }
+
+        return $lang->choice("date::date.$suffix", $difference, array('time' => $ago));
     }
 
     /**

src/lang/da/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'for :time siden',
-    'from now'  => 'om :time fra nu',
+    'from_now'  => 'om :time fra nu',
     'after'     => ':time efter',
     'before'    => ':time før',
     'year'      => '1 år|:count år',

src/lang/de/date.php

@@ -12,8 +12,8 @@
     |
     */
 
-    'ago'       => 'vor :time|vor :timen',
-    'from now'  => ':time von jetzt',
+    'ago'       => 'vor :time',
+    'from_now'  => ':time von jetzt',
     'after'     => ':time nach',
     'before'    => ':time vor',
     'year'      => '1 Jahr|:count Jahre',
@@ -45,4 +45,12 @@
     'saturday'  => 'Samstag',
     'sunday'    => 'Sonntag',
 
+    'year_ago'      => '1 Jahr|:count Jahren',
+    'month_ago'     => '1 Monat|:count Monaten',
+    'week_ago'      => '1 Woche|:count Wochen',
+    'day_ago'       => '1 Tag|:count Tagen',
+    'hour_ago'      => '1 Stunde|:count Stunden',
+    'minute_ago'    => '1 Minute|:count Minuten',
+    'second_ago'    => '1 Sekunde|:count Sekunden',
+
 );

src/lang/el/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'πρίν απο :time',
-    'from now'  => 'σε :time απο τώρα',
+    'from_now'  => 'σε :time απο τώρα',
     'after'     => ':time μετά',
     'before'    => ':time πρίν',
     'year'      => '1 χρόνος|:count χρόνια',

src/lang/en/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time ago',
-    'from now'  => ':time from now',
+    'from_now'  => ':time from now',
     'after'     => ':time after',
     'before'    => ':time before',
     'year'      => '1 year|:count years',

src/lang/eo/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'antaŭ :time',
-    'from now'  => 'je :time',
+    'from_now'  => 'je :time',
     'after'     => ':time poste',
     'before'    => ':time antaŭe',
     'year'      => '1 jaro|:count jaroj',

src/lang/es/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'Hace :time',
-    'from now'  => 'Dentro de :time',
+    'from_now'  => 'Dentro de :time',
     'after'     => ':time después',
     'before'    => ':time antes',
     'year'      => '1 año|:count años',

src/lang/eu/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'Orain dela :time',
-    'from now'  => ':time barru',
+    'from_now'  => ':time barru',
     'after'     => ':time geroago',
     'before'    => ':time lehenago',
     'year'      => 'Urte 1|:count urte',

src/lang/fi/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time sitten',
-    'from now'  => ':time tästä hetkestä',
+    'from_now'  => ':time tästä hetkestä',
     'after'     => '',
     'before'    => '',
     'year'      => '1 vuosi|:count vuotta',

src/lang/fr/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'Il y a :time',
-    'from now'  => 'Dans :time',
+    'from_now'  => 'Dans :time',
     'after'     => ':time après',
     'before'    => ':time avant',
     'year'      => '1 an|:count ans',

src/lang/hr/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'Prije :time',
-    'from now'  => ':time od sad',
+    'from_now'  => ':time od sad',
     'after'     => 'Nakon :time',
     'before'    => 'Prije :time',
     'year'      => ':count godinu|:count godine|:count godina',

src/lang/hu/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time korábban',
-    'from now'  => ':time később',
+    'from_now'  => ':time később',
     'after'     => ':time később',
     'before'    => ':time korábban',
     'year'      => '1 évvel|:count évvel',

src/lang/it/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time fa',
-    'from now'  => 'tra :time',
+    'from_now'  => 'tra :time',
     'after'     => ':time dopo',
     'before'    => ':time prima',
     'year'      => '1 anno|:count anni',

src/lang/nl/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time geleden',
-    'from now'  => ':time vanaf nu',
+    'from_now'  => ':time vanaf nu',
     'after'     => ':time na',
     'before'    => ':time voor',
     'year'      => '1 jaar|:count jaren',

src/lang/pl/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time temu',
-    'from now'  => ':time od teraz',
+    'from_now'  => ':time od teraz',
     'after'     => ':time przed',
     'before'    => ':time po',
     'year'      => '1 rok|:count lata|:count lat',

src/lang/pt/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time atrás',
-    'from now'  => 'Em :time',
+    'from_now'  => 'Em :time',
     'after'     => ':time depois',
     'before'    => ':time antes',
     'year'      => '1 ano|:count anos',

src/lang/sr/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => 'Pre :time',
-    'from now'  => ':time od sada',
+    'from_now'  => ':time od sada',
     'after'     => 'Nakon :time',
     'before'    => 'Pre :time',
     'year'      => ':count godina|:count godine|:count godina',

src/lang/sv/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time sedan',
-    'from now'  => ':time från nu',
+    'from_now'  => ':time från nu',
     'after'     => '',
     'before'    => '',
     'year'      => '1 år|:count år',

src/lang/tr/date.php

@@ -13,7 +13,7 @@
     */
 
     'ago'       => ':time önce',
-    'from now'  => ':time sonra',
+    'from_now'  => ':time sonra',
     'after'     => '',
     'before'    => '',
     'year'      => ':count yıl',

tests/TranslationTest.php

@@ -37,7 +37,7 @@ public function testMultiplePluralForms()
         $this->assertSame("Prije 5 godina", $date->ago());
     }
 
-    public function testMultipleAgo()
+    public function testCustomSuffix()
     {
         Date::setLocale('de');
 
@@ -46,6 +46,9 @@ public function testMultipleAgo()
 
         $date = Date::parse('-5 months');
         $this->assertSame("vor 5 Monaten", $date->ago());
+
+        $date = Date::parse('-5 seconds');
+        $this->assertSame("vor 5 Sekunden", $date->ago());
     }
 
     public function testTranslatesMonths()
@@ -113,7 +116,7 @@ public function testTranslatesDiffForHumans()
     {
         $items = array(
             'ago',
-            'from now',
+            'from_now',
             'after',
             'before',
             'year',
@@ -139,13 +142,13 @@ public function testTranslatesDiffForHumans()
                     continue;
                 }
 
-                if (in_array($item, array('ago', 'from now', 'after', 'before')))
+                if (in_array($item, array('ago', 'from_now', 'after', 'before')))
                 {
-                    $this->assertContains(':time', $translations[$item]);
+                    $this->assertContains(':time', $translations[$item], "Language: $language");
                 }
                 else
                 {
-                    $this->assertContains(':count', $translations[$item]);
+                    $this->assertContains(':count', $translations[$item], "Language: $language");
                 }
             }
         }