--- loncom/homework/inputtags.pm 2003/08/04 21:18:55 1.112
+++ loncom/homework/inputtags.pm 2003/09/23 15:59:53 1.119
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.112 2003/08/04 21:18:55 albertel Exp $
+# $Id: inputtags.pm,v 1.119 2003/09/23 15:59:53 albertel 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,58 +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, please refer to '.
- &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ $message = &mt('You have provided an invalid ranking');
+ if ($target ne 'tex') {
+ $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. ".
- &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
+ $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".
- &Apache::loncommon::help_open_topic('Physical_Units');
+ $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') {
@@ -449,11 +452,12 @@ 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') {
- $message = "Answer Submitted";
+ if (lc($Apache::lonhomework::problemstatus) eq 'no' &&
+ $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
+ $message = &mt("Answer Submitted");
$bgcolor=$possiblecolors{'correct'};
$button=1;
}
@@ -514,6 +518,9 @@ 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' ) {
@@ -533,6 +540,7 @@ 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;
}
}
@@ -640,18 +648,18 @@ sub gradestatus {
if ( $showbutton ) {
if ($target eq 'tex') {
if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
- $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+ $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
} else {
$trystr = '\vskip 0 mm ';
}
} else {
- $trystr = "