[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework grades.pm

[raeburn]

raeburn		Tue Dec 18 18:05:49 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	grades.pm 
  Log:
  - For 2.11
    - Backport 1.679, 1.680, 1.681, 1.682, 1.683.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.596.2.12.2.11 loncom/homework/grades.pm:1.596.2.12.2.12
--- loncom/homework/grades.pm:1.596.2.12.2.11	Mon Dec 10 15:00:08 2012
+++ loncom/homework/grades.pm	Tue Dec 18 18:05:48 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.11 2012/12/10 15:00:08 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12.2.12 2012/12/18 18:05:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -253,7 +253,7 @@
             $result.='<td>'.$display_part.'</td>'
                     .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
                     .'<td>'.&mt($responsetype).'</td>'
-#                   .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>'
+#                   .'<td><b>'.&mt('Handgrade: [_1]',$handgrade).'</b></td>'
                     .&Apache::loncommon::end_data_table_row();
         }
     }
@@ -4810,8 +4810,8 @@
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' 
-		                        : '<br />('.&mt('[_1]parts)',
-							scalar(@{$parts}).' ')
+		                        : '<br />('.&mt('[_1]parts',
+							scalar(@{$parts}).' ').')'
 		 ).
 		 '</td>';
 	    $studentTable.='<td valign="top">';
@@ -6611,8 +6611,8 @@
 '.$CODElist.$lastbubblepoints.'
 </table>
 <br />
-<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
-<p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
+<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'</p>
+<p> '.&mt("If something is incorrect, please click the 'Grading Menu' button to start over.").'</p>
 
 <br />
 ');
@@ -8871,7 +8871,11 @@
                   $env{'form.scantron_maxbubble'}).
               '</p>'
     );
-    $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
+    $r->print('<p>'
+             .&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>')
+             .'<br />'
+             .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>')
+             .'</p>');
     if ($passed) {
         $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
         $r->print(&Apache::loncommon::start_data_table()."\n".