version 1.30, 2003/09/29 13:49:31
|
version 1.31, 2003/10/14 18:36:54
|
Line 783 sub Increment_PrgWin {
|
Line 783 sub Increment_PrgWin {
|
if (int ($time_est/60) > 0) { |
if (int ($time_est/60) > 0) { |
my $min = int($time_est/60); |
my $min = int($time_est/60); |
my $sec = $time_est % 60; |
my $sec = $time_est % 60; |
$time_est = $min.' minutes'; |
$time_est = $min.' '.&mt('minutes'); |
if ($min < 10) { |
if ($min < 10) { |
if ($sec > 1) { |
if ($sec > 1) { |
$time_est.= ', '.$sec.' seconds'; |
$time_est.= ', '.$sec.' '.&mt('seconds'); |
} elsif ($sec > 0) { |
} elsif ($sec > 0) { |
$time_est.= ', '.$sec.' second'; |
$time_est.= ', '.$sec.' '.&mt('second'); |
} |
} |
} |
} |
} else { |
} else { |
$time_est .= ' seconds'; |
$time_est .= ' '.&mt('seconds'); |
} |
} |
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'}; |
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'}; |
if ($lasttime > 9) { |
if ($lasttime > 9) { |
Line 803 sub Increment_PrgWin {
|
Line 803 sub Increment_PrgWin {
|
$lasttime = sprintf("%3.2f",$lasttime); |
$lasttime = sprintf("%3.2f",$lasttime); |
} |
} |
if ($lasttime == 1) { |
if ($lasttime == 1) { |
$lasttime = '('.$lasttime.' second for '.$extraInfo.')'; |
$lasttime = '('.$lasttime.' '.&mt('second for').' '.&mt($extraInfo).')'; |
} else { |
} else { |
$lasttime = '('.$lasttime.' seconds for '.$extraInfo.')'; |
$lasttime = '('.$lasttime.' '.&mt('seconds for').' '.&mt($extraInfo).')'; |
} |
} |
# |
# |
my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'})); |
my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'})); |
Line 819 sub Increment_PrgWin {
|
Line 819 sub Increment_PrgWin {
|
} |
} |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
': '.$time_est.' remaining '.$lasttime.'";'.'</script>'); |
': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>'); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$r->rflush(); |
$r->rflush(); |
} |
} |