--- loncom/interface/lonhtmlcommon.pm 2003/09/29 13:49:31 1.30
+++ loncom/interface/lonhtmlcommon.pm 2003/10/14 18:36:54 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.30 2003/09/29 13:49:31 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.31 2003/10/14 18:36:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -783,16 +783,16 @@ sub Increment_PrgWin {
if (int ($time_est/60) > 0) {
my $min = int($time_est/60);
my $sec = $time_est % 60;
- $time_est = $min.' minutes';
+ $time_est = $min.' '.&mt('minutes');
if ($min < 10) {
if ($sec > 1) {
- $time_est.= ', '.$sec.' seconds';
+ $time_est.= ', '.$sec.' '.&mt('seconds');
} elsif ($sec > 0) {
- $time_est.= ', '.$sec.' second';
+ $time_est.= ', '.$sec.' '.&mt('second');
}
}
} else {
- $time_est .= ' seconds';
+ $time_est .= ' '.&mt('seconds');
}
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
if ($lasttime > 9) {
@@ -803,9 +803,9 @@ sub Increment_PrgWin {
$lasttime = sprintf("%3.2f",$lasttime);
}
if ($lasttime == 1) {
- $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
+ $lasttime = '('.$lasttime.' '.&mt('second for').' '.&mt($extraInfo).')';
} else {
- $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
+ $lasttime = '('.$lasttime.' '.&mt('seconds for').' '.&mt($extraInfo).')';
}
#
my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
@@ -819,7 +819,7 @@ sub Increment_PrgWin {
}
$r->print('');
+ ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'');
$$prog_state{'laststart'}=&Time::HiRes::time();
$r->rflush();
}