--- loncom/homework/inputtags.pm 2004/07/15 19:44:54 1.148
+++ loncom/homework/inputtags.pm 2004/10/04 18:15:22 1.151
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.148 2004/07/15 19:44:54 albertel Exp $
+# $Id: inputtags.pm,v 1.151 2004/10/04 18:15:22 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -347,8 +347,8 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
+ $message.=" ".&mt("Computer's answer now shown above.");
}
- $message.=" ".&mt("Computer's answer now shown.");
$added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
@@ -380,8 +380,8 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
+ $message.=" ".&mt("Computer's answer now shown above.");
}
- $message.=" ".&mt("Computer's answer now shown.");
$added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
@@ -439,17 +439,17 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_STUDENT') {
- $message = &mt('Unable to interpret units. Computer reads units as "[_1]"',''.$awardmsg.'.');
+ $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',''.$awardmsg.'');
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
- $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ',''.$awardmsg.'.');
+ $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',''.$awardmsg.'');
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
- $message = &mt('Only a number required. Computer reads units of "[_1]"',''.$awardmsg.'.');
+ $message = &mt('Only a number required. Computer reads units of "[_1]".',''.$awardmsg.'');
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
@@ -491,8 +491,8 @@ sub decideoutput {
$button=1;
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
- !$added_computer_text) {
- $message.=" ".&mt("Computer's answer now shown.");
+ !$added_computer_text && $target ne 'tex') {
+ $message.=" ".&mt("Computer's answer now shown above.");
$added_computer_text=1;
}
return ($button,$bgcolor,$message,$previousmsg);