Fixed humanization of time unit less than 1 second (coduo#125)

* Fixed humanization of time unit less than 1 second

* Added support for 0 seconds

Author: norberttech

src/Coduo/PHPHumanizer/Aeon/Calendar/UnitCompound.php

@@ -65,14 +65,16 @@ public function components() : array
                 $compoundResults[] = new CompoundResult(new Minute(), $unit->inTimeMinutes());
             }
 
-            if ($unit->inTimeSeconds()) {
+            if ($unit->inTimeSeconds() || $unit->inTimeMilliseconds()) {
                 $seconds = $unit->inTimeSeconds();
 
                 if ($unit->inTimeMilliseconds() > 0) {
                     $seconds += $unit->inTimeMilliseconds() / 1000;
                 }
 
                 $compoundResults[] = new CompoundResult(new Second(), $seconds);
+            } elseif (!\count($compoundResults)) {
+                $compoundResults[] = new CompoundResult(new Second(), 0);
             }
 
             return $compoundResults;

src/Coduo/PHPHumanizer/Resources/translations/difference.af.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] nou nou"
   future: "[0,Inf] netnou"
 second:
-  past: "{1} %count% sekonde gelede|[2,Inf] %count% sekondes gelede"
-  future: "{1} %count% sekonde van nou af|[2,Inf] %count% sekondes van nou af"
+  past: "[0,1] %count% sekonde gelede|[2,Inf] %count% sekondes gelede"
+  future: "[0,1] %count% sekonde van nou af|[2,Inf] %count% sekondes van nou af"
 minute:
   past: "{1} %count% minuut gelede|[2,Inf] %count% minute gelede"
   future: "{1} %count% minuut van nou af|[2,Inf] %count% minute van nou af"
@@ -24,7 +24,7 @@ year:
   future: "{1} %count% jaar van nou af|[2,Inf] %count% jaar van nou af"
 
 compound:
-  second: "{1} %count% sekonde|[2,Inf] %count% sekondes"
+  second: "[0,1] %count% sekonde|[2,Inf] %count% sekondes"
   minute: "{1} %count% minuut|[2,Inf] %count% minute"
   hour: "{1} %count% uur|[2,Inf] %count% ure"
   day: "{1} %count% dag|[2,Inf] %count% dae"

src/Coduo/PHPHumanizer/Resources/translations/difference.az.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] indi"
   future: "[0,Inf] indi"
 second:
-  past: "{1} %count% saniyə əvvəl|[2,Inf] %count% saniyə əvvəl"
-  future: "{1} %count% saniyə sonra|[2,Inf] %count% saniyə sonra"
+  past: "[0,1] %count% saniyə əvvəl|[2,Inf] %count% saniyə əvvəl"
+  future: "[0,1] %count% saniyə sonra|[2,Inf] %count% saniyə sonra"
 minute:
   past: "{1} %count% dəqiqə əvvəl|[2,Inf] %count% dəqiqə əvvəl"
   future: "{1} %count% dəqiqə sonra|[2,Inf] %count% dəqiqə sonra"
@@ -24,7 +24,7 @@ year:
   future: "{1} %count% il sonra|[2,Inf] %count% il sonra"
 
 compound:
-  second: "{1} %count% saniyə|[2,Inf] %count% saniyə"
+  second: "[0,1] %count% saniyə|[2,Inf] %count% saniyə"
   minute: "{1} %count% dəqiqə|[2,Inf] %count% dəqiqə"
   hour: "{1} %count% saat|[2,Inf] %count% saat"
   day: "{1} %count% gün|[2,Inf] %count% gün"

src/Coduo/PHPHumanizer/Resources/translations/difference.bg.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] в момента"
   future: "[0,Inf] в момента"
 second:
