--- loncom/interface/lonnavmaps.pm 2005/10/30 02:31:01 1.345 +++ loncom/interface/lonnavmaps.pm 2005/11/08 12:01:42 1.346 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.345 2005/10/30 02:31:01 www Exp $ +# $Id: lonnavmaps.pm,v 1.346 2005/11/08 12:01:42 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -603,7 +603,8 @@ sub advancedUser { # Very, very, very, VERY English-only... goodness help a localizer on # this func... sub timeToHumanString { - my ($time,$type) = @_; + my ($time,$type,$format) = @_; + # zero, '0' and blank are bad times if (!$time) { return &mt('never'); @@ -674,8 +675,16 @@ sub timeToHumanString { return "$prefix$hourString$minuteString$tense"; } + # If there's a caller supplied format, use it. + + if($format ne '') { + my $timeStr = strftime($format, localtime($time)); + return $timeStr; + } + # Less then 5 days away, display day of the week and # HH:MM + if ( $delta < $day * 5 ) { my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time)); $timeStr =~ s/12:00 am/00:00/;