lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #226 from defrance69/patch-5

Browse Source 
if day of week < 7 display 2 times the day : 3 days 3 days
This commit is contained in:
Regis Houssin 2012-06-11 13:05:26 -07:00
commit 38b0b5b39d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/date.lib.php
View File

@ -261,16 +261,23 @@ function convertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf
if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks"); if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
$sTime.=$sWeek.' '.$weekTranslate.' '; $sTime.=$sWeek.' '.$weekTranslate.' ';
} }
if ($sDay>0) /* if ($sDay>0)
{ {
$dayTranslate = $langs->trans("Day"); $dayTranslate = $langs->trans("Day");
if ($sDay > 1) $dayTranslate = $langs->trans("Days"); if ($sDay > 1) $dayTranslate = $langs->trans("Days");
$sTime.=$sDay.' '.$dayTranslate.' '; $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)) if ($iSecond || empty($sDay))
{ {
$sTime.= dol_print_date($iSecond,'hourduration',true); $sTime.= dol_print_date($iSecond,'hourduration',true);