--- loncom/homework/grades.pm 2012/12/18 18:03:40 1.682 +++ loncom/homework/grades.pm 2013/08/23 16:24:33 1.703 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.682 2012/12/18 18:03:40 raeburn Exp $ +# $Id: grades.pm,v 1.703 2013/08/23 16:24:33 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -736,7 +736,7 @@ sub most_similar { sub initialverifyreceipt { my ($request,$symb) = @_; &commonJSfunctions($request); - return '
'. &keywords_highlight($oessay). '
' + .&mt('Unable to accept last correction, an error occurred: [_1]', + $errmsg) + .''); } else { &scantron_put_line($scanlines,$scan_data,$which,$line,$skip); &scantron_putfile($scanlines,$scan_data); @@ -6521,9 +6668,11 @@ SCANTRONFORM ''."\n"; $chunk .= ''."\n"; + $chunk .= + ''."\n"; $result .= $chunk; $line++; - } + } return $result; } @@ -6544,7 +6693,7 @@ sub scantron_validate_file { if (!$symb) {return '';} my $default_form_data=&defaultFormData($symb); - # do the detection of only doing skipped records first befroe we delete + # do the detection of only doing skipped records first before we delete # them when doing the corrections reset if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') { &reset_skipping_status(); @@ -6595,6 +6744,7 @@ sub scantron_validate_file { while (!$stop && $currentphase < scalar(@validate_phases)) { $r->print(&mt('Validating '.$validate_phases[$currentphase]).''); $r->rflush(); + my $which="scantron_validate_".$validate_phases[$currentphase]; { no strict 'refs'; @@ -7006,7 +7156,7 @@ sub scantron_validate_sequence { $r->print( '
' .&mt('Some resources in the sequence currently are not set to' - .' exam mode. Grading these resources currently may not' + .' bubblesheet exam mode. Grading these resources currently may not' .' work correctly.') .'
".&mt("Please indicate which bubble should be used for grading")."
- '.&mt('The requested file name was invalid.').' + '.&mt('The requested filename was invalid.').'
' - .&mt('Exact matches for [_1][quant,_2,student][_3].','',$passed,''). + .&mt('Exact matches for [_1][quant,_2,student][_3].','',$passed,'') .'' .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','',$failed,'') .'