-  past: "{1} преди %count% секунда|[2,Inf] преди %count% секунди"
-  future: "{1} след %count% секунда|[2,Inf] след %count% секунди"
+  past: "[0,1] преди %count% секунда|[2,Inf] преди %count% секунди"
+  future: "[0,1] след %count% секунда|[2,Inf] след %count% секунди"
 minute:
   past: "{1} преди %count% минута|[2,Inf] преди %count% минути"
   future: "{1} след %count% минута|[2,Inf] след %count% минути"
@@ -24,7 +24,7 @@ year:
   future: "{1} след %count% година|[2,Inf] след %count% години"
 
 compound:
-  second: "{1} %count% секунда|[2,Inf] %count% секунди"
+  second: "[0,1] %count% секунда|[2,Inf] %count% секунди"
   minute: "{1} %count% минута|[2,Inf] %count% минути"
   hour: "{1} %count% час|[2,Inf] %count% часа"
   day: "{1} %count% ден|[2,Inf] %count% дни"

src/Coduo/PHPHumanizer/Resources/translations/difference.da.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] lige nu"
   future: "[0,Inf] lige nu"
 second:
-  past: "{1} %count% sekund siden|[2,Inf] %count% sekunder siden"
-  future: "{1} %count% sekund fra nu|[2,Inf] %count% sekunder fra nu"
+  past: "[0,1] %count% sekund siden|[2,Inf] %count% sekunder siden"
+  future: "[0,1] %count% sekund fra nu|[2,Inf] %count% sekunder fra nu"
 minute:
   past: "{1} %count% minut siden|[2,Inf] %count% minutter siden"
   future: "{1} %count% minut fra nu|[2,Inf] %count% minutter fra nu"
@@ -24,7 +24,7 @@ year:
   future: "{1} %count% år fra nu|[2,Inf] %count% år fra nu"
 
 compound:
-  second: "{1} %count% sekund|[2,Inf] %count% sekunder"
+  second: "[0,1] %count% sekund|[2,Inf] %count% sekunder"
   minute: "{1} %count% minut|[2,Inf] %count% minutter"
   hour: "{1} %count% time|[2,Inf] %count% timer"
   day: "{1} %count% dag|[2,Inf] %count% dage"

src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] jetzt gerade"
   future: "[0,Inf] jetzt gerade"
 second:
-  past: "{1} vor %count% Sekunde|[2,Inf] vor %count% Sekunden"
-  future: "{1} in %count% Sekunde|[2,Inf] in %count% Sekunden"
+  past: "[0,1] vor %count% Sekunde|[2,Inf] vor %count% Sekunden"
+  future: "[0,1] in %count% Sekunde|[2,Inf] in %count% Sekunden"
 minute:
   past: "{1} vor %count% Minute|[2,Inf] vor %count% Minuten"
   future: "{1} in %count% Minute|[2,Inf] in %count% Minuten"
@@ -24,7 +24,7 @@ year:
   future: "{1} in %count% Jahr|[2,Inf] in %count% Jahren"
 
 compound:
-  second: "{1} %count% Sekunde|[2,Inf] %count% Sekunden"
+  second: "[0,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% Tagen"

src/Coduo/PHPHumanizer/Resources/translations/difference.en.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] just now"
   future: "[0,Inf] just now"
 second:
-  past: "{1} %count% second ago|[2,Inf] %count% seconds ago"
-  future: "{1} %count% second from now|[2,Inf] %count% seconds from now"
+  past: "[0,1] %count% second ago|[2,Inf] %count% seconds ago"
+  future: "[0,1] %count% second from now|[2,Inf] %count% seconds from now"
 minute:
   past: "{1} %count% minute ago|[2,Inf] %count% minutes ago"
   future: "{1} %count% minute from now|[2,Inf] %count% minutes from now"
@@ -24,7 +24,7 @@ year:
   future: "{1} %count% year from now|[2,Inf] %count% years from now"
 
 compound:
-  second: "{1} %count% second|[2,Inf] %count% seconds"
+  second: "[0,1] %count% second|[2,Inf] %count% seconds"
   minute: "{1} %count% minute|[2,Inf] %count% minutes"
   hour: "{1} %count% hour|[2,Inf] %count% hours"
   day: "{1} %count% day|[2,Inf] %count% days"

