--- loncom/interface/lonnavmaps.pm 2005/11/08 12:01:42 1.346 +++ loncom/interface/lonnavmaps.pm 2005/11/10 19:19:26 1.347 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.346 2005/11/08 12:01:42 foxr Exp $ +# $Id: lonnavmaps.pm,v 1.347 2005/11/10 19:19:26 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -602,6 +602,8 @@ sub advancedUser { # print "Answer available $timestring" # Very, very, very, VERY English-only... goodness help a localizer on # this func... + + sub timeToHumanString { my ($time,$type,$format) = @_; @@ -679,7 +681,7 @@ sub timeToHumanString { if($format ne '') { my $timeStr = strftime($format, localtime($time)); - return $timeStr; + return $timeStr.&Apache::lonlocal::gettimezone(); } # Less then 5 days away, display day of the week and @@ -690,7 +692,7 @@ sub timeToHumanString { $timeStr =~ s/12:00 am/00:00/; $timeStr =~ s/12:00 pm/noon/; return ($inPast ? "last " : "this ") . - $timeStr; + $timeStr.&Apache::lonlocal::gettimezone(); } my $conjunction='on'; @@ -705,14 +707,14 @@ sub timeToHumanString { my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time)); $timeStr =~ s/12:00 am/00:00/; $timeStr =~ s/12:00 pm/noon/; - return $timeStr; + return $timeStr.&Apache::lonlocal::gettimezone(); } # Not this year, so show the year my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time)); $timeStr =~ s/12:00 am/00:00/; $timeStr =~ s/12:00 pm/noon/; - return $timeStr; + return $timeStr.&Apache::lonlocal::gettimezone(); } }