--- loncom/homework/grades.pm 2013/07/16 17:17:33 1.695 +++ loncom/homework/grades.pm 2013/07/24 15:12:33 1.698 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.695 2013/07/16 17:17:33 bisitz Exp $ +# $Id: grades.pm,v 1.698 2013/07/24 15:12:33 kruse Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2239,11 +2239,19 @@ KEYWORDS '('.&mt('Response ID: [_1]',$respid).')'. '   '; my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); + if (@$files) { if ($hide eq 'anon') { $lastsubonly.='
'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); } else { - $lastsubonly.='
'.&mt('Like all files provided by users, this file may contain viruses').'
'; + $lastsubonly.='

'.''.&mt('Submitted Files:').'' + .'
'; + if(@$files == 1) { + $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!'); + } else { + $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); + } + $lastsubonly .= ''; foreach my $file (@$files) { &Apache::lonnet::allowuploaded('/adm/grades',$file); $lastsubonly.='
'.$file.''; @@ -2252,9 +2260,9 @@ KEYWORDS $lastsubonly.='
'; } if ($hide eq 'anon') { - $lastsubonly.=''.&mt('Anonymous Survey').''; + $lastsubonly.='
'.&mt('Anonymous Survey').''; } else { - $lastsubonly.=''.&mt('Submitted Answer:').' '. + $lastsubonly.='
'.&mt('Submitted Answer:').' '. &cleanRecord($subval,$responsetype,$symb,$partid, $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed); } @@ -3638,8 +3646,8 @@ sub viewgrades { my $display_part=&get_display_part($partid,$symb); if ($display =~ /^Partial Credit Factor/) { $result.=''. - &mt('Score Part: [_1]
(weight = [_2])', - $display_part,$weight{$partid}).''."\n"; + &mt('Score Part: [_1][_2](weight = [_3])', + $display_part,'
',$weight{$partid}).''."\n"; next; } else { @@ -9782,7 +9790,7 @@ ENDHEADER &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) { if ($correct_count==0) { - $errormsg.="Found no correct answers answers for grading!"; + $errormsg.="Found no correct answers for grading!"; } elsif ($correct_count>1) { $result.='
'.&mt("Found [_1] entries for grading!",$correct_count).''; } @@ -9954,7 +9962,7 @@ sub assign_clicker_grades { if ($user) { if ($users{$user}) { $result.='
'. - &mt("More than one entry found for [_1]!",$user). + &mt('More than one entry found for [_1]!',''.$user.''). '
'; } $users{$user}=1;