[LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 12 Aug 2008 10:19:40 -0000
bisitz Tue Aug 12 06:19:40 2008 EDT
Modified files:
/loncom/interface loncreateuser.pm
Log:
- Same wording everywhere: Student/Employee ID
- Added missing &mt(); optimized &mt() call
- Added warning style to warning message
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.258 loncom/interface/loncreateuser.pm:1.259
--- loncom/interface/loncreateuser.pm:1.258 Thu Jul 17 22:12:39 2008
+++ loncom/interface/loncreateuser.pm Tue Aug 12 06:19:40 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.258 2008/07/18 02:12:39 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.259 2008/08/12 10:19:40 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -967,7 +967,7 @@
if (defined($coursedata{'description'})) {
$carea=$coursedata{'description'}.
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8).
- &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
+ &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
$sortkey.="\0".$coursedata{'description'};
$class=$coursedata{'type'};
} else {
@@ -1421,7 +1421,7 @@
'lastname' => "Last Name",
'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",
- 'id' => "ID/Student Number",
+ 'id' => "Student/Employee ID",
'lg' => "Login Data"
);
my %textboxsize = (
@@ -1847,7 +1847,7 @@
$env{'form.c'.$item} = $userenv{$item};
}
}
- # Check to see if we can change the ID/student number
+ # Check to see if we can change the Student/Employee ID
my $forceid = $env{'form.forceid'};
my $recurseid = $env{'form.recurseid'};
my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
@@ -1858,7 +1858,10 @@
(!$forceid)) {
if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
$env{'form.cid'} = $userenv{'id'};
- $no_forceid_alert = &mt('New student/employeeID does not match existing ID for this user.').'<br />'.&mt('Change is not permitted without checking the \'Force ID change\' checkbox on the previous page.').'<br />'."\n";
+ $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
+ .'<br />'
+ .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
+ .'<br />'."\n";
}
}
if ($env{'form.cid'} ne $userenv{'id'}) {
@@ -1972,7 +1975,7 @@
'mddl' => "middle",
'lst' => "last",
'gen' => "generation",
- 'id' => "ID/Student number",
+ 'id' => "Student/Employee ID",
'mail' => "permanent e-mail",
'disk' => "disk space allocated to portfolio files",
'prvs' => "Previous",
@@ -2055,7 +2058,7 @@
# They did not want to change the users name or quota but we can
# still tell them what the name and quota are
my %lt=&Apache::lonlocal::texthash(
- 'id' => "ID/Student number",
+ 'id' => "Student/Employee ID",
'mail' => "Permanent e-mail",
'disk' => "Disk space allocated to user's portfolio files",
);
@@ -2098,8 +2101,10 @@
$r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
&mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
}
- $r->print($no_forceid_alert.
- &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules));
+ $r->print('<span class="LC_warning">'
+ .$no_forceid_alert
+ .&Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules)
+ .'</span>');
}
if ($env{'form.action'} eq 'singlestudent') {
&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);