src/Coduo/PHPHumanizer/Resources/translations/difference.es.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] ahora mismo"
   future: "[0,Inf] ahora mismo"
 second:
-  past: "{1} hace %count% segundo |[2,Inf] hace %count% segundos"
-  future: "{1} dentro de %count% segundo|[2,Inf] dentro de %count% segundos"
+  past: "[0,1] hace %count% segundo |[2,Inf] hace %count% segundos"
+  future: "[0,1] dentro de %count% segundo|[2,Inf] dentro de %count% segundos"
 minute:
   past: "{1} hace %count% minuto|[2,Inf] hace %count% minutos"
   future: "{1} dentro de %count% minuto|[2,Inf] dentro de %count% minutos"
@@ -24,7 +24,7 @@ year:
   future: "{1} dentro de %count% año|[2,Inf] dentro de %count% años"
 
 compound:
-  second: "{1} %count% segundo|[2,Inf] %count% segundos"
+  second: "[0,1] %count% segundo|[2,Inf] %count% segundos"
   minute: "{1} %count% minuto|[2,Inf] %count% minutos"
   hour: "{1} %count% hora|[2,Inf] %count% horas"
   day: "{1} %count% día|[2,Inf] %count% días"

src/Coduo/PHPHumanizer/Resources/translations/difference.fr.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] à l'instant"
   future: "[0,Inf] à l'instant"
 second:
-  past: "{1} il y a %count% seconde|[2,Inf] il y a %count% secondes"
-  future: "{1} il y a maintenant %count% seconde|[2,Inf] il y a maintenant %count% secondes"
+  past: "[0,1] il y a %count% seconde|[2,Inf] il y a %count% secondes"
+  future: "[0,1] il y a maintenant %count% seconde|[2,Inf] il y a maintenant %count% secondes"
 minute:
   past: "{1} il y a %count% minute|[2,Inf] il y a %count% minutes"
   future: "{1} il y a maintenant %count% minute|[2,Inf] il y a maintenant %count% minutes"
@@ -24,7 +24,7 @@ year:
   future: "{1} il y a maintenant %count% année|[2,Inf] il y a maintenant %count% années"
 
 compound:
-  second: "{1} %count% seconde|[2,Inf] %count% secondes"
+  second: "[0,1] %count% seconde|[2,Inf] %count% secondes"
   minute: "{1} %count% minute|[2,Inf] %count% minutes"
   hour: "{1} %count% heure|[2,Inf] %count% heures"
   day: "{1} %count% jour|[2,Inf] %count% jours"

src/Coduo/PHPHumanizer/Resources/translations/difference.id.yml

@@ -2,8 +2,8 @@ just_now:
   past: "[0,Inf] baru saja"
   future: "[0,Inf] baru saja"
 second:
-  past: "{1} %count% detik yang lalu|[2,Inf] %count% detik yang lalu"
-  future: "{1} %count% detik dari sekarang|[2,Inf] %count% detik dari sekarang"
+  past: "[0,1] %count% detik yang lalu|[2,Inf] %count% detik yang lalu"
+  future: "[0,1] %count% detik dari sekarang|[2,Inf] %count% detik dari sekarang"
 minute:
   past: "{1} %count% menit yang lalu|[2,Inf] %count% menit yang lalu"
   future: "{1} %count% menit dari sekarang|[2,Inf] %count% menit dari sekarang"
@@ -24,7 +24,7 @@ year:
   future: "{1} %count% tahun dari sekarang|[2,Inf] %count% tahun dari sekarang"
 
 compound:
-  second: "{1} %count% detik|[2,Inf] %count% detik"
+  second: "[0,1] %count% detik|[2,Inf] %count% detik"
   minute: "{1} %count% menit|[2,Inf] %count% menit"
   hour: "{1} %count% jam|[2,Inf] %count% jam"
   day: "{1} %count% hari|[2,Inf] %count% hari"