loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

-version 1.79, 2004/07/03 18:49:42
+version 1.80, 2004/07/16 19:29:26
  Line 772  sub Increment_PrgWin {
          $$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 $min = int($time_est/60);
- 	my $sec = $time_est % 60;
+     my $sec = $time_est % 60;
- 	$time_est = $min.' '.&mt('minutes');
+     #
-         if ($min < 10)  {
+     my $str;
-             if ($sec > 1) {
+     if ($min == 1 && $sec > 1) {
-                 $time_est.= ', '.$sec.' '.&mt('seconds');
+         $str = '[_2] seconds';
-             } elsif ($sec > 0) {
+     } elsif ($min == 1 && $sec < 2) {
-                 $time_est.= ', '.$sec.' '.&mt('second');
+         $str = '1 minute';
-             }
+     } elsif ($min < 10 && $sec > 1) {
-         }
+         $str = '[_1] minutes, [_2] seconds';
-     } else {
+     } elsif ($min > 10 || $sec < 2) {
- 	$time_est .= ' '.&mt('seconds');
+         $str = '[_1] minutes';
      }
+     $time_est = &mt($str,$min,$sec);
+     #
      my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
      if ($lasttime > 9) {
          $lasttime = int($lasttime);