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

[bisitz]

bisitz		Fri Jun 18 08:41:37 2010 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
    /loncom/auth	lonroles.pm 
  Log:
  - Localization: Optimized customrole mt() call (rev. 1.345): split content and layout parameter
  - Consistent Wording username:domain
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.345 loncom/interface/loncreateuser.pm:1.346
--- loncom/interface/loncreateuser.pm:1.345	Tue Jun 15 02:29:43 2010
+++ loncom/interface/loncreateuser.pm	Fri Jun 18 08:41:34 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.345 2010/06/15 02:29:43 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.346 2010/06/18 08:41:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1613,7 +1613,10 @@
             $plaintext=&Apache::lonnet::plaintext($role_code,$class)
         } else {
             $plaintext=
-                &mt("Customrole [_1]defined by [_2]",'"'.$croletitle.'"<br />',$croleuname.':'.$croleudom);
+                &mt('Customrole [_1][_2]defined by [_3]',
+                        '"'.$croletitle.'"',
+                        '<br />',
+                        $croleuname.':'.$croleudom);
         }
         $row.= '</td><td>'.$plaintext.
                '</td><td>'.$area.
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.252 loncom/auth/lonroles.pm:1.253
--- loncom/auth/lonroles.pm:1.252	Thu Jun  3 14:41:07 2010
+++ loncom/auth/lonroles.pm	Fri Jun 18 08:41:37 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.252 2010/06/03 14:41:07 raeburn Exp $
+# $Id: lonroles.pm,v 1.253 2010/06/18 08:41:37 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -929,7 +929,7 @@
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
+                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;