--- loncom/homework/grades.pm 2014/01/29 16:31:20 1.715
+++ loncom/homework/grades.pm 2014/01/30 19:11:05 1.717
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.715 2014/01/29 16:31:20 bisitz Exp $
+# $Id: grades.pm,v 1.717 2014/01/30 19:11:05 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -437,7 +437,8 @@ sub cleanRecord {
$result.='';
return $result;
}
- } elsif ( $response =~ m/(?:numerical|formula)/) {
+ } elsif ( $response =~ m/(?:numerical|formula|custom)/) {
+ # Respect multiple input fields, see Bug #5409
$answer =
&Apache::loncommon::format_previous_attempt_value('submission',
$answer);
@@ -2513,8 +2514,11 @@ sub get_last_submission {
}
my ($partid,$foo) = split(/submission$/,$key);
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
- 'Draft Copy ' : '';
- push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
+ ''.&mt('Draft Copy').' ' : '';
+ #push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
+ push(@string, join(':', $key, $hide, $draft.(
+ ref($lasthash{$key}) eq 'ARRAY' ?
+ join(',', @{$lasthash{$key}}) : $lasthash{$key}) ));
}
}
if (!@string) {
@@ -2542,8 +2546,10 @@ sub keywords_highlight {
sub show_previous_task_version {
my ($request,$symb) = @_;
if ($symb eq '') {
- $request->print("Unable to handle ambiguous references.");
-
+ $request->print(
+ ''.
+ &mt('Unable to handle ambiguous references.').
+ '');
return '';
}
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});