diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 735b1c676b9..636a4ef4907 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -219,7 +219,8 @@ function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0) * Can be used to show a duration. * * @param int $iSecond Number of seconds - * @param string $format Output format ('all': total delay days hour:min like "2 days 12:30", + * @param string $format Output format + * - 'all': total delay days hour:min like "2 days 12:30", * - 'allwithouthour': total delay days without hour part like "2 days", * - 'allhourmin': total delay with format hours:min like "60:30", * - 'allhourminsec': total delay with format hours:min:sec like "60:30:10", diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index f3e774bb82a..b8cb76bc7c1 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -649,8 +649,8 @@ if ($num > 0) { // Duration print ''; if (!empty($datelastresult) && ($datelastresult >= $datelastrun)) { - print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'all'); - //print '
'.($datelastresult - $datelastrun).' '.$langs->trans("seconds"); + $nbseconds = max($datelastresult - $datelastrun, 1); + print $nbseconds.' '.($nbseconds > 1 ? $langs->trans("SecondShort") : $langs->trans("SecondShort")); } print ''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a5ad75f9f1f..29bd547f2b1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -346,6 +346,7 @@ MonthOfDay=Month of the day DaysOfWeek=Days of week HourShort=H MinuteShort=mn +SecondShort=sec Rate=Rate CurrencyRate=Currency conversion rate UseLocalTax=Include tax