--- loncom/auth/lonroles.pm	2013/08/10 20:28:14	1.290
+++ loncom/auth/lonroles.pm	2014/02/23 19:06:18	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.290 2013/08/10 20:28:14 raeburn Exp $
+# $Id: lonroles.pm,v 1.296 2014/02/23 19:06:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -288,7 +288,7 @@ sub handler {
 				 "request.role.domain" => $env{'user.domain'}});
 # Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
-            foreach my $envkey (keys %env) {
+            foreach my $envkey (keys(%env)) {
 # Is this an ad-hoc Coordinator role?
                 if (my ($ccrole,$domain,$coursenum) =
 		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
@@ -358,7 +358,7 @@ sub handler {
             }
         }
 
-        foreach $envkey (keys %env) {
+        foreach $envkey (keys(%env)) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
             &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
@@ -545,13 +545,14 @@ ENDENTERKEY
                             }
                         }
 			if (($env{'form.orgurl'}) && 
-			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
+			    ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
+			    ($env{'form.orgurl'} ne '/adm/roles')) {
 			    my $dest=$env{'form.orgurl'};
                             if ($env{'form.symb'}) {
                                 if ($dest =~ /\?/) {
                                     $dest .= '&';
                                 } else {
-                                    $dest .= '?'
+                                    $dest .= '?';
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
@@ -888,11 +889,13 @@ ENDHEADER
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
                 '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
+               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3][_4]'
+                   .' to view all [_5] LON-CAPA courses and communities.'
                    ,'<b>'
                    ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
+                   ,'</a>'
+                   ,'</b>'
+                   ,'"'.$domdesc.'"')
                .'<br />'
                .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
                    .' you may be able to enroll if self-enrollment is permitted.'
@@ -2466,7 +2469,7 @@ sub update_session_roles {
                 if ($desc) {
                     $newmsg .= '<li>'.
                                &mt('[_1] with status: [_2].',
-                               $desc,$newrole{$item}).'</li>';
+                               $desc,&mt($newrole{$item})).'</li>';
                 }
             }
             if ($newmsg) {
@@ -2739,7 +2742,7 @@ sub get_roles_functions {
         }
     }
     if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
-        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course Catalog')]);
+        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
     }
     my $funcs = &Apache::lonhtmlcommon::start_funclist();
     foreach my $link (@links) {
@@ -2809,7 +2812,7 @@ sub get_queued {
             if (($status eq 'approval') || ($status eq 'approved')) {
                 $output .= '<p><b>'.&mt('Author role request').'</b><br />';
                 if ($status eq 'approval') {
-                    $output .= &mt('A request for authoring space submitted on [_1] is awaiting approval',
+                    $output .= &mt('A request for Authoring Space submitted on [_1] is awaiting approval',
                                   &Apache::lonlocal::locallocaltime($timestamp));
                 } elsif ($status eq 'approved') {
                     my %roleshash =