--- loncom/interface/lonparmset.pm	2009/05/21 15:46:27	1.413.4.2
+++ loncom/interface/lonparmset.pm	2010/02/15 01:20:08	1.413.4.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.413.4.2 2009/05/21 15:46:27 raeburn Exp $
+# $Id: lonparmset.pm,v 1.413.4.6 2010/02/15 01:20:08 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)) {
@@ -2540,9 +2540,11 @@ sub listdata {
 #
 # Ready to print
 #
+            my $parmitem = &standard_parameter_names($name);
+
 	    $r->print(&tablestart().
 		      &Apache::loncommon::start_data_table_row().
-		      '<td><b>'.&standard_parameter_names($name).
+		      '<td><b>'.&mt($parmitem).
 		      '</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $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('<br />');
 	    if ($data{'scope_type'} eq 'all') {
 		$r->print(&mt('All users'));
@@ -3180,19 +3183,17 @@ 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',
-	    url => '/adm/courseprefs?origin=params',
-            permission => $parm_permission,
-            help => 'Course_Environment',
-            },
           { text => 'Set Portfolio Metadata',
 	    action => 'setrestrictmeta',
             permission => $parm_permission,
             },
-	  { text => 'Manage Course Slots',
+	  { text => "Manage $crstype Slots",
 	    url => '/adm/slotrequest?command=showslots',
 	    permission => $vgr,
             },
@@ -3229,7 +3230,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,
             },
@@ -3772,7 +3773,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 +3886,18 @@ sub parm_change_log {
 	    } else {
 		$makenewrow=1;
 	    }
+            my $parmitem = &standard_parameter_names($parmname);
 	    $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
-		      &standard_parameter_names($parmname).'</td><td>'.
+		      &mt($parmitem).'</td><td>'.
 		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
 	    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 +3915,11 @@ sub parm_change_log {
 	    }
 	    $output .= '</td><td>';
 	    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 .= 
@@ -4142,8 +4148,6 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
                                                     text=>"Shifting Dates"});
             &date_shift_two($r);
-	} elsif ($env{'form.action'} eq 'categorizecourse' && $parm_permission) {
-            &assign_course_categories($r);
         } 
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms