[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 05 Oct 2004 20:35:02 -0000


albertel		Tue Oct  5 16:35:02 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - it was hiding the minutes when there was one and showing it when there were zero, BUG#3472
  
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.90 loncom/interface/lonhtmlcommon.pm:1.91
--- loncom/interface/lonhtmlcommon.pm:1.90	Wed Sep 29 10:50:43 2004
+++ loncom/interface/lonhtmlcommon.pm	Tue Oct  5 16:35:02 2004
@@ -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.91 2004/10/05 20:35:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -804,8 +804,10 @@
     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) {