--- loncom/interface/lonparmset.pm 2007/12/01 03:45:17 1.388
+++ loncom/interface/lonparmset.pm 2008/10/10 15:29:17 1.412
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.388 2007/12/01 03:45:17 albertel Exp $
+# $Id: lonparmset.pm,v 1.412 2008/10/10 15:29:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -973,7 +973,7 @@ sub extractResourceInformation {
if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
my $parmdis = $display;
- $parmdis =~ s/\[Part.*$//g;
+ $parmdis =~ s/\s*\[Part.*$//g;
$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {
$$defkeytype{$name}=
@@ -985,7 +985,7 @@ sub extractResourceInformation {
# allparts is a hash of all parts
#
my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
- $$allparts{$part} = "Part: $part";
+ $$allparts{$part} = &mt('Part: [_1]',$part);
#
# Remember all keys going with this resource
#
@@ -1010,7 +1010,7 @@ sub extractResourceInformation {
$$mapp{$mapid}=$$mapp{$id};
$$allmaps{$mapid}=$$mapp{$id};
if ($mapid eq '1') {
- $$maptitles{$mapid}='Main Course Documents';
+ $$maptitles{$mapid}=&mt('Main Course Documents');
} else {
$$maptitles{$mapid}=
&Apache::lonnet::gettitle($$mapp{$id});
@@ -1107,8 +1107,8 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked');
}
- $r->print('>'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
- : $tempkey)
+ $r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+ : &mt($tempkey))
.'');
$cnt++;
if ($cnt==3) {
@@ -1116,28 +1116,53 @@ ENDSCRIPT
$cnt=0;
}
}
- $r->print('
-
');
+ $r->print(''
+ .''
+ );
}
sub partmenu {
my ($r,$allparts,$psprt)=@_;
$r->print('