oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'bfe9780ce0' into WebGUI8. Merged up to 7.10.3

Browse source
This commit is contained in:
Colin Kuskie 2010-11-02 14:49:33 -07:00
commit a90eadda7c
37 changed files with 537 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Session/DateTime.pm
View file

@ -312,7 +312,7 @@ sub epochToHuman {
"d" => "d",
"D" => "_varday_",
"h" => "I",
"H" => "l",
"H" => "_varhour_",
"j" => "H",
"J" => "k",
"m" => "m",
@ -338,11 +338,15 @@ sub epochToHuman {
$output = $dt->strftime($output);
#--- %M
$temp = int($dt->month);
$temp = $dt->month;
$output =~ s/\%_varmonth_/$temp/g;
#-- %D
$temp = int($dt->day);
$temp = $dt->day;
$output =~ s/\%_varday_/$temp/g;
#-- %H, variable digit hour, 12 hour clock
$temp = $dt->hour;
$temp -= 12 if ($temp > 12);
$output =~ s/\%_varhour_/$temp/g;
#--- return
return $output;
}