--- loncom/interface/lonparmset.pm 2009/01/20 18:37:30 1.424
+++ loncom/interface/lonparmset.pm 2009/02/13 17:46:00 1.429
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.424 2009/01/20 18:37:30 bisitz Exp $
+# $Id: lonparmset.pm,v 1.429 2009/02/13 17:46:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -848,12 +848,13 @@ sub plink {
my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
unless (defined($winvalue)) { $winvalue=$val; }
my $valout = &valout($value,$type,1);
+ my $unencmarker = $marker;
foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
\$hour, \$min, \$sec) {
$$item = &HTML::Entities::encode($$item,'"<>&');
$$item =~ s/\'/\\\'/g;
}
- return '
|
'.
+ return '';
@@ -974,12 +975,13 @@ sub print_row {
.$$part{$which}.' | ');
} else {
$parm=~s|\[.*\]\s||g;
+ $parm=&mt($parm);
}
my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
if ($automatic) {
$parm.='
'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'';
}
- $r->print(''.$parm.' | ');
+ $r->print(''.$parm.' | ');
my $thismarker=$which;
$thismarker=~s/^parameter\_//;
@@ -1315,9 +1317,14 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');
}
- $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
- : &mt($tempkey))
- .'');
+ my $displaykey;
+ if ($$allparms{$tempkey}=~/\S/) {
+ $displaykey = $$allparms{$tempkey};
+ } else {
+ $displaykey = $tempkey;
+ }
+ $displaykey =~ s/(\[|\])/~$1/g;
+ $r->print(' />'.&mt($displaykey).'');
$cnt++;
if ($cnt==3) {
$r->print("
\n");
@@ -2294,12 +2301,12 @@ sub crsenv {
my ($name,$domain) = split(':',$user);
if (!defined($user) || !defined($domain)) {
$setoutput.= '
'.
- &mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ &mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
'';
undef($value);
} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
$setoutput.= '
'.
- &mt("Invalid email address specified, user [_1] is unknown.",$name).
+ &mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
'';
undef($value);
}