From 2540f727c063d55314e9f7677df8739141b8383d Mon Sep 17 00:00:00 2001 From: defrance69 Date: Sun, 10 Jun 2012 13:42:19 +0300 Subject: [PATCH] if day of week < 7 display 2 times the day : 3 days 3 days add the 's' if they are many days --- htdocs/core/lib/date.lib.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 52368bd634c..d412ec3ea82 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -261,16 +261,23 @@ function convertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks"); $sTime.=$sWeek.' '.$weekTranslate.' '; } - if ($sDay>0) +/* if ($sDay>0) { $dayTranslate = $langs->trans("Day"); if ($sDay > 1) $dayTranslate = $langs->trans("Days"); $sTime.=$sDay.' '.$dayTranslate.' '; } +*/ } } + if ($sDay>0) + { + $dayTranslate = $langs->trans("Day"); + if ($sDay > 1) $dayTranslate = $langs->trans("Days"); + $sTime.=$sDay.' '.$dayTranslate.' '; + } - if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' '; +// if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' '; if ($iSecond || empty($sDay)) { $sTime.= dol_print_date($iSecond,'hourduration',true);