--- loncom/auth/lonroles.pm 2003/09/15 18:43:53 1.68
+++ loncom/auth/lonroles.pm 2004/01/29 00:44:06 1.84
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.68 2003/09/15 18:43:53 www Exp $
+# $Id: lonroles.pm,v 1.84 2004/01/29 00:44:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,11 +51,12 @@ use Apache::File();
use Apache::lonmenu;
use Apache::loncommon;
use Apache::lonannounce;
+use Apache::lonlocal;
sub redirect_user {
my ($r,$title,$url,$msg) = @_;
$msg = $title if (! defined($msg));
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();
@@ -130,7 +131,7 @@ sub handler {
# student attempts to register a new key
} else {
# print form to enter a new key
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();
@@ -164,7 +165,7 @@ ENDENTERKEY
'request.role.adv' => $tadv,
'request.role.domain' => $cdom,
'request.course.sec' => $csec);
- my $msg='Entering course ...';
+ my $msg=&mt('Entering course ...');
if (($cnum) && ($role ne 'ca')) {
my ($furl,$ferr)=
@@ -172,9 +173,9 @@ ENDENTERKEY
if (($ENV{'form.orgurl'}) &&
($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
my $dest=$ENV{'form.orgurl'};
-
+ if ( &Apache::lonnet::mod_perl_version() == 2 ) {
&Apache::lonnet::cleanenv();
-
+ }
$r->internal_redirect($dest);
return OK;
} else {
@@ -183,7 +184,9 @@ ENDENTERKEY
"request.course.id" => $cdom.'_'.$cnum);
$furl='/adm/roles?tryagain=1';
$msg=
- '
Could not initialize course at this time.
Please try again.
'.$ferr;
+ ''.
+ &mt('Could not initialize course at this time.').
+ '
'.&mt('Please try again.').'
'.$ferr;
}
# Check to see if the user is a CC entering a course
@@ -199,7 +202,7 @@ ENDENTERKEY
}
#
# Send the user to the course they selected
- &redirect_user($r,'Entering Course',
+ &redirect_user($r,&mt('Entering Course'),
$furl,$msg);
return OK;
}
@@ -215,7 +218,7 @@ ENDENTERKEY
$redirect_url .= $1;
}
$redirect_url .= '/';
- &redirect_user($r,'Entering Construction Space',
+ &redirect_user($r,&mt('Entering Construction Space'),
$redirect_url);
return OK;
}
@@ -227,15 +230,17 @@ ENDENTERKEY
# =============================================================== No Roles Init
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
return OK if $r->header_only;
my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag('User Roles');
- my $helptag=&Apache::loncommon::help_open_topic
- ("General_Intro","Click here for help");
+ my $helptag=''.&Apache::loncommon::help_open_topic
+ ("General_Intro",&mt("Click here for help")).' | '.
+ &Apache::loncommon::help_open_faq(1,&mt('Click here for FAQ')).' | '.
+ &Apache::loncommon::help_open_bug('',&mt('Click here to report bugs')).' |
';
$r->print(<
@@ -274,57 +279,57 @@ ENDHEADER
} else {
if ($ENV{'user.error.msg'}) {
$r->print(
- 'You need to choose another user role or '.
- 'enter a specific course for this function
');
+ ''.
+ &mt('You need to choose another user role or enter a specific course for this function').'
');
}
}
# -------------------------------------------------------- Choice or no choice?
if ($nochoose) {
if ($advanced) {
- $r->print("Assigned User Roles
\n");
+ $r->print("".&mt('Assigned User Roles')."
\n");
} else {
- $r->print("Sorry ...
\nThis resource might be part of");
+ $r->print("".&mt('Sorry ...')."
\n".
+ &mt('This resource might be part of'));
if ($ENV{'request.course.id'}) {
- $r->print(' another');
+ $r->print(&mt(' another'));
} else {
- $r->print(' a certain');
+ $r->print(&mt(' a certain'));
}
- $r->print(' course.