[LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Thu, 11 Dec 2003 14:58:00 -0000
This is a MIME encoded message
--sakharuk1071154680
Content-Type: text/plain
sakharuk Thu Dec 11 09:58:00 2003 EDT
Modified files:
/loncom/interface loncreateuser.pm
Log:
Localization is done.
--sakharuk1071154680
Content-Type: text/plain
Content-Disposition: attachment; filename="sakharuk-20031211095800.txt"
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.72 loncom/interface/loncreateuser.pm:1.73
--- loncom/interface/loncreateuser.pm:1.72 Wed Dec 10 15:38:09 2003
+++ loncom/interface/loncreateuser.pm Thu Dec 11 09:58:00 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.72 2003/12/10 20:38:09 sakharuk Exp $
+# $Id: loncreateuser.pm,v 1.73 2003/12/11 14:58:00 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -483,15 +483,20 @@
$currentauth=~/^localauth:/
) { # bad authentication scheme
if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'err' => "ERROR",
+ 'uuas' => "This user has an unrecognized authentication scheme",
+ 'sldb' => "Please specify login data below",
+ 'ld' => "Login Data"
+ );
$r->print(<<ENDBADAUTH);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<font color='#ff0000'>ERROR:</font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please specify login data below.
-<h3>Login Data</h3>
+<font color='#ff0000'>$lt{'err'}:</font>
+$lt{'uuas'} ($currentauth). $lt{'sldb'}.
+<h3>$lt{'ld'}</h3>
<p>$generalrule</p>
<p>$authformkrb</p>
<p>$authformint</p>
@@ -501,14 +506,18 @@
} else {
# This user is not allowed to modify the users
# authentication scheme, so just notify them of the problem
+ my %lt=&Apache::lonlocal::texthash(
+ 'err' => "ERROR",
+ 'uuas' => "This user has an unrecognized authentication scheme",
+ 'adcs' => "Please alert a domain coordinator of this situation"
+ );
$r->print(<<ENDBADAUTH);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<font color="#ff0000"> ERROR: </font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please alert a domain coordinator of this situation.
+<font color="#ff0000"> $lt{'err'}: </font>
+$lt{'uuas'} ($currentauth). $lt{'adcs'}.
<hr />
ENDBADAUTH
}
@@ -538,16 +547,20 @@
$authformcurrent.=' <i>(will override current values)</i><br />';
if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
# Current user has login modification privileges
+ my %lt=&Apache::lonlocal::texthash(
+ 'ccld' => "Change Current Login Data",
+ 'enld' => "Enter New Login Data"
+ );
$r->print(<<ENDOTHERAUTHS);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<h3>Change Current Login Data</h3>
+<h3>$lt{'ccld'}</h3>
<p>$generalrule</p>
<p>$authformnop</p>
<p>$authformcurrent</p>
-<h3>Enter New Login Data</h3>
+<h3>$lt{'enld'}</h3>
$authform_other
ENDOTHERAUTHS
}
@@ -595,8 +608,8 @@
# Domain level
#
$r->print('<h4>'.&mt('Domain Level').'</h4>'.
- '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
- '<th>Start</th><th>End</th></tr>');
+ '<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'.
+ '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>');
foreach ( sort( keys(%incdomains))) {
my $thisdomain=$_;
foreach ('dc','li','dg','au','sc') {
@@ -637,7 +650,7 @@
my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
$ENV{'form.ccdomain'});
# Error messages
- my $error = '<font color="#ff0000">Error:</font>';
+ my $error = '<font color="#ff0000">'.&mt('Error').':</font>';
my $end = '</body></html>';
# Print header
$r->print(<<ENDTHREEHEAD);
@@ -655,30 +668,30 @@
$r->print(&Apache::loncommon::bodytag($title));
# Check Inputs
if (! $ENV{'form.ccuname'} ) {
- $r->print($error.'No login name specified.'.$end);
+ $r->print($error.&mt('No login name specified').'.'.$end);
return;
}
if ( $ENV{'form.ccuname'} =~/\W/) {
- $r->print($error.'Invalid login name. '.
- 'Only letters, numbers, and underscores are valid.'.
+ $r->print($error.&mt('Invalid login name').'. '.
+ &mt('Only letters, numbers, and underscores are valid').'.'.
$end);
return;
}
if (! $ENV{'form.ccdomain'} ) {
- $r->print($error.'No domain specified.'.$end);
+ $r->print($error.&mt('No domain specified').'.'.$end);
return;
}
if ( $ENV{'form.ccdomain'} =~/\W/) {
- $r->print($error.'Invalid domain name. '.
- 'Only letters, numbers, and underscores are valid.'.
+ $r->print($error.&mt ('Invalid domain name').'. '.
+ &mt('Only letters, numbers, and underscores are valid').'.'.
$end);
return;
}
if (! exists($ENV{'form.makeuser'})) {
# Modifying an existing user, so check the validity of the name
if ($uhome eq 'no_host') {
- $r->print($error.'Unable to determine home server for '.
- $ENV{'form.ccuname'}.' in domain '.
+ $r->print($error.&mt('Unable to determine home server for ').
+ $ENV{'form.ccuname'}.&mt(' in domain ').
$ENV{'form.ccdomain'}.'.');
return;
}
@@ -707,17 +720,21 @@
# If they are creating a new user but have not specified login
# information this will be caught below.
} else {
- $r->print($error.'Invalid login mode or password'.$end);
+ $r->print($error.&mt('Invalid login mode or password').$end);
return;
}
if ($ENV{'form.makeuser'}) {
# Create a new user
+ my %lt=&Apache::lonlocal::texthash(
+ 'cru' => "Creating user",
+ 'id' => "in domain"
+ );
$r->print(<<ENDNEWUSERHEAD);
-<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h3>
+<h3>$lt{'cru'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h3>
ENDNEWUSERHEAD
# Check for the authentication mode and password
if (! $amode || ! $genpwd) {
- $r->print($error.'Invalid login mode or password'.$end);
+ $r->print($error.&mt('Invalid login mode or password').$end);
return;
}
# Determine desired host
@@ -728,7 +745,7 @@
my %home_servers = &Apache::loncommon::get_library_servers
($ENV{'form.ccdomain'});
if (! exists($home_servers{$desiredhost})) {
- $r->print($error.'Invalid home server specified');
+ $r->print($error.&mt('Invalid home server specified'));
return;
}
}
@@ -742,13 +759,17 @@
$r->print('Generating user: '.$result);
my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
$ENV{'form.ccdomain'});
- $r->print('<br />Home server: '.$home.' '.
+ $r->print('<br />'&mt('Home server').': '.$home.' '.
$Apache::lonnet::libserv{$home});
} elsif (($ENV{'form.login'} ne 'nochange') &&
($ENV{'form.login'} ne '' )) {
# Modify user privileges
+ my %lt=&Apache::lonlocal::texthash(
+ 'usr' => "User",
+ 'id' => "in domain"
+ );
$r->print(<<ENDMODIFYUSERHEAD);
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
ENDMODIFYUSERHEAD
if (! $amode || ! $genpwd) {
$r->print($error.'Invalid login mode or password'.$end);
@@ -760,12 +781,11 @@
&Apache::lonnet::modifyuserauth(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$amode,$genpwd));
- $r->print('<br>Home server: '.&Apache::lonnet::homeserver
+ $r->print('<br>'.&mt('Home server').': '.&Apache::lonnet::homeserver
($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
- $r->print($error.'You do not have the authority to modify '.
- 'this users authentification information.');
+ $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');
}
}
##
@@ -799,20 +819,29 @@
$ENV{'form.ccdomain'},$ENV{'form.ccuname'});
if ($putresult eq 'ok') {
# Tell the user we changed the name
+ my %lt=&Apache::lonlocal::texthash(
+ 'uic' => "User Information Changed",
+ 'frst' => "first",
+ 'mddl' => "middle",
+ 'lst' => "last",
+ 'gen' => "generation",
+ 'prvs' => "Previous",
+ 'chto' => "Changed To"
+ );
$r->print(<<"END");
<table border="2">
-<caption>User Information Changed</caption>
+<caption>$lt{'uic'}</caption>
<tr><th> </th>
- <th>first</th>
- <th>middle</th>
- <th>last</th>
- <th>generation</th></tr>
-<tr><td>Previous</td>
+ <th>$lt{'frst'}</th>
+ <th>$lt{'mddl'}</th>
+ <th>$lt{'lst'}</th>
+ <th>$lt{'gen'}</th></tr>
+<tr><td>$lt{'prvs'}</td>
<td>$userenv{'firstname'} </td>
<td>$userenv{'middlename'} </td>
<td>$userenv{'lastname'} </td>
<td>$userenv{'generation'} </td></tr>
-<tr><td>Changed To</td>
+<tr><td>$lt{'chto'}</td>
<td>$ENV{'form.cfirstname'} </td>
<td>$ENV{'form.cmiddlename'} </td>
<td>$ENV{'form.clastname'} </td>
@@ -820,36 +849,41 @@
</table>
END
} else { # error occurred
- $r->print("<h2>Unable to successfully change environment for ".
- $ENV{'form.ccuname'}." in domain ".
+ $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
+ $ENV{'form.ccuname'}." ".&mt('in domain')." ".
$ENV{'form.ccdomain'}."</h2>");
}
} else { # End of if ($ENV ... ) logic
# They did not want to change the users name but we can
# still tell them what the name is
+ my %lt=&Apache::lonlocal::texthash(
+ 'usr' => "User",
+ 'id' => "in domain",
+ 'gen' => "Generation"
+ );
$r->print(<<"END");
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$ENV{'form.ccuname'}" ${'id'} "$ENV{'form.ccdomain'}"</h2>
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
-<h4>Generation: $userenv{'generation'}</h4>
+<h4>$lt{'gen'}: $userenv{'generation'}</h4>
END
}
}
##
my $now=time;
- $r->print('<h3>Modifying Roles</h3>');
+ $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
foreach (keys (%ENV)) {
next if (! $ENV{$_});
# Revoke roles
if ($_=~/^form\.rev/) {
if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
# Revoke standard role
- $r->print('Revoking '.$2.' in '.$1.': <b>'.
+ $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokerole($ENV{'form.ccdomain'},
$ENV{'form.ccuname'},$1,$2).'</b><br>');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Drop from classlist: <b>'.
+ $r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -861,21 +895,21 @@
}
if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
# Revoke custom role
- $r->print(
- 'Revoking custom role '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
-&Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
+ $r->print(&mt('Revoking custom role').
+ ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
+ &Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
$ENV{'form.ccuname'},$1,$2,$3,$4).
'</b><br>');
}
} elsif ($_=~/^form\.del/) {
if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
- $r->print('Deleting '.$2.' in '.$1.': '.
+ $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
&Apache::lonnet::assignrole($ENV{'form.ccdomain'},
$ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Drop from classlist: <b>'.
+ $r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -902,8 +936,8 @@
$ENV{'form.end_'.$full} :
0 );
- $r->print('Assigning custom role "'.$5.'" by '.$4.'@'.$3.' in '.$url.
- ($start?', starting '.localtime($start):'').
+ $r->print(&mt('Assigning custom role').' "'.$5.'" by '.$4.'@'.$3.' in '.$url.
+ ($start?', '.&mt('starting').' '.localtime($start):'').
($end?', ending '.localtime($end):'').': <b>'.
&Apache::lonnet::assigncustomrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start).
@@ -923,9 +957,9 @@
$url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
}
# Assign the role and report it
- $r->print('Assigning '.$3.' in '.$url.
- ($start?', starting '.localtime($start):'').
- ($end?', ending '.localtime($end):'').': <b>'.
+ $r->print(&mt('Assigning').' '.$3.' in '.$url.
+ ($start?', '.&mt('starting').' '.localtime($start):'').
+ ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$url,$3,$end,$start).
@@ -934,7 +968,7 @@
if ($3 eq 'st') {
$url=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Add to classlist: <b>'.
+ $r->print(&mt('Add to classlist').': <b>'.
&Apache::lonnet::critical(
'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -956,15 +990,15 @@
0 );
my $url='/'.$1.'/';
# Assign the role and report it.
- $r->print('Assigning '.$2.' in '.$url.': '.
- ($start?', starting '.localtime($start):'').
- ($end?', ending '.localtime($end):'').': <b>'.
+ $r->print(&mt('Assigning').' '.$2.' in '.$url.': '.
+ ($start?', '.&mt('starting').' '.localtime($start):'').
+ ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$url,$2,$end,$start)
.'</b><br>');
} else {
- $r->print('<p>ERROR: Unknown command <tt>'.$_.'</tt></p><br>');
+ $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
}
}
} # End of foreach (keys(%ENV))
@@ -997,11 +1031,11 @@
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
- $r->print('Existing Role "');
+ $r->print(&mt('Existing Role').' "');
# ------------------------------------------------- Get current role privileges
($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
} else {
- $r->print('New Role "');
+ $r->print(&mt('New Role').' "');
$roledef='';
}
$r->print($rolename.'"</h2>');
@@ -1040,14 +1074,19 @@
}
$full{$priv}=1;
}
-
+ my %lt=&Apache::lonlocal::texthash(
+ 'prv' => "Privilege",
+ 'crl' => "Course Level",
+ 'dml' => "Domain Level",
+ 'ssl' => "System Level"
+ );
$r->print(<<ENDCCF);
<form method="post">
<input type="hidden" name="phase" value="set_custom_roles" />
<input type="hidden" name="rolename" value="$rolename" />
<table border="2">
-<tr><th>Privilege</th><th>Course Level</th><th>Domain Level</th>
-<th>System Level</th></tr>
+<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
+<th>$lt{'ssl'}</th></tr>
ENDCCF
foreach (sort keys %full) {
$r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
@@ -1062,7 +1101,7 @@
'</td></tr>');
}
$r->print(
- '<table><input type="submit" value="Define Role" /></form></body></html>');
+ '<table><input type="submit" value="'.&mt('Define Role').'" /></form></body></html>');
}
# ---------------------------------------------------------- Call to definerole
@@ -1084,9 +1123,9 @@
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
- $r->print('Existing Role "');
+ $r->print(&mt('Existing Role').' "');
} else {
- $r->print('New Role "');
+ $r->print(&mt('New Role').' "');
$roledef='';
}
$r->print($rolename.'"</h2>');
@@ -1123,7 +1162,7 @@
if ($ENV{'request.course.id'}) {
my $url='/'.$ENV{'request.course.id'};
$url=~s/\_/\//g;
- $r->print('<br />Assigning Role to Self: '.
+ $r->print('<br />'.&mt('Assigning Role to Self').': '.
&Apache::lonnet::assigncustomrole($ENV{'user.domain'},
$ENV{'user.name'},
$url,
@@ -1208,13 +1247,17 @@
<td> </td>
ENDSECTION
}
+ my %lt=&Apache::lonlocal::texthash(
+ 'ssd' => "Set Start Date",
+ 'sed' => "Set End Date"
+ );
$table .= <<ENDTIMEENTRY;
<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY
$table.= "</tr>\n";
}
@@ -1224,6 +1267,10 @@
my $plrole=$_;
my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}.
'_'.$ENV{'user.name'}.'_'.$plrole;
+ my %lt=&Apache::lonlocal::texthash(
+ 'ssd' => "Set Start Date",
+ 'sed' => "Set End Date"
+ );
$table .= <<ENDENTRY;
<tr bgcolor="#$bgcol">
<td><input type="checkbox" name="act_$customrole"></td>
@@ -1232,20 +1279,29 @@
<td><input type="text" size="5" name="sec_$customrole"></td>
<td><input type=hidden name="start_$customrole" value=''>
<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$customrole" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">Set End Date</a></td></tr>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr>
ENDENTRY
}
}
}
return '' if ($table eq ''); # return nothing if there is nothing
# in the table
+ my %lt=&Apache::lonlocal::texthash(
+ 'crl' => "Course Level",
+ 'act' => "Activate",
+ 'rol' => "Role",
+ 'ext' => "Extent",
+ 'grs' => "Group/Section",
+ 'sta' => "Start",
+ 'end' => "End"
+ );
my $result = <<ENDTABLE;
-<h4>Course Level</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Group/Section</th><th>Start</th><th>End</th></tr>
+<h4>$lt{'crl'}</h4>
+<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
+<th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
$table
</table>
ENDTABLE
--sakharuk1071154680--