--- loncom/homework/inputtags.pm 2003/10/15 22:20:13 1.114.2.4 +++ loncom/homework/inputtags.pm 2003/09/17 20:51:15 1.115 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.114.2.4 2003/10/15 22:20:13 albertel Exp $ +# $Id: inputtags.pm,v 1.115 2003/09/17 20:51:15 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ package Apache::inputtags; use HTML::Entities(); use strict; use Apache::loncommon; +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); @@ -332,22 +333,22 @@ sub decideoutput { 'not_charged_try' => '#ffffaa', 'no_message' => '#fffff', ); - if ($previous) { $previousmsg='You have entered that answer before'; } + if ($previous) { $previousmsg=&mt('You have entered that answer before'); } if ($solved =~ /^correct/) { if ($award eq 'ASSIGNED_SCORE') { - $message = "A score has been assigned."; + $message = &mt("A score has been assigned."); } else { if ($target eq 'tex') { - $message = '\textbf{You are correct}.'; + $message = '\textbf{'.&mt('You are correct.').'}'; } else { - $message = "You are correct."; + $message = "".&mt('You are correct.').""; } unless ($ENV{'course.'. $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { $message.=(($target eq 'web')?'
':' '). - 'Your receipt is '.&Apache::lonnet::receipt(). + &mt('Your receipt is').' '.&Apache::lonnet::receipt(). (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } } @@ -356,20 +357,20 @@ sub decideoutput { $previousmsg=''; } elsif ($solved =~ /^excused/) { if ($target eq 'tex') { - $message = ' \textbf{You are excused from the problem.} '; + $message = ' \textbf{'.&mt('You are excused from the problem.').'} '; } else { - $message = "You are excused from the problem."; + $message = "".&mt('You are excused from the problem.').""; } $bgcolor=$possiblecolors{'charged_try'}; $button=0; $previousmsg=''; } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { if ($solved =~ /^incorrect/ || $solved eq '') { - $message = "Incorrect"; + $message = &mt("Incorrect"); $bgcolor=$possiblecolors{'charged_try'}; $button=1; } else { - $message = "You are correct."; + $message = "".&mt('You are correct.').""; unless ($ENV{'course.'. $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { @@ -386,60 +387,60 @@ sub decideoutput { $bgcolor=$possiblecolors{'no_feedback'}; $button=1; } elsif ($award eq 'MISSING_ANSWER') { - $message = 'Some parts were not submitted'; + $message = &mt('Some parts were not submitted.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button = 1; } elsif ($award eq 'ERROR') { - $message = 'An error occured while grading your answer.'; + $message = &mt('An error occured while grading your answer.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button = 1; } elsif ($award eq 'TOO_LONG') { - $message = "The submitted answer was too long."; + $message = &mt("The submitted answer was too long."); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'WANTED_NUMERIC') { - $message = "This question expects a numeric answer"; + $message = &mt("This question expects a numeric answer."); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'MISORDERED_RANK') { - $message = 'You have provided an invalid ranking'; + $message = &mt('You have provided an invalid ranking'); if ($target ne 'tex') { - $message.=', please refer to '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; + $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; } $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'INVALID_FILETYPE') { - $message = 'The filetype extension of the file you uploaded is not allowed.'; + $message = &mt('The filetype extension of the file you uploaded is not allowed.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'SIG_FAIL') { - $message = "Please adjust significant figures.";# you provided %s significant figures"; + $message = &mt("Please adjust significant figures.");# you provided %s significant figures"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_FAIL') { - $message = "Units incorrect. "; + $message = &mt("Units incorrect."); if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_NOTNEEDED') { - $message = "Only a number required.";# Computer reads units of %s"; + $message = &mt("Only a number required.");# Computer reads units of %s"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'NO_UNIT') { - $message = "Units required"; + $message = &mt("Units required"); if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'BAD_FORMULA') { - $message = "Unable to understand formula"; + $message = &mt("Unable to understand formula"); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'INCORRECT') { - $message = "Incorrect"; + $message = &mt("Incorrect"); $bgcolor=$possiblecolors{'charged_try'}; $button=1; } elsif ($award eq 'SUBMITTED') { - $message = "Your submission has been recorded."; + $message = &mt("Your submission has been recorded."); $bgcolor=$possiblecolors{'correct'}; $button=1; } elsif ($award eq 'DRAFT') { @@ -451,12 +452,11 @@ sub decideoutput { $bgcolor=$possiblecolors{'correct'}; $button=0; } else { - $message = "Unknown message: $award"; + $message = &mt("Unknown message").": $award"; $button=1; } - if (lc($Apache::lonhomework::problemstatus) eq 'no' && - $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { - $message = "Answer Submitted"; + if (lc($Apache::lonhomework::problemstatus) eq 'no') { + $message = &mt("Answer Submitted"); $bgcolor=$possiblecolors{'correct'}; $button=1; } @@ -517,9 +517,6 @@ sub setgradedata { } elsif ( $award eq 'INCORRECT' ) { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; - if (lc($Apache::lonhomework::problemstatus) eq 'no') { - $Apache::lonhomework::results{"resource.$id.awarded"} = 0; - } $Apache::lonhomework::results{"resource.$id.solved"} = 'incorrect_attempted' } elsif ( $award eq 'SUBMITTED' ) { @@ -539,7 +536,6 @@ sub setgradedata { if (lc($Apache::lonhomework::problemstatus) eq 'no') { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; - $Apache::lonhomework::results{"resource.$id.awarded"} = 0; } } @@ -620,8 +616,7 @@ sub gradestatus { my $status = $Apache::inputtags::status['-1']; &Apache::lonxml::debug("gradestatus has :$status:"); - if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && - $status ne 'INVALID_ACCESS') { + if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { my $award = $Apache::lonhomework::history{"resource.$id.award"}; my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; my $previous = $Apache::lonhomework::history{"resource.$id.previous"};