diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 2a82eec18bf..f4a73c89501 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -188,6 +188,7 @@ Today=Today Yesterday=Yesterday Tomorrow=Tomorrow Quadri=Quadri +HourShort=H Rate=Rate Bytes=Bytes Cut=Cut diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 019be8b9826..6456989b651 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -189,6 +189,7 @@ Today=Aujourd'hui Yesterday=Hier Tomorrow=Demain Quadri=Trimestre +HourShort=H Rate=Taux Bytes=Octets Cut=Couper diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 2c433cbfa01..e643aa22b61 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -3104,20 +3104,27 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0) \brief Fonction retournant le nombre de jour entre deux dates sans les jours fériés (jours ouvrés) \param timestampStart Timestamp de début \param timestampEnd Timestamp de fin - \param inhour 0: sort le nombre de jour , 1: sort le nombre d'heure + \param inhour 0: sort le nombre de jour , 1: sort le nombre d'heure (72 max) \param lastday On prend en compte le dernier jour, 0: non, 1:oui \return nbjours Nombre de jours ou d'heures */ function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0) { + global $langs; + if ($timestampStart < $timestampEnd) { $bit = 0; if ($lastday == 1) $bit = 1; $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $bit) - num_public_holiday($timestampStart, $timestampEnd); - if ($inhour == 1) $nbOpenDay = $nbOpenDay*24; + $nbOpenDay.= " ".$langs->trans("Days"); + if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort"); + return $nbOpenDay; + } + else + { + return $langs->trans("Error"); } - return $nbOpenDay; } /**