--- loncom/homework/grades.pm	2003/12/02 04:50:26	1.165
+++ loncom/homework/grades.pm	2003/12/05 14:59:51	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.165 2003/12/02 04:50:26 albertel Exp $
+# $Id: grades.pm,v 1.167 2003/12/05 14:59:51 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,8 @@ use Apache::lonhomework;
 use Apache::loncoursedata;
 use Apache::lonmsg qw(:user_normal_msg);
 use Apache::Constants qw(:common);
-use String::Similarity;
+use Apache::lonlocal;
+#use String::Similarity;
 
 my %oldessays=();
 my %perm=();
@@ -168,7 +169,7 @@ sub showResourceInfo {
     my $col=3;
     if ($checkboxes) { $col=4; }
     my $result ='<table border="0">'.
-	'<tr><td colspan="'.$col.'"><font size="+1"><b>Current Resource: </b>'.
+	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
 	$probTitle.'</font></td></tr>'."\n";
     my ($partlist,$handgrade,$responseType) = &response_type($url);
     my %resptype = ();
@@ -290,7 +291,8 @@ sub cleanRecord {
 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
-	return '<br /><br /><blockquote><pre>'.&keywords_highlight($answer).'</pre></blockquote>';
+	$answer =~ s-\n-<br />-g;
+	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
     }
     return $answer;
 }
@@ -2246,7 +2248,7 @@ sub viewgrades {
     &viewgrades_js($request);
 
     my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); 
-    my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+    my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
 
     $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
 
@@ -3201,7 +3203,7 @@ sub displaySubByDates {
 	    }
 	    if (exists $$record{"$version:resource.$partid.regrader"}) {
 		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
-		    ' (<b>Part:</b> '.$partid.')';
+		    ' (<b>'.&mt('Part').':</b> '.$partid.')';
 	    }
 	}
 	# needed because old essay regrader has not parts info
@@ -4314,7 +4316,7 @@ GRADINGMENUJS
 
     $result.='<table width="100%" border=0>';
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
-	'&nbsp;Select Section: <select name="section">'."\n";
+	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
     if (ref($sections)) {
 	foreach (sort (@$sections)) {
 	    $result.='<option value="'.$_.'" '.
@@ -4323,7 +4325,7 @@ GRADINGMENUJS
     }
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
 
-    $result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+    $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
 
     if (ref($sections) && (grep /no/,@$sections)) {
 	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />';
@@ -4332,8 +4334,8 @@ GRADINGMENUJS
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
 	'<input type="radio" name="radioChoice" value="submission" '.
-	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students '.
-	'<select name="submitonly">'.
+	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+	' <select name="submitonly">'.
 	'<option value="yes" '.
 	($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
 	'<option value="graded" '.