[LON-CAPA-cvs] cvs: loncom /interface createaccount.pm loncommon.pm lonuserutils.pm /lonnet/perl lonnet.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Wed, 13 Aug 2008 08:18:01 -0000
bisitz Wed Aug 13 04:18:01 2008 EDT
Modified files:
/loncom/lonnet/perl lonnet.pm
/loncom/interface createaccount.pm lonuserutils.pm loncommon.pm
Log:
- Same wording everywhere: Student/Employee ID
- Optimized some &mt() calls
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.963 loncom/lonnet/perl/lonnet.pm:1.964
--- loncom/lonnet/perl/lonnet.pm:1.963 Thu Jul 17 17:22:51 2008
+++ loncom/lonnet/perl/lonnet.pm Wed Aug 13 04:17:57 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.963 2008/07/17 21:22:51 raeburn Exp $
+# $Id: lonnet.pm,v 1.964 2008/08/13 08:17:57 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -9175,7 +9175,7 @@
=item B<$uname> Student's loncapa login name
-=item B<$uid> Student's id/student number
+=item B<$uid> Student/Employee ID
=item B<$umode> Student's authentication mode
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.23 loncom/interface/createaccount.pm:1.24
--- loncom/interface/createaccount.pm:1.23 Thu Jul 17 16:19:43 2008
+++ loncom/interface/createaccount.pm Wed Aug 13 04:17:58 2008
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.23 2008/07/17 20:19:43 raeburn Exp $
+# $Id: createaccount.pm,v 1.24 2008/08/13 08:17:58 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -708,7 +708,7 @@
'lastname' => "Last Name",
'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",
- 'id' => "ID/Student Number",
+ 'id' => "Student/Employee ID",
'lg' => "Login Data"
);
my %textboxsize = (
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.60 loncom/interface/lonuserutils.pm:1.61
--- loncom/interface/lonuserutils.pm:1.60 Sat Jul 12 19:56:13 2008
+++ loncom/interface/lonuserutils.pm Wed Aug 13 04:17:58 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.60 2008/07/12 23:56:13 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.61 2008/08/13 08:17:58 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -779,8 +779,7 @@
'onClick="javascript:verify(this.form,this.form.csec)" '.
'value="'.&mt('Update Users').'" />'."<br />\n";
if ($context eq 'course') {
- $Str .= &mt('Note: for large courses, this operation may be time '.
- 'consuming');
+ $Str .= &mt('Note: for large courses, this operation may be time consuming');
}
$Str .= '</div>';
$r->print($Str);
@@ -790,15 +789,15 @@
sub forceid_change {
my ($context) = @_;
my $output =
- "<h3>".&mt('ID/Student Number')."</h3>\n".
+ "<h3>".&mt('Student/Employee ID')."</h3>\n".
"<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'.
- &mt('Disable ID/Student Number Safeguard and Force Change '.
- 'of Conflicting IDs').'</label><br />'."\n".
+ &mt('Disable Student/Employee ID Safeguard and force change of conflicting IDs').
+ '</label><br />'."\n".
&mt('(only do if you know what you are doing.)')."\n";
if ($context eq 'domain') {
$output .= '<br /><label><input type="checkbox" name="recurseid"'.
' value="yes">'.
- &mt('Update ID/Student Number in courses in which user is Active/Future student,<br />(if forcing change).').
+ &mt('Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
'</label>'."\n";
}
$output .= '</p>';
@@ -865,7 +864,7 @@
['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}],
['lname',&mt('Last Name'), $env{'form.lname_choice'}],
['gen', &mt('Generation'), $env{'form.gen_choice'}],
- ['id', &mt('ID/Student Number'),$env{'form.id_choice'}],
+ ['id', &mt('Student/Employee ID'),$env{'form.id_choice'}],
['sec', &mt('Section'), $env{'form.sec_choice'}],
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
['email',&mt('E-mail Address'), $env{'form.email_choice'}],
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.673 loncom/interface/loncommon.pm:1.674
--- loncom/interface/loncommon.pm:1.673 Mon Aug 4 18:08:19 2008
+++ loncom/interface/loncommon.pm Wed Aug 13 04:17:58 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.673 2008/08/04 22:08:19 felicia Exp $
+# $Id: loncommon.pm,v 1.674 2008/08/13 08:17:58 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6808,12 +6808,12 @@
$text{'action'} = 'IDs';
}
}
- $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';
+ $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<br />';
if ($mode eq 'upload') {
if ($checkitem eq 'username') {
$response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
} elsif ($checkitem eq 'id') {
- $response .= &mt("Either upload a file which includes $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
+ $response .= &mt("Either upload a file which includes $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the Student/Employee ID field.");
}
} elsif ($mode eq 'selfcreate') {
if ($checkitem eq 'id') {