There are no students currently enrolled.'; + $gradeTable='
'.&mt('There are no students currently enrolled.').''; } else { my $submissions='submissions'; if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } $gradeTable='
'. - 'No '.$submissions.' found for this resource for any students. ('.$num_students. - ' students checked for '.$submissions.')
'; + &mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')', + $num_students). + '
'; } } elsif ($ctr == 1) { $gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/; @@ -1079,9 +1120,9 @@ sub check_script { } sub check_buttons { - my $buttons.=''; - $buttons.=' '; - $buttons.=''; + my $buttons.=''; + $buttons.=' '; + $buttons.=''; $buttons.=' '; return $buttons; } @@ -1616,8 +1657,7 @@ sub get_increment { sub gradeBox { my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; my $checkIcon = '
.
- '/check.gif){kind=small}
';
+ '" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)')
: ''.&mt('problem weight assigned by computer').'';
@@ -1632,41 +1672,47 @@ sub gradeBox {
if ($last_resets{$partid}) {
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
}
- $result.='| '. - 'Part: '.$display_part.' Points: | '."\n";
+ $result.='
or | '."\n";
- $result.=''."\n";
- $result.=' | /'.$wgt.' '.$wgtmsg.
+ $line.=' | /'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' | '."\n";
- $result.=''."\n";
- $result.=" \n";
+ $line.=''."\n";
+
+
+ $result .=
+ &mt(' | Part: | [_1] | Points: | [_2] | or | [_3] | ',$display_part,$radio,$line);
+
+
+ $result.=''; - $result.='(File will be uploaded when you click on Save & Next below.) '; + $result.='('.&mt('File will be uploaded when you click on Save & Next below.').') '; $file_counter++; } } @@ -1853,8 +1898,8 @@ sub submission { if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { &download_all_link($request, $symb); } - $request->print(' Submission Record'."\n". - 'Resource: '.$env{'form.probTitle'}.''."\n"); + $request->print(''.&mt('Submission Record').''."\n". + ''.&mt('Resource: [_1]',$env{'form.probTitle'}).''."\n"); # option to display problem, only once else it cause problems # with the form later since the problem has a form. @@ -2219,7 +2264,7 @@ KEYWORDS # print end of form if ($counter == $total) { my $endform='
|
LON-CAPA User Message
'."\n"; - $the_end.='Message: No more students for this section or class.
'."\n"; - $the_end.='Click on the button below to return to the grading menu.
'."\n"; + my $the_end = '
'.&mt('LON-CAPA User Message').'
'."\n"; + $the_end.=&mt('Message: No more students for this section or class.').'
'."\n"; + $the_end.=&mt('Click on the button below to return to the grading menu.').'
'."\n"; $the_end.=&show_grading_menu_form($symb); $request->print($the_end); } @@ -3148,7 +3193,7 @@ sub viewgrades { &Apache::lonnet::clear_EXT_cache_status(); my $result='
'.&mt('Manual Grading').'
'; - $result.='Current Resource: '.$env{'form.probTitle'}.'
'."\n"; + $result.=''.&mt('Current Resource: [_1]',$env{'form.probTitle'}).'
'."\n"; #view individual student submission form - called using Javascript viewOneStudent $result.=&jscriptNform($symb); @@ -3166,13 +3211,15 @@ sub viewgrades { my $sectionClass; my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); if ($env{'form.section'} eq 'all') { - $sectionClass='Class '; + $sectionClass='Class'; } elsif ($env{'form.section'} eq 'none') { - $sectionClass=&mt('Students in no Section').''; + $sectionClass='Students in no Section'; } else { - $sectionClass=&mt('Students in Section(s) [_1]',$section_display).''; + $sectionClass='Students in Section(s) [_1]'; } - $result.=''.&mt('Assign Common Grade To [_1]',$sectionClass);
+ $result.=
+ ''.
+ &mt("Assign Common Grade To $sectionClass",$section_display).'
';
$result.= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem
@@ -3190,48 +3237,52 @@ sub viewgrades {
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- $result.=&Apache::loncommon::start_data_table_row().'';
- $result.=''."\n";
- $result.=''."\n";
my $display_part=&get_display_part($partid,$symb);
- $result.=
- 'Part: '.$display_part.' Point: ';
- $result.='';
+ my $radio.='';
my $ctr = 0;
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
- $result.= ' ' : '');
$ctr++;
}
- $result.='
';
- $result.= ' or /'.
$weight{$partid}.' (problem weight) '."\n";
- $result.= '';
+ $line.=''."\n";
+ $line.=''."\n";
+
+ $result.=
+ &Apache::loncommon::start_data_table_row()."\n".
+ &mt(' Part: [_1] Points: [_2] or [_3] ',$display_part,$radio,$line).
+ &Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;
}
$result.=&Apache::loncommon::end_data_table()."\n".
'';
- $result.='';
#table listing all the students in a section/class
#header of table
- $result.= 'Assign Grade to Specific Students in '.$sectionClass;
+ $result.= ''.&mt('Assign Grade to Specific Students in '.$sectionClass,
+ $section_display).'
';
$result.= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
- 'No. '.
+ ''.&mt('No.').' '.
''.&nameUserString('header')." \n";
my (@parts) = sort(&getpartlist($symb));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
@@ -3244,13 +3295,20 @@ sub viewgrades {
push(@partids, $partid);
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
- $result.='Score Part: '.$display_part.
- '
(weight = '.$weight{$partid}.') '."\n";
+ $result.=''.
+ &mt('Score Part: [_1]
(weight = [_2])',
+ $display_part,$weight{$partid}).' '."\n";
next;
+
} else {
- $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
+ if ($display =~ /Problem Status/) {
+ my $grade_status_mt = &mt('Grade Status');
+ $display =~ s{Problem Status}{$grade_status_mt
};
+ }
+ my $part_mt = &mt('Part:');
+ $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
}
- $display =~ s|Problem Status|Grade Status
|;
+
$result.=''.$display.' '."\n";
}
$result.=&Apache::loncommon::end_data_table_header_row();
@@ -3275,14 +3333,14 @@ sub viewgrades {
}
$result.=&Apache::loncommon::end_data_table();
$result.=''."\n";
- $result.=''."\n";
if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
$result=''.
- &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
+ &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
$section_display, $stu_status).
'';
}
@@ -3338,9 +3396,9 @@ sub viewstudentgrade {
$result.=' \n";
} else {
$result.='
';
- $title.=''.&mt('Current Resource: [_1]',$env{'form.probTitle'}).'
'."\n";
+ my $title=''.&mt('Current Grade Status').'
';
+ $title.=''.&mt('Current Resource: [_1]',$env{'form.probTitle'}).'
'."\n";
$title.=''.&mt('Section: [_1]',$section_display).'
'."\n";
- my $result= ''."\n";
- $result.= ''.
- ' No. '.
- ''.&nameUserString('header')." \n";
-
+ my $result= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('No.').' '.
+ ''.&nameUserString('header')." \n";
my %scoreptr = (
'correct' =>'correct_by_override',
'incorrect'=>'incorrect_by_override',
@@ -3395,8 +3452,8 @@ sub editgrades {
}
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $partid (@partid) {
- $header .= ' Old Score '.
- ' New Score ';
+ $header .= ''.&mt('Old Score').' '.
+ ''.&mt('New Score').' ';
$columns{$partid}=2;
foreach my $stores (@parts) {
my ($part,$type) = &split_part_type($stores);
@@ -3405,22 +3462,23 @@ sub editgrades {
my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;
$display =~ s/Number of Attempts/Tries/;
- $header .= ' Old '.$display.' '.
- ' New '.$display.' ';
+ $header .= ''.&mt('Old '.$display).' '.
+ ''.&mt('New '.$display).' ';
$columns{$partid}+=2;
}
}
foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$symb);
- $result .= 'Part: '.$display_part.
- ' (Weight = '.$weight{$partid}.') ';
+ $result .= ''.
+ &mt('Part: [_1] (Weight = [_2])',$display_part,$weight{$partid}).
+ ' ';
}
- $result .= ' ';
- $result .= $header;
- $result .= ' '."\n";
- my $noupdate;
+ $result .= &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_header_row().
+ $header.
+ &Apache::loncommon::end_data_table_header_row();
+ my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;
@@ -3432,7 +3490,9 @@ sub editgrades {
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
my $numcols=scalar(@partid)*4+2;
- $noupdate.=$line."Not allowed to modify student ";
+ push(@noupdate,
+ $line."".
+ &mt('Not allowed to modify student')." ");
next;
}
my %aggregate = ();
@@ -3501,7 +3561,7 @@ sub editgrades {
''.$awarded.' ';
}
}
- $line.=''."\n";
+ $line.="\n";
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -3534,10 +3594,13 @@ sub editgrades {
}
}
- $result.=' '.$updateCtr.' '.$line;
+ $result.=&Apache::loncommon::start_data_table_row().
+ ' '.$updateCtr.' '.$line.
+ &Apache::loncommon::end_data_table_row();
$updateCtr++;
} else {
- $noupdate.=' '.$noupdateCtr.' '.$line;
+ push(@noupdate,
+ ' '.$noupdateCtr.' '.$line);
$noupdateCtr++;
}
if ($aggregateflag) {
@@ -3545,16 +3608,28 @@ sub editgrades {
$cdom,$cnum);
}
}
- if ($noupdate) {
+ if (@noupdate) {
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
my $numcols=scalar(@partid)*4+2;
- $result .= 'No Changes Occurred For the Students Below '.$noupdate;
+ $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
+ ''.
+ &mt('No Changes Occurred For the Students Below').
+ ' '.
+ &Apache::loncommon::end_data_table_row();
+ foreach my $line (@noupdate) {
+ $result.=
+ &Apache::loncommon::start_data_table_row().
+ $line.
+ &Apache::loncommon::end_data_table_row();
+ }
}
- $result .= '
'."\n".
- &show_grading_menu_form ($symb);
- my $msg = '
Number of records updated = '.$rec_update.
- ' for '.$count.' student'.($count <= 1 ? '' : 's').'.
'.
- 'Total number of students = '.$env{'form.total'}.'
';
+ $result .= &Apache::loncommon::end_data_table().
+ &show_grading_menu_form($symb);
+ my $msg = ''.
+ &mt('Number of records updated = [_1] for [quant,_2,student].',
+ $rec_update,$count).'
'.
+ ''.&mt('Total number of students = [_1]',$env{'form.total'}).
+ '
';
return $title.$msg.$result;
}
@@ -4031,23 +4106,25 @@ LISTJAVASCRIPT
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
my $result=' '.
- 'Manual Grading by Page or Sequence
';
+ &mt('Manual Grading by Page or Sequence').'';
$result.=''."\n";
+ 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" />'."\n";
$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);
@@ -4161,15 +4249,15 @@ sub displayPage {
&Apache::lonnet::clear_EXT_cache_status();
if (!&canview($usec)) {
- $request->print('Unable to view requested student.('.$env{'form.student'}.')');
+ $request->print(''.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'');
$request->print(&show_grading_menu_form($symb));
return;
}
my $result=' '.$env{'form.title'}.'
';
- $result.=' Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
+ $result.=' '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
'
'."\n";
if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
- $result.=' CODE: '.$env{'form.CODE'}.'
'."\n";
+ $result.=' '.&mt('CODE: [_1]',$env{'form.CODE'}).'
'."\n";
} else {
delete($env{'form.CODE'});
}
@@ -4180,7 +4268,7 @@ sub displayPage {
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {
- $request->print('Unable to view requested sequence. ('.$resUrl.')');
+ $request->print(''.&mt('Unable to view requested sequence. ([_1])',$resUrl).'');
$request->print(&show_grading_menu_form($symb));
return;
}
@@ -4202,15 +4290,14 @@ sub displayPage {
''."\n";
}
my $checkIcon = '';
+ '" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
- $studentTable.=' Note: Problems graded correct by the computer are marked with a '.$checkIcon.
- ' symbol.'."\n".
- '
'.
- ''.
- ' Prob. '.
- ' '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade ';
+ $studentTable.=' '.&mt('Note: Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ' Prob. '.
+ ' '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').' '.
+ &Apache::loncommon::end_data_table_header_row();
&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);
@@ -4224,8 +4311,14 @@ sub displayPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.=''.$prob.
- (scalar(@{$parts}) == 1 ? '' : '
('.scalar(@{$parts}).' parts)').' ';
+ $studentTable.=
+ &Apache::loncommon::start_data_table_row().
+ ''.$prob.
+ (scalar(@{$parts}) == 1 ? ''
+ : '
('.&mt('[_1] parts)',
+ scalar(@{$parts}))
+ ).
+ ' ';
$studentTable.='';
my %form = ('CODE' => $env{'form.CODE'},);
if ($env{'form.vProb'} eq 'yes' ) {
@@ -4240,14 +4333,14 @@ sub displayPage {
# $request->print('match='.$1."
\n");
# }
# $companswer =~ s|||g;
- $studentTable.=' '.$title.'
Correct answer:
'.$companswer;
+ $studentTable.=' '.$title.'
'.&mt('Correct answer:
[_1]',$companswer);
}
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
if ($env{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {
- $studentTable.='
No recorded submission for this problem
';
+ $studentTable.='
'.&mt('No recorded submission for this problem.').'
';
} else {
my %responseType = ();
foreach my $partid (@{$parts}) {
@@ -4283,8 +4376,8 @@ sub displayPage {
$curRes = $iterator->next();
}
- $studentTable.='
'."\n".
- ''.
''."\n";
$studentTable.=&show_grading_menu_form($symb);
@@ -4364,13 +4457,13 @@ sub displaySubByDates {
}
}
if (exists($$record{"$where.$partid.checkedin"})) {
- $displaySub[1].='Checked in by '.
- $$record{"$where.$partid.checkedin"}.' into slot '.
- $$record{"$where.$partid.checkedin.slot"}.
- '
';
+ $displaySub[1].=&mt('Checked in by [_1] into slot [_2]',
+ $$record{"$where.$partid.checkedin"},
+ $$record{"$where.$partid.checkedin.slot"}).
+ '
';
}
if (exists $$record{"$where.$partid.award"}) {
- $displaySub[1].='Part: '.$display_part.' '.
+ $displaySub[1].=''.&mt('Part:').' '.$display_part.' '.
lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$where.$partid.solved"}}.
'
';
@@ -4432,12 +4525,14 @@ sub updateGradeByPage {
my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());
- my $studentTable=''.
- ''.
- ' Prob. '.
- ' Title '.
- ' Previous Score '.
- ' New Score ';
+ my $studentTable=
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ' '.&mt('Prob.').' '.
+ ' '.&mt('Title').' '.
+ ' '.&mt('Previous Score').' '.
+ ' '.&mt('New Score').' '.
+ &Apache::loncommon::end_data_table_header_row();
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
@@ -4450,8 +4545,12 @@ sub updateGradeByPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.=''.$prob.
- (scalar(@{$parts}) == 1 ? '' : '
('.scalar(@{$parts}).' parts)').' ';
+ $studentTable.=
+ &Apache::loncommon::start_data_table_row().
+ ''.$prob.
+ (scalar(@{$parts}) == 1 ? ''
+ : '
('.&mt('[quant,_1, parts]',scalar(@{$parts}))
+ ).') ';
$studentTable.=' '.$title.' ';
my %newrecord=();
@@ -4538,14 +4637,14 @@ sub updateGradeByPage {
$studentTable.=''.$displayPts[0].' '.
''.$displayPts[1].' '.
- '
';
+ $studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
'The scores were changed for '.
@@ -4802,52 +4901,48 @@ sub scantron_selectphase {
# Chunk of form to prompt for a file to grade and how:
- $result.= <
-
-
-
-SCANTRONFORM
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::end_data_table().'
+
+';
$r->print($result);
@@ -4856,84 +4951,74 @@ SCANTRONFORM
# Chunk of form to prompt for a scantron file upload.
- $r->print(<
-
-
-
+ $r->print('
+
+ '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+ '.&Apache::loncommon::start_data_table_header_row().'
+
+ '.&mt('Specify a Scantron data file to upload.').'
+
+ '.&Apache::loncommon::end_data_table_header_row().'
+ '.&Apache::loncommon::start_data_table_row().'
- Specify a Scantron data file to upload.
-
-
-
-
-SCANTRONFORM
+');
my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
- $r->print(<print('
-
-UPLOAD
+');
- $r->print(<print('
-
-
-
-
-
-
-SCANTRONFORM
+ $r->print('
+
+
');
$r->print($grading_menu_button);
return
}
@@ -5099,7 +5184,8 @@ sub username_to_idmap {
sub scantron_fixup_scanline {
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
-
+
+
if ($field eq 'ID') {
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
return ($line,1,'New value too large');
@@ -5130,28 +5216,58 @@ sub scantron_fixup_scanline {
$$scantron_config{'CODElength'})=$args->{'CODE'};
}
} elsif ($field eq 'answer') {
- my $length=$scantron_config->{'Qlength'};
+ &scantron_get_maxbubble(); # Need the bubble counter info.
+ my $length =$scantron_config->{'Qlength'};
my $off=$scantron_config->{'Qoff'};
my $on=$scantron_config->{'Qon'};
- my $answer=${off}x$length;
- if ($args->{'response'} eq 'none') {
- &scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},'1');
- } else {
- if ($on eq 'letter') {
- my @alphabet=('A'..'Z');
- $answer=$alphabet[$args->{'response'}];
- } elsif ($on eq 'number') {
- $answer=$args->{'response'}+1;
- if ($answer == 10) { $answer = '0'; }
+ my $question_number = $args->{'question'} -1;
+ my $first_position = $first_bubble_line{$question_number};
+ my $bubble_count = $bubble_lines_per_response{$question_number};
+ my $bubbles_per_line= $$scantron_config{'Qlength'};
+ my $answer=${off}x($bubbles_per_line*$bubble_count);
+ my $final_answer;
+ if ($$scantron_config{'Qon'} eq 'letter' ||
+ $$scantron_config{'Qon'} eq 'number') {
+ $bubbles_per_line = 10;
+ }
+ if (defined $args->{'response'}) {
+
+ if ($args->{'response'} eq 'none') {
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},'1');
} else {
- substr($answer,$args->{'response'},1)=$on;
+ my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
+ if ($on eq 'letter') {
+ my @alphabet=('A'..'Z');
+ $answer=$alphabet[$bubble_number];
+ } elsif ($on eq 'number') {
+ $answer= $bubble_number+1;
+ if ($answer == 10) { $answer = '0'; }
+ } else {
+ substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
+ $final_answer = $answer;
+ }
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},undef,'1');
+
+ # Positional notation already has the right final answer length..
+
+ if (($on eq 'letter') || ($on eq 'number')) {
+ for (my $l = 0; $l < $bubble_count; $l++) {
+ if ($l eq $bubble_line) {
+ $final_answer .= $answer;
+ } else {
+ $final_answer .= ' ';
+ }
+ }
+ }
}
- &scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},undef,'1');
+ # $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ #substr($line,$where-1,$length)=$answer;
+ substr($line,
+ $scantron_config->{'Qstart'}+$first_position-1,
+ $bubbles_per_line*$length) = $final_answer;
}
- my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
- substr($line,$where-1,$length)=$answer;
}
return $line;
}
@@ -5290,10 +5406,9 @@ sub scantron_parse_scanline {
my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;
-
$questnum++;
my $currentquest = substr($questions,0,$answer_length);
- $questions = substr($questions,0,$answer_length)='';
+ $questions = substr($questions,$answer_length);
if (length($currentquest) < $answer_length) { next; }
# Qon letter implies for each slot in currentquest we have:
@@ -5303,7 +5418,6 @@ sub scantron_parse_scanline {
if ($$scantron_config{'Qon'} eq 'letter') {
-
if ($currentquest =~ /\?/
|| $currentquest =~ /\*/
|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
@@ -5332,7 +5446,8 @@ sub scantron_parse_scanline {
}
} else {
for (my $ans = 0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ my $bubble = substr($currentquest, $ans, 1);
+ $record{"scantron.$ansnum.answer"} = $bubble;
$ansnum++;
}
}
@@ -5398,11 +5513,15 @@ sub scantron_parse_scanline {
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);
}
- } elsif (scalar(@array) lt 2) {
+
+
+
+ } elsif (scalar(@array) eq 2) {
my $location = length($array[0]);
- my $line_num = $location / $$scantron_config{'Qlength'};
+ my $line_num = int($location / $$scantron_config{'Qlength'});
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];
+
for (my $ans = 0; $ans < $answers_needed; $ans++) {
if ($ans eq $line_num) {
@@ -5688,7 +5807,7 @@ sub remember_current_skipped {
sub check_for_error {
my ($r,$result)=@_;
if ($result ne 'ok' && $result ne 'not_found' ) {
- $r->print("An error occurred ($result) when trying to Remove the existing corrections.");
+ $r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result));
}
}
@@ -5712,25 +5831,25 @@ sub scantron_warning_screen {
$CODElist=$env{'form.scantron_CODElist'};
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='None'; }
$CODElist=
- ' List of CODES to validate against: '.
+ ''.&mt('List of CODES to validate against:').' '.
$env{'form.scantron_CODElist'}.'
-Please double check the information
- below before clicking on '$button_text'
+
+'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'
-Sequence to be Graded: $title Data File that will be used: $env{'form.scantron_selectfile'} '.&mt('Sequence to be Graded:').' '.$title.' '.&mt('Data File that will be used:').' '.$env{'form.scantron_selectfile'}.'
- If this information is correct, please click on '$button_text'.
- If something is incorrect, please click the 'Grading Menu' button to start over.
+ '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'
+ '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'
-STUFF
+');
}
=pod
@@ -5751,23 +5870,23 @@ sub scantron_do_warning {
if ( $env{'form.selectpage'} eq '' ||
$env{'form.scantron_selectfile'} eq '' ||
$env{'form.scantron_format'} eq '' ) {
- $r->print("You have forgetten to specify some information. Please go Back and try again.
");
+ $r->print("".&mt('You have forgetten to specify some information. Please go Back and try again.')."
");
if ( $env{'form.selectpage'} eq '') {
- $r->print('You have not selected a Sequence to grade
');
+ $r->print(''.&mt('You have not selected a Sequence to grade').'
');
}
if ( $env{'form.scantron_selectfile'} eq '') {
- $r->print('You have not selected a file that contains the student\'s response data.
');
+ $r->print(''.&mt('You have not selected a file that contains the student\'s response data.').'
');
}
if ( $env{'form.scantron_format'} eq '') {
- $r->print('You have not selected a the format of the student\'s response data.
');
+ $r->print(''.&mt('You have not selected a the format of the student\'s response data.').'
');
}
} else {
my $warning=&scantron_warning_screen('Grading: Validate Records');
- $r->print(<
".&show_grading_menu_form($symb));
return '';
@@ -5846,7 +5965,7 @@ sub scantron_validate_file {
if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);
}
- $r->print("Gathering necessary info.
");$r->rflush();
+ $r->print(''.&mt('Gathering necessary info.').'
');$r->rflush();
#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble();
@@ -5866,7 +5985,7 @@ sub scantron_validate_file {
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
- $r->print(" Validating ".$validate_phases[$currentphase]."
");
+ $r->print(' '.&mt('Validating '.$validate_phases[$currentphase]).'
');
$r->rflush();
my $which="scantron_validate_".$validate_phases[$currentphase];
{
@@ -5876,12 +5995,12 @@ sub scantron_validate_file {
}
if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');
- $r->print(<
+'.$warning.'
+
-STUFF
+');
} else {
$r->print('');
@@ -5889,15 +6008,15 @@ STUFF
}
if ($stop) {
if ($validate_phases[$currentphase] eq 'sequence') {
- $r->print('');
- $r->print(' this error
');
+ $r->print('');
+ $r->print(' '.&mt('this error').'
');
- $r->print(" Or click the 'Grading Menu' button to start over.
");
+ $r->print(" ".&mt("Or click the 'Grading Menu' button to start over.")."
");
} else {
- $r->print('');
- $r->print(' using corrected info
');
- $r->print("");
- $r->print(" this scanline saving it for later.");
+ $r->print('');
+ $r->print(' '.&mt('using corrected info').'
');
+ $r->print("");
+ $r->print(" ".&mt("this scanline saving it for later."));
}
}
$r->print("
".&show_grading_menu_form($symb));
@@ -5958,7 +6077,10 @@ sub scantron_remove_scan_data {
}
my $result;
if (@todelete) {
- $result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+ $result = &Apache::lonnet::del('nohist_scantrondata',
+ \@todelete,$cdom,$cname);
+ } else {
+ $result = 'ok';
}
return $result;
}
@@ -6378,30 +6500,32 @@ sub scantron_get_correction {
#to show both the current line and the previous one and allow skipping
#the previous one or the current one
- $r->print("An error was detected ($error)");
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
- $r->print(" for PaperID ".
- $$scan_record{'scantron.PaperID'}." \n");
+ $r->print("
".&mt("An error was detected ($error)".
+ " for PaperID [_1]",
+ $$scan_record{'scantron.PaperID'})."
\n");
} else {
- $r->print(" in scanline $i ".
- $line."
\n");
- }
- my $message="The ID on the form is ".
- $$scan_record{'scantron.ID'}."
\n".
- "The name on the paper is ".
- $$scan_record{'scantron.LastName'}.",".
- $$scan_record{'scantron.FirstName'}."
";
+ $r->print("".&mt("An error was detected ($error)".
+ " in scanline [_1]
[_2]
",
+ $i,$line)." \n");
+ }
+ my $message="".&mt("The ID on the form is [_1]
".
+ "The name on the paper is [_2],[_3]",
+ $$scan_record{'scantron.ID'},
+ $$scan_record{'scantron.LastName'},
+ $$scan_record{'scantron.FirstName'})."
";
$r->print(''."\n");
$r->print(''."\n");
if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {
- $r->print("The encoded ID is not in the classlist\n");
+ $r->print("".&mt("The encoded ID is not in the classlist").
+ "
\n");
} elsif ($error eq 'duplicateID') {
- $r->print("The encoded ID has also been used by a previous paper $arg\n");
+ $r->print("".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."
\n");
}
$r->print($message);
- $r->print("How should I handle this?
\n");
+ $r->print("
".&mt("How should I handle this?")."
\n");
$r->print("\n
- ");
#FIXME it would be nice if this sent back the user ID and
#could do partial userID matches
@@ -6414,14 +6538,14 @@ sub scantron_get_correction {
$r->print('
');
} elsif ($error =~ /CODE$/) {
if ($error eq 'incorrectCODE') {
- $r->print("The encoded CODE is not in the list of possible CODEs
\n");
+ $r->print("".&mt("The encoded CODE is not in the list of possible CODEs.")."
\n");
} elsif ($error eq 'duplicateCODE') {
- $r->print("The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique
\n");
+ $r->print("".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."
\n");
}
- $r->print("The CODE on the form is '".
- $$scan_record{'scantron.CODE'}."'
\n");
+ $r->print("
".&mt("The CODE on the form is '[_1]'",
+ $$scan_record{'scantron.CODE'})."
\n");
$r->print($message);
- $r->print("
How should I handle this?
\n");
+ $r->print("
".&mt("How should I handle this?")."
\n");
$r->print("\n
");
my $i=0;
if ($error eq 'incorrectCODE'
@@ -6431,7 +6555,13 @@ sub scantron_get_correction {
foreach my $testcode (@{$closest}) {
my $checked='';
if (!$i) { $checked=' checked="checked" '; }
- $r->print("");
+ $r->print("
+
+ ");
$r->print("\n
");
$i++;
}
@@ -6439,7 +6569,12 @@ sub scantron_get_correction {
}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
my $checked; if (!$i) { $checked=' checked="checked" '; }
- $r->print("");
+ $r->print("
+ ");
$r->print("\n
");
}
@@ -6461,17 +6596,27 @@ ENDSCRIPT
"&curCODE=".&escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
if ($env{'form.scantron_CODElist'} =~ /\S/) {
- $r->print(" Selected CODE is ");
+ $r->print("
+
+ ".&mt("Selected CODE is [_1]",""));
$r->print("\n
");
}
- $r->print(" as the CODE.");
+ $r->print("
+ "));
$r->print("\n
");
} elsif ($error eq 'doublebubble') {
- $r->print("
There have been multiple bubbles scanned for a some question(s)
\n");
+ $r->print("".&mt("There have been multiple bubbles scanned for a some question(s)")."
\n");
$r->print('');
$r->print($message);
- $r->print("Please indicate which bubble should be used for grading
");
+ $r->print("".&mt("Please indicate which bubble should be used for grading")."
");
foreach my $question (@{$arg}) {
my $selected = &get_response_bubbles($scan_record, $question);
my @select_array = split(/:/,$selected);
@@ -6479,10 +6624,10 @@ ENDSCRIPT
@select_array);
}
} elsif ($error eq 'missingbubble') {
- $r->print("There have been no bubbles scanned for some question(s)
\n");
+ $r->print("".&mt("There have been no bubbles scanned for some question(s)")."
\n");
$r->print($message);
- $r->print("Please indicate which bubble should be used for grading
");
- $r->print("Some questions have no scanned bubbles\n");
+ $r->print("".&mt("Please indicate which bubble should be used for grading.")."
");
+ $r->print(&mt("Some questions have no scanned bubbles")."\n");
$r->print('');
foreach my $question (@{$arg}) {
@@ -6529,6 +6674,7 @@ sub scantron_bubble_selector {
my $total_lines = $lines*2;
my @alphabet=('A'..'Z');
+
$r->print("$quest ");
for (my $l = 0; $l < $lines; $l++) {
@@ -6552,7 +6698,7 @@ sub scantron_bubble_selector {
my $lspan = $total_lines * 2; # 2 table rows per bubble line.
$r->print('print('
-
-UPLOAD
+');
return '';
}
@@ -7084,12 +7236,12 @@ sub scantron_upload_scantron_data_save {
my $doanotherupload=
'
'."\n";
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
- $r->print("You are not allowed to upload Scantron data to the requested course.
");
+ $r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."
");
if ($symb) {
$r->print(&show_grading_menu_form($symb));
} else {
@@ -7098,7 +7250,7 @@ sub scantron_upload_scantron_data_save {
return '';
}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
- $r->print("Doing upload to ".$coursedata{'description'}."
");
+ $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})."
");
my $fname=$env{'form.upfile.filename'};
#FIXME
#copied from lonnet::userfileupload()
@@ -7116,13 +7268,18 @@ sub scantron_upload_scantron_data_save {
my $uploadedfile=$fname;
$fname='scantron_orig_'.$fname;
if (length($env{'form.upfile'}) < 2) {
- $r->print("Error: The file you attempted to upload, ".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').", contained no information. Please check that you entered the correct filename.");
+ $r->print(&mt("Error: The file you attempted to upload, [_1] contained no information. Please check that you entered the correct filename.",''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').""));
} else {
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
if ($result =~ m|^/uploaded/|) {
- $r->print("Success: Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location ".$result."");
+ $r->print(&mt("Success: Successfully uploaded [_1] bytes of data into location [_2]",
+ (length($env{'form.upfile'})-1),
+ ''.$result.""));
} else {
- $r->print("Error: An error (".$result.") occurred when attempting to upload the file, ".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."");
+ $r->print(&mt("Error: An error ([_1]) occurred when attempting to upload the file, [_2]",
+ $result,
+ ''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').""));
+
}
}
if ($symb) {
@@ -7166,11 +7323,11 @@ sub scantron_download_scantron_data {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};
if (! &valid_file($file)) {
- $r->print(<print('
- The requested file name was invalid.
+ '.&mt('The requested file name was invalid.').'
-ERROR
+');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return;
}
@@ -7180,17 +7337,20 @@ ERROR
&Apache::lonnet::allowuploaded('/adm/grades',$orig);
&Apache::lonnet::allowuploaded('/adm/grades',$corrected);
&Apache::lonnet::allowuploaded('/adm/grades',$skipped);
- $r->print(<print('
- Original file as uploaded by the scantron office.
+ '.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
+ '','').'
- Corrections, a file of corrected records that were used in grading.
+ '.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.',
+ '','').'
- Skipped, a file of records that were skipped.
+ '.&mt('[_1]Skipped[_2], a file of records that were skipped.',
+ '','').'
-DOWNLOAD
+');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';
}
@@ -7214,7 +7374,7 @@ sub show_grading_menu_form {
''."\n".
''."\n".
''."\n".
- ''."\n".
+ ''."\n".
''."\n";
return $result;
}
@@ -7284,7 +7444,7 @@ sub grading_menu {
$Str .= ''.
''."\n".
''."\n".
- ''."\n".
+ ''."\n".
''."\n".
''."\n".
''."\n";
@@ -7297,18 +7457,18 @@ sub grading_menu {
$menudata->{'url'}.'" >'.
$menudata->{'name'}."\n";
} else {
- $Str .=' {'jscript'}.
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' />
';
$Str .= (' 'x8).
- ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
- '-';
+ &mt(' receipt: [_1]',
+ &Apache::lonnet::recprefix($env{'request.course.id'}).
+ '-');
}
$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
"\n";
}
- $Str .="\n";
$Str .="\n";
$request->print(<
| \n"; $result.=(($ctr+1)%10 == 0 ? ' |
Assign Grade to Specific Students in '.$sectionClass;
+ $result.= ''.&mt('Assign Grade to Specific Students in '.$sectionClass,
+ $section_display).'
';
$result.= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
- 'No. '.
+ ''.&mt('No.').' '.
''.&nameUserString('header')." \n";
my (@parts) = sort(&getpartlist($symb));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
@@ -3244,13 +3295,20 @@ sub viewgrades {
push(@partids, $partid);
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
- $result.='Score Part: '.$display_part.
- '
(weight = '.$weight{$partid}.') '."\n";
+ $result.=''.
+ &mt('Score Part: [_1]
(weight = [_2])',
+ $display_part,$weight{$partid}).' '."\n";
next;
+
} else {
- $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
+ if ($display =~ /Problem Status/) {
+ my $grade_status_mt = &mt('Grade Status');
+ $display =~ s{Problem Status}{$grade_status_mt
};
+ }
+ my $part_mt = &mt('Part:');
+ $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
}
- $display =~ s|Problem Status|Grade Status
|;
+
$result.=''.$display.' '."\n";
}
$result.=&Apache::loncommon::end_data_table_header_row();
@@ -3275,14 +3333,14 @@ sub viewgrades {
}
$result.=&Apache::loncommon::end_data_table();
$result.=''."\n";
- $result.=''."\n";
if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
$result=''.
- &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
+ &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
$section_display, $stu_status).
'';
}
@@ -3338,9 +3396,9 @@ sub viewstudentgrade {
$result.=' \n";
} else {
$result.='
';
- $title.='(weight = '.$weight{$partid}.')
(weight = [_2])', + $display_part,$weight{$partid}).'
'.&mt('Current Resource: [_1]',$env{'form.probTitle'}).'
'."\n"; + my $title='
'.&mt('Current Grade Status').'
'; + $title.=''.&mt('Current Resource: [_1]',$env{'form.probTitle'}).'
'."\n"; $title.=''.&mt('Section: [_1]',$section_display).'
'."\n"; - my $result= ''."\n";
- $result.= '
|
Number of records updated = '.$rec_update. - ' for '.$count.' student'.($count <= 1 ? '' : 's').'.
'. - 'Total number of students = '.$env{'form.total'}.'
'; + $result .= &Apache::loncommon::end_data_table(). + &show_grading_menu_form($symb); + my $msg = '
'.
+ &mt('Number of records updated = [_1] for [quant,_2,student].',
+ $rec_update,$count).'
'.
+ ''.&mt('Total number of students = [_1]',$env{'form.total'}).
+ '
'. - 'Manual Grading by Page or Sequence
'; + &mt('Manual Grading by Page or Sequence').''; $result.=''."\n"; + 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" />'."\n"; $studentTable.=&show_grading_menu_form($symb); $request->print($studentTable); @@ -4161,15 +4249,15 @@ sub displayPage { &Apache::lonnet::clear_EXT_cache_status(); if (!&canview($usec)) { - $request->print('Unable to view requested student.('.$env{'form.student'}.')'); + $request->print(''.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).''); $request->print(&show_grading_menu_form($symb)); return; } my $result=''.$env{'form.title'}.'
'; - $result.=' Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
+ $result.=' '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
'
'."\n";
if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
- $result.=' CODE: '.$env{'form.CODE'}.'
'."\n";
+ $result.=' '.&mt('CODE: [_1]',$env{'form.CODE'}).'
'."\n";
} else {
delete($env{'form.CODE'});
}
@@ -4180,7 +4268,7 @@ sub displayPage {
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {
- $request->print('Unable to view requested sequence. ('.$resUrl.')');
+ $request->print(''.&mt('Unable to view requested sequence. ([_1])',$resUrl).'');
$request->print(&show_grading_menu_form($symb));
return;
}
@@ -4202,15 +4290,14 @@ sub displayPage {
''."\n";
}
my $checkIcon = '';
+ '" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
- $studentTable.=' Note: Problems graded correct by the computer are marked with a '.$checkIcon.
- ' symbol.'."\n".
- '
'.
- '
| |||||||||||||||||||||||||
| List of CODES to validate against: | '.
+ '| '.&mt('List of CODES to validate against:').' | '.
$env{'form.scantron_CODElist'}.' |
- If this information is correct, please click on '$button_text'. -If something is incorrect, please click the 'Grading Menu' button to start over. +'.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).' +'.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').' -STUFF +'); } =pod @@ -5751,23 +5870,23 @@ sub scantron_do_warning { if ( $env{'form.selectpage'} eq '' || $env{'form.scantron_selectfile'} eq '' || $env{'form.scantron_format'} eq '' ) { - $r->print(" You have forgetten to specify some information. Please go Back and try again. "); + $r->print("".&mt('You have forgetten to specify some information. Please go Back and try again.')." "); if ( $env{'form.selectpage'} eq '') { - $r->print('You have not selected a Sequence to grade '); + $r->print(''.&mt('You have not selected a Sequence to grade').' '); } if ( $env{'form.scantron_selectfile'} eq '') { - $r->print('You have not selected a file that contains the student\'s response data. '); + $r->print(''.&mt('You have not selected a file that contains the student\'s response data.').' '); } if ( $env{'form.scantron_format'} eq '') { - $r->print('You have not selected a the format of the student\'s response data. '); + $r->print(''.&mt('You have not selected a the format of the student\'s response data.').' '); } } else { my $warning=&scantron_warning_screen('Grading: Validate Records'); - $r->print(<".&show_grading_menu_form($symb)); return ''; @@ -5846,7 +5965,7 @@ sub scantron_validate_file { if ($env{'form.scantron_corrections'}) { &scantron_process_corrections($r); } - $r->print(" Gathering necessary info. ");$r->rflush(); + $r->print(''.&mt('Gathering necessary info.').' ');$r->rflush(); #get the student pick code ready $r->print(&Apache::loncommon::studentbrowser_javascript()); my $max_bubble=&scantron_get_maxbubble(); @@ -5866,7 +5985,7 @@ sub scantron_validate_file { my $stop=0; while (!$stop && $currentphase < scalar(@validate_phases)) { - $r->print("Validating ".$validate_phases[$currentphase]." "); + $r->print(''.&mt('Validating '.$validate_phases[$currentphase]).' '); $r->rflush(); my $which="scantron_validate_".$validate_phases[$currentphase]; { @@ -5876,12 +5995,12 @@ sub scantron_validate_file { } if (!$stop) { my $warning=&scantron_warning_screen('Start Grading'); - $r->print(<+'.$warning.' + -STUFF +'); } else { $r->print(''); @@ -5889,15 +6008,15 @@ STUFF } if ($stop) { if ($validate_phases[$currentphase] eq 'sequence') { - $r->print(''); - $r->print(' this error '); + $r->print(''); + $r->print(' '.&mt('this error').' '); - $r->print(" Or click the 'Grading Menu' button to start over. "); + $r->print("".&mt("Or click the 'Grading Menu' button to start over.")." "); } else { - $r->print(''); - $r->print(' using corrected info'); - $r->print(""); - $r->print(" this scanline saving it for later."); + $r->print(''); + $r->print(' '.&mt('using corrected info').' '); + $r->print(""); + $r->print(" ".&mt("this scanline saving it for later.")); } } $r->print(" ".&show_grading_menu_form($symb)); @@ -5958,7 +6077,10 @@ sub scantron_remove_scan_data { } my $result; if (@todelete) { - $result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname); + $result = &Apache::lonnet::del('nohist_scantrondata', + \@todelete,$cdom,$cname); + } else { + $result = 'ok'; } return $result; } @@ -6378,30 +6500,32 @@ sub scantron_get_correction { #to show both the current line and the previous one and allow skipping #the previous one or the current one - $r->print(" An error was detected ($error)"); if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { - $r->print(" for PaperID ". - $$scan_record{'scantron.PaperID'}." \n"); + $r->print(" ".&mt("An error was detected ($error)". + " for PaperID [_1]", + $$scan_record{'scantron.PaperID'})." \n"); } else { - $r->print(" in scanline $i". - $line."\n"); - } - my $message=" The ID on the form is ".
- $$scan_record{'scantron.ID'}." ".&mt("An error was detected ($error)". + " in scanline [_1] [_2]", + $i,$line)." \n"); + } + my $message=" ".&mt("The ID on the form is [_1] ".&mt("The encoded ID is not in the classlist"). + " \n"); } elsif ($error eq 'duplicateID') { - $r->print("The encoded ID has also been used by a previous paper $arg\n"); + $r->print("".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)." \n"); } $r->print($message); - $r->print("How should I handle this? ".&mt("How should I handle this?")."
The encoded CODE is not in the list of possible CODEs \n"); + $r->print("".&mt("The encoded CODE is not in the list of possible CODEs.")." \n"); } elsif ($error eq 'duplicateCODE') { - $r->print("The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique \n"); + $r->print("".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))." \n"); } - $r->print("The CODE on the form is '".
- $$scan_record{'scantron.CODE'}."' ".&mt("The CODE on the form is '[_1]'",
+ $$scan_record{'scantron.CODE'})." How should I handle this? ".&mt("How should I handle this?")." There have been multiple bubbles scanned for a some question(s) \n"); + $r->print("".&mt("There have been multiple bubbles scanned for a some question(s)")." \n"); $r->print(''); $r->print($message); - $r->print("Please indicate which bubble should be used for grading "); + $r->print("".&mt("Please indicate which bubble should be used for grading")." "); foreach my $question (@{$arg}) { my $selected = &get_response_bubbles($scan_record, $question); my @select_array = split(/:/,$selected); @@ -6479,10 +6624,10 @@ ENDSCRIPT @select_array); } } elsif ($error eq 'missingbubble') { - $r->print("There have been no bubbles scanned for some question(s) \n"); + $r->print("".&mt("There have been no bubbles scanned for some question(s)")." \n"); $r->print($message); - $r->print("Please indicate which bubble should be used for grading "); - $r->print("Some questions have no scanned bubbles\n"); + $r->print("".&mt("Please indicate which bubble should be used for grading.")." "); + $r->print(&mt("Some questions have no scanned bubbles")."\n"); $r->print(''); foreach my $question (@{$arg}) { @@ -6529,6 +6674,7 @@ sub scantron_bubble_selector { my $total_lines = $lines*2; my @alphabet=('A'..'Z'); + $r->print("
|