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

[matthew]

matthew		Fri Jul 16 15:29:27 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
    /loncom/localize/localize	newphrases.txt 
  Log:
  Localized time output for progress window.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.79 loncom/interface/lonhtmlcommon.pm:1.80
--- loncom/interface/lonhtmlcommon.pm:1.79	Sat Jul  3 14:49:42 2004
+++ loncom/interface/lonhtmlcommon.pm	Fri Jul 16 15:29:26 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.79 2004/07/03 18:49:42 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.80 2004/07/16 19:29:26 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -772,20 +772,22 @@
         $$prog_state{'done'} *
 	($$prog_state{'max'}-$$prog_state{'done'});
     $time_est = int($time_est);
-    if (int ($time_est/60) > 0) {
-	my $min = int($time_est/60);
-	my $sec = $time_est % 60;
-	$time_est = $min.' '.&mt('minutes');
-        if ($min < 10)  {
-            if ($sec > 1) {
-                $time_est.= ', '.$sec.' '.&mt('seconds');
-            } elsif ($sec > 0) {
-                $time_est.= ', '.$sec.' '.&mt('second');
-            }
-        }
-    } else {
-	$time_est .= ' '.&mt('seconds');
+    #
+    my $min = int($time_est/60);
+    my $sec = $time_est % 60;
+    # 
+    my $str;
+    if ($min == 1 && $sec > 1) {
+        $str = '[_2] seconds';
+    } elsif ($min == 1 && $sec < 2) {
+        $str = '1 minute';
+    } elsif ($min < 10 && $sec > 1) {
+        $str = '[_1] minutes, [_2] seconds';
+    } elsif ($min > 10 || $sec < 2) {
+        $str = '[_1] minutes';
     }
+    $time_est = &mt($str,$min,$sec);
+    #
     my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
     if ($lasttime > 9) {
         $lasttime = int($lasttime);
Index: loncom/localize/localize/newphrases.txt
diff -u loncom/localize/localize/newphrases.txt:1.49 loncom/localize/localize/newphrases.txt:1.50
--- loncom/localize/localize/newphrases.txt:1.49	Thu Jun 24 15:32:37 2004
+++ loncom/localize/localize/newphrases.txt	Fri Jul 16 15:29:26 2004
@@ -113,3 +113,8 @@
 There are no currently enrolled students in the selected sections.
 There are no previously enrolled students in the selected sections.
 Click here to return to the chart.
+
+[_1] minutes, [_2] seconds
+1 minute
+[_1] minutes
+[_2] seconds