--- loncom/interface/lonparmset.pm 2009/05/20 18:03:04 1.413.4.1
+++ loncom/interface/lonparmset.pm 2010/01/25 22:11:57 1.413.4.4
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.413.4.1 2009/05/20 18:03:04 raeburn Exp $
+# $Id: lonparmset.pm,v 1.413.4.4 2010/01/25 22:11:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1165,7 +1165,7 @@ sub extractResourceInformation {
$parmdis = $display;
$parmdis =~ s/\s*\[Part.*$//g;
} else {
- $parmdis = $display;
+ $parmdis = &mt($display);
}
$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {
@@ -2040,7 +2040,7 @@ ENDTABLEHEADFOUR
\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,
$cgroup,\@usersgroups);
- $print(''."\n");
+ $r->print(''."\n");
}
}
}
@@ -2540,9 +2540,11 @@ sub listdata {
#
# Ready to print
#
+ my $parmitem = &standard_parameter_names($name);
+
$r->print(&tablestart().
&Apache::loncommon::start_data_table_row().
- '
'.&standard_parameter_names($name).
+ ' '.&mt($parmitem).
' ');
$foundkeys++;
@@ -2929,9 +2931,10 @@ ENDOVER
$display_value =
&Apache::lonlocal::locallocaltime($display_value);
}
+ my $parmitem = &standard_parameter_names($data{'parameter_name'});
+ $parmitem = &mt($parmitem);
$r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
- &standard_parameter_names($data{'parameter_name'}),
- $resourcedata->{$thiskey}));
+ $parmitem,$resourcedata->{$thiskey}));
$r->print(' ');
if ($data{'scope_type'} eq 'all') {
$r->print(&mt('All users'));
@@ -3180,10 +3183,13 @@ ENDMAINFORMHEAD
my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
my $mgr = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+ my $crstype = &Apache::loncommon::course_type();
+ my $lc_crstype = lc($crstype);
+
my @menu =
- ( { divider=>'Settings for Your Course',
+ ( { divider=>"Settings for Your $crstype",
},
- { text => 'Edit course configuration',
+ { text => "Edit $lc_crstype configuration",
url => '/adm/courseprefs?origin=params',
permission => $parm_permission,
help => 'Course_Environment',
@@ -3192,7 +3198,7 @@ ENDMAINFORMHEAD
action => 'setrestrictmeta',
permission => $parm_permission,
},
- { text => 'Manage Course Slots',
+ { text => "Manage $crstype Slots",
url => '/adm/slotrequest?command=showslots',
permission => $vgr,
},
@@ -3229,7 +3235,7 @@ ENDMAINFORMHEAD
permission => $parm_permission,
help => 'Parameter_Overview',
},
- { text => 'Parameter Change Log and Course Blog Posting/User Notification',
+ { text => "Parameter Change Log and $crstype Blog Posting/User Notification",
action => 'parameterchangelog',
permission => $parm_permission,
},
@@ -3713,8 +3719,8 @@ ENDYESNO
$r->print(' '.&Apache::loncommon::end_data_table_row());
}
$r->print(&Apache::loncommon::end_data_table().
- "\n".' '."\n".
+ "\n".' '."\n".
&Apache::loncommon::end_page());
return;
}
@@ -3772,7 +3778,6 @@ sub load_parameter_names {
close($config);
$standard_parms{'int_pos'} = 'Positive Integer';
$standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
- %standard_parms=&Apache::lonlocal::texthash(%standard_parms);
}
sub standard_parameter_names {
@@ -3886,15 +3891,18 @@ sub parm_change_log {
} else {
$makenewrow=1;
}
+ my $parmitem = &standard_parameter_names($parmname);
$output .=''.$realm.' '.$section.' '.
- &standard_parameter_names($parmname).' '.
+ &mt($parmitem).' '.
($part?&mt('Part: [_1]',$part):&mt('All Parts')).' ';
my $stillactive=0;
if ($parmlog{$id}{'delflag'}) {
$output .= &mt('Deleted');
} else {
if ($typeflag) {
- $output .= &mt('Type: [_1]',&standard_parameter_names($value));
+ my $parmitem = &standard_parameter_names($value);
+ $parmitem = &mt($parmitem);
+ $output .= &mt('Type: [_1]',$parmitem);
} else {
my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
$uname,$udom,$issection,$issection,$courseopt);
@@ -3912,8 +3920,11 @@ sub parm_change_log {
}
$output .= ' ';
if ($stillactive) {
- my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
- my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
+ my $parmitem = &standard_parameter_names($parmname);
+ $parmitem = &mt($parmitem);
+ my $title=&mt('Changed [_1]',$parmitem);
+ my $description=&mt('Changed [_1] for [_2] to [_3]',
+ $parmitem,$realmdescription,
(&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
if (($uname) && ($udom)) {
$output .=