[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Fri, 05 Dec 2003 14:18:00 -0000


sakharuk		Fri Dec  5 09:18:00 2003 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  dded two &mt() function calls.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.77 loncom/auth/lonroles.pm:1.78
--- loncom/auth/lonroles.pm:1.77	Mon Nov 10 19:54:57 2003
+++ loncom/auth/lonroles.pm	Fri Dec  5 09:18:00 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.77 2003/11/11 00:54:57 albertel Exp $
+# $Id: lonroles.pm,v 1.78 2003/12/05 14:18:00 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,7 +202,7 @@
 			    }
                             #
                             # Send the user to the course they selected
-                            &redirect_user($r,'Entering Course',
+                            &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg);
                             return OK;
 			}
@@ -218,7 +218,7 @@
                             $redirect_url .= $1;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,'Entering Construction Space',
+                        &redirect_user($r,&mt('Entering Construction Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -412,7 +412,7 @@
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
-                    $ttype=&mt('Construction Space');
+                    $ttype='Construction Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
 			': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
@@ -432,13 +432,13 @@
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
-                    $ttype=&mt('Construction Space');
+                    $ttype='Construction Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
 			':&nbsp;'.$home;
                     $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
 		    $sortkey=$role;
                 } elsif ($trest) {
-                    $ttype=&mt('Course');
+                    $ttype='Course';
                     if ($tsection) {
                         $ttype.='<br>'.&mt('Section/Group').': '.$tsection;
 		    }
@@ -469,11 +469,11 @@
                     }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
-                    $ttype=&mt('Domain');
+                    $ttype='Domain';
                     $twhere=$tdom;
 		    $sortkey=$role.$twhere;
                 } else {
-                    $ttype=&mt('System');
+                    $ttype='System';
                     $twhere=&mt('system wide');
 		    $sortkey=$role.$twhere;
                 }
@@ -521,8 +521,7 @@
         }
     }
     my $doheaders=-1;
-    foreach my $type (&mt('Construction Space'),&mt('Course'),
-		      &mt('Domain'),&mt('System')) {
+    foreach my $type ('Construction Space','Course','Domain','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -531,12 +530,11 @@
 	}
 	if ($haverole) { $doheaders++; }
     }
-    foreach my $type (&mt('Construction Space'),&mt('Course'),
-		      &mt('Domain'),&mt('System')) {
+    foreach my $type ('Construction Space','Course','Domain','System') {
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
-		$output.=$roletext{$sortrole{$which}};
+		$output.=&mt($roletext{$sortrole{$which}});
 	    }
 	}
 	if ($output) {