[LON-CAPA-cvs] cvs: loncom(version_2_7_X) /interface loncreateuser.pm

[raeburn]

raeburn		Wed Aug 27 18:00:14 2008 EDT

  Modified files:              (Branch: version_2_7_X)
    /loncom/interface	loncreateuser.pm 
  Log:
  - Backport 1.260, 1.261
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.249.2.6 loncom/interface/loncreateuser.pm:1.249.2.7
--- loncom/interface/loncreateuser.pm:1.249.2.6	Tue Aug 26 19:20:22 2008
+++ loncom/interface/loncreateuser.pm	Wed Aug 27 18:00:11 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.249.2.6 2008/08/26 23:20:22 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.249.2.7 2008/08/27 22:00:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3609,9 +3609,9 @@
                    dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
                    dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
     );
-    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/parmset?action=crsenv">','</a>');
-    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','<a href="/adm/parmset?action=crsenv">','</a>');
-    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','<a href="/adm/parmset?action=crsenv">','</a>');
+    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','"<a href="/adm/parmset?action=crsenv">','</a>"');
+    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/parmset?action=crsenv">','</a>"');
+    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','"<a href="/adm/parmset?action=crsenv">','</a>"');
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
             $settable{'togglecats'} = 1;
@@ -3621,11 +3621,11 @@
         }
         $cathash = $domconf{'coursecategories'}{'cats'};
     }
-    if ($settable{'togglecats'} && $settable{'categories'}) {
+    if ($settable{'togglecats'} && $settable{'categorize'}) {
         $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
     } elsif ($settable{'togglecats'}) {
         $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
-    } elsif ($settable{'categories'}) {
+    } elsif ($settable{'categorize'}) {
         $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
     } else {
         $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
@@ -3679,7 +3679,7 @@
                         }
                     }
                     if (!$matched) {
-                        if ($settable{'categories'}) {
+                        if ($settable{'categorize'}) {
                             push(@vismsgs,'chgcat');
                         } else {
                             push(@vismsgs,'dc_chgcat');
@@ -3692,7 +3692,7 @@
         if (ref($cathash) eq 'HASH') {
             if ((keys(%{$cathash}) > 1) ||
                 (keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
-                if ($settable{'categories'}) {
+                if ($settable{'categorize'}) {
                     push(@vismsgs,'addcat');
                 } else {
                     push(@vismsgs,'dc_addcat');