version 1.346, 2005/11/08 12:01:42
|
version 1.347, 2005/11/10 19:19:26
|
Line 602 sub advancedUser {
|
Line 602 sub advancedUser {
|
# print "Answer available $timestring" |
# print "Answer available $timestring" |
# Very, very, very, VERY English-only... goodness help a localizer on |
# Very, very, very, VERY English-only... goodness help a localizer on |
# this func... |
# this func... |
|
|
|
|
sub timeToHumanString { |
sub timeToHumanString { |
my ($time,$type,$format) = @_; |
my ($time,$type,$format) = @_; |
|
|
Line 679 sub timeToHumanString {
|
Line 681 sub timeToHumanString {
|
|
|
if($format ne '') { |
if($format ne '') { |
my $timeStr = strftime($format, localtime($time)); |
my $timeStr = strftime($format, localtime($time)); |
return $timeStr; |
return $timeStr.&Apache::lonlocal::gettimezone(); |
} |
} |
|
|
# Less then 5 days away, display day of the week and |
# Less then 5 days away, display day of the week and |
Line 690 sub timeToHumanString {
|
Line 692 sub timeToHumanString {
|
$timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
return ($inPast ? "last " : "this ") . |
return ($inPast ? "last " : "this ") . |
$timeStr; |
$timeStr.&Apache::lonlocal::gettimezone(); |
} |
} |
|
|
my $conjunction='on'; |
my $conjunction='on'; |
Line 705 sub timeToHumanString {
|
Line 707 sub timeToHumanString {
|
my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time)); |
my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time)); |
$timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
return $timeStr; |
return $timeStr.&Apache::lonlocal::gettimezone(); |
} |
} |
|
|
# Not this year, so show the year |
# Not this year, so show the year |
my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time)); |
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 am/00:00/; |
$timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
return $timeStr; |
return $timeStr.&Apache::lonlocal::gettimezone(); |
} |
} |
} |
} |
|
|