--- loncom/homework/bridgetask.pm	2008/09/11 14:47:17	1.240
+++ loncom/homework/bridgetask.pm	2009/03/20 10:05:00	1.245
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.240 2008/09/11 14:47:17 bisitz Exp $
+# $Id: bridgetask.pm,v 1.245 2009/03/20 10:05:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -473,7 +473,7 @@ sub file_list {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
 	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
-	$file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+	$file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
 	    &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
 	    '</a></span></li>'."\n";
     }
@@ -493,13 +493,13 @@ sub webgrade_standard_info {
 
     my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
 
-    my %lt=('done'   => 'Next Item',
-	    'stop'   => 'Quit Grading',
-	    'fail'   => 'Fail Rest',
-	    'cancel' => 'Cancel',
-	    'submit' => 'Submit Grades',
-	    );
-    %lt=&Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'done'   => 'Next Item',
+        'stop'   => 'Quit Grading',
+        'fail'   => 'Fail Rest',
+        'cancel' => 'Cancel',
+        'submit' => 'Submit Grades',
+    );
 
     my $result=<<INFO;
   <div class="LC_GRADING_maincontrols">
@@ -545,7 +545,7 @@ sub done_screen {
                    .&mt('[_1]Nonexistent file:[_2]'
                        ,'<span class="LC_error"> '
                        ,'</span> <span class="LC_filename">'.$file.'</span>');
-	    $msg .= "<p>".&mt('Submitted non-existant file [_1]',$file)."</p>\n";
+	    $msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
 	} else {
 	    $file = '<span class="LC_filename">'.$file.'</span>';
 	    $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
@@ -579,7 +579,7 @@ sub done_screen {
           .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
 .'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'
 .$message_status
-.$comment_status
+.$comment_status;
 
 }
 
@@ -1091,10 +1091,11 @@ sub end_Task {
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
 		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
+                    my $donetext = &mt('Done');
 		    $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">
    <input type="hidden" name="donescreen" value="1" />
-   <input type="submit" value="Done" />
+   <input type="submit" value="$donetext" />
 </form>
 DONEBUTTON
                 }
@@ -2080,6 +2081,7 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
+            my $buttontext=&mt('Regrade');
 	    $result.=&Apache::loncommon::start_data_table_row();
 	    $result.=<<RESULT;
   <td>
@@ -2088,7 +2090,7 @@ sub select_user {
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />
-      <input type="submit" name="submit" value="Regrade" />
+      <input type="submit" name="submit" value="$buttontext" />
       $seclist
     </form>
   <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td>
@@ -2647,17 +2649,11 @@ sub question_status_message {
     }
     $status .= '.';
     if ($counts->{'opt'}) {
-        # FIXME &mt() missing!
-	$status .= ' You were required to pass '.$counts->{'opt_req'}.
-	    ' optional ';
-	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
-	    $status .=
-		($counts->{'opt_req'} == 1?'criterion':'criteria');
-	} else {
-	    $status .=
-		'component'.($counts->{'opt_req'} == 1?'':'s');
-	}
-	$status .= '.';
+        if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
+        } else { 
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
+        }
     }
     return $status;
 }
@@ -2987,13 +2983,13 @@ sub layout_webgrade_Criteria {
     my $link=&link($id);
     my $version = &get_version();
     my $status  = &get_criteria('status',$version,$dim,$id);
-    my %lt = ( 'ungraded' => 'Ungraded',
-	       'fail'     => 'Fail',
-	       'pass'     => 'Pass',
-	       'review'   => 'Review',
-	       'comment'  => 'Additional Comment for Student',
-	       );
-    %lt = &Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'ungraded' => 'Ungraded',
+        'fail'     => 'Fail',
+        'pass'     => 'Pass',
+        'review'   => 'Review',
+        'comment'  => 'Additional Comment for Student',
+    );
     my $comment = &get_criteria('comment',$version,$dim,$id);
     $comment = &HTML::Entities::encode($comment,'<>"&');
     my %checked;
@@ -3139,33 +3135,45 @@ sub proctor_validation_screen {
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     $uri = &HTML::Entities::encode($uri,'<>&"');
-    # FIXME &mt() missing!
+    my %lt = &Apache::lonlocal::texthash(
+                            'prva' => "Proctor Validation",
+                            'yoro' => "Your room's proctor needs to validate your access to this resource.",
+                            'prus'  => "Proctor's Username:",
+                            'pasw'  => "Password:",
+                            'prdo'  => "Proctor's Domain:",
+                            'vali'  => 'Validate',
+                            'stui'  => "Student who should be logged in is:",
+                            'name'  => "Name:",
+                            'sid'   => "Student/Employee ID:",
+                            'unam'  => "Username:",
+                           );
     my $result= (<<ENDCHECKOUT);
-<h2>Proctor Validation</h2>
-    <p>Your room's proctor needs to validate your access to this resource.</p>
+<h2>$lt{'prva'}</h2>
+    <p>$lt{'yoro'}</p>
     $msg
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>
-  <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
-  <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
+  <tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
+  <tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
+  <tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
 </table>
-<input type="submit" name="checkoutbutton" value="Validate"  /><br />
+<input type="submit" name="checkoutbutton" value="$lt{'vali'}"  /><br />
 <table border="1">
   <tr><td>
     <table>
-      <tr><td colspan="2">Student who should be logged in is:</td></tr>
-      <tr><td>Name:</td><td>$name</td></tr>
-      <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
-      <tr><td>Usename</td><td>$user:$domain</td></tr>
+      <tr><td colspan="2">$lt{'stui'}</td></tr>
+      <tr><td>$lt{'name'}</td><td>$name</td></tr>
+      <tr><td>$lt{'sid'}</td><td>$env{'environment.id'}</td></tr>
+      <tr><td>$lt{'unam'}</td><td>$user:$domain</td></tr>
       $url
     </table>
   </tr></td>
 </table>
 </form>
 ENDCHECKOUT
+
     return $result;
 }