--- loncom/interface/lonhtmlcommon.pm 2004/09/29 14:50:43 1.90 +++ loncom/interface/lonhtmlcommon.pm 2004/10/12 22:55:21 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.90 2004/09/29 14:50:43 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.92 2004/10/12 22:55:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -804,8 +804,10 @@ sub Increment_PrgWin { my $sec = $time_est % 60; # my $str; - if ($min == 1 && $sec > 1) { + if ($min == 0 && $sec > 1) { $str = '[_2] seconds'; + } elsif ($min == 1 && $sec > 1) { + $str = '1 minute [_2] seconds'; } elsif ($min == 1 && $sec < 2) { $str = '1 minute'; } elsif ($min < 10 && $sec > 1) { @@ -902,7 +904,7 @@ sub spellheader { my $nothing = &javascript_nothing(); return (< -// BEGIN LON-CAPA Internal +// ENDCHECK }