--- loncom/homework/lonhomework.pm	2004/12/22 22:05:40	1.190
+++ loncom/homework/lonhomework.pm	2005/01/11 19:38:53	1.192
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.190 2004/12/22 22:05:40 albertel Exp $
+# $Id: lonhomework.pm,v 1.192 2005/01/11 19:38:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,7 +116,7 @@ sub get_target {
 		    return ('web','answer');
 		}
 	    } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ||
-		      $ENV{'form.problemmode'} ee 'Edit') {
+		      $ENV{'form.problemmode'} eq 'Edit') {
 		if ( $ENV{'form.submitted'} eq 'edit' ) {
 		    if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
 			return ('modified','web','answer');
@@ -320,7 +320,7 @@ sub check_access {
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
-		$datemsg=' '.$interval.' seconds';
+		$datemsg=&seconds_to_human_length($interval);
 	    } else {
 		my $newdate=localtime($first_access+$interval);
 		if (time > ($first_access+$interval)) {
@@ -348,6 +348,25 @@ sub check_access {
     return ($status,$datemsg);
 }
 
+sub seconds_to_human_length {
+    my ($length)=@_;
+
+    my $seconds=$length%60; $length=int($length/60);
+    my $minutes=$length%60; $length=int($length/60);
+    my $hours=$length%24;   $length=int($length/24);
+    my $days=$length;
+
+    my $timestr;
+    if ($days > 0) { $timestr.=&mt('[quant,_1,day]',$days); }
+    if ($hours > 0) { $timestr.=($timestr?", ":"").
+			  &mt('[quant,_1,hour]',$hours); }
+    if ($minutes > 0) { $timestr.=($timestr?", ":"").
+			    &mt('[quant,_1,minute]',$minutes); }
+    if ($seconds > 0) { $timestr.=($timestr?", ":"").
+			    &mt('[quant,_1,second]',$seconds); }
+    return $timestr;
+}
+
 sub showhash {
     my (%hash) = @_;
     &showhashsubset(\%hash,'.');
@@ -849,7 +868,7 @@ sub handler {
 		$ENV{'form.problemmode'}='View';
 		&renderpage($request,$file);
 	    } elsif ($ENV{'form.problemmode'} eq &mt('EditXML') ||
-		     $ENV{'form.problemmode'} eq 'EditXML' {
+		     $ENV{'form.problemmode'} eq 'EditXML') {
 		&editxmlmode($request,$file);
 	    } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);