Merge pull request #3846 from ThyThal/8.x.x

(Update) timeElapsed now returns used values only
HDInnovations · May 22, 2024 · 9612204 · 9612204
2 parents 57f7fb6 + fff090a
commit 9612204
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/Helpers/StringHelper.php b/app/Helpers/StringHelper.php
@@ -59,8 +59,11 @@ public static function timeElapsed(int $seconds): string
 
         foreach (self::secondsPer as $unit => $secondsPer) {
             $magnitude = intdiv($seconds, $secondsPer);
-            $seconds -= $magnitude * $secondsPer;
-            $units[$unit] = $magnitude.trans('common.abbrev-'.$unit.'s');
+
+            if ($magnitude > 0) {
+                $units[] = $magnitude.trans('common.abbrev-'.$unit.'s');
+                $seconds -= $magnitude * $secondsPer;
+            }
         }
 
         return implode($units);