[LON-CAPA-cvs] cvs: loncom /enrollment Enrollment.pm localenroll.pm /homework bridgetask.pm grades.pm /html/adm/help/tex Course_Create_Class_List.tex Institutional_Integration_Format_Checks.tex Slot_SelectingField.tex exam_scoring.tex /localize/localize de.pm
weissno
weissno@source.lon-capa.org
Mon, 09 Mar 2009 01:58:57 -0000
This is a MIME encoded message
--weissno1236563937
Content-Type: text/plain
weissno Mon Mar 9 01:58:57 2009 EDT
Modified files:
/loncom/localize/localize de.pm
/loncom/homework bridgetask.pm grades.pm
/loncom/enrollment Enrollment.pm localenroll.pm
/loncom/html/adm/help/tex Course_Create_Class_List.tex
Institutional_Integration_Format_Checks.tex
Slot_SelectingField.tex exam_scoring.tex
Log:
consistent wording:
changed "student number" to "student/employee ID"
changed "student ID" to "student/employee ID"
changed "student and eyployee IDs" to "student/employee IDs"
--weissno1236563937
Content-Type: text/plain
Content-Disposition: attachment; filename="weissno-20090309015857.txt"
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.248 loncom/localize/localize/de.pm:1.249
--- loncom/localize/localize/de.pm:1.248 Sun Mar 8 21:49:38 2009
+++ loncom/localize/localize/de.pm Mon Mar 9 01:58:43 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.248 2009/03/08 21:49:38 weissno Exp $
+# $Id: de.pm,v 1.249 2009/03/09 01:58:43 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2715,7 +2715,7 @@
'Diffs'
=> 'Unterschiede',
-# 'Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)'
+# 'Disable Student/Employee ID Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)'
#=> 'Deaktiviere ID-/Matrikelnummer-Safeguard und erzwinge Änderung von in Konflikt stehenden IDs (Machen Sie dies nur, wenn Sie wirklich wissen, was Sie tun).',
'Disable Student/Employee ID Safeguard and force change of conflicting IDs'
@@ -2892,7 +2892,7 @@
'Starting and Ending Dates'
=> 'Anfangs- und Endezeitpunkte',
- 'Student Number'
+ 'Student/Employee ID'
=> 'Matrikelnummer',
'Tabulator separated'
@@ -2910,7 +2910,7 @@
'The optional section or group field was not specified.'
=> 'Das optionale Sektions- oder Gruppenfeld wurde nicht ausgefüllt.',
- 'The optional student number field was not specified.'
+ 'The optional student/employee ID field was not specified.'
=> 'Das optionale Matrikelnummer-Feld wurde nicht ausgefüllt.',
'The optional section field was not specified.'
@@ -4403,7 +4403,7 @@
'Starting date'
=> 'Anfangsdatum',
- 'Student ID'
+ 'Student/Employee ID'
=> 'Matrikelnummer',
'Student Information'
@@ -4565,7 +4565,7 @@
'You are working with an unsaved version of your map.'
=> 'Sie arbeiten momentan an einer nicht gespeicherten Version Ihrer Inhaltszusammenstellung.',
- 'You changed the students id but did not disable the ID change safeguard. The students id will not be changed.'
+ 'You changed the students/employees id but did not disable the ID change safeguard. The students/employees id will not be changed.'
=> 'Sie haben die ID/Matrikelnummer geändert, aber nicht den ID-/Matrikelnummer-Safeguard deaktiviert. Die ID/Matrikelnummer wird daher nicht geändert.',
'Your request to change the role information for this student was refused. You do not appear to have sufficient authority to change student information.'
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.243 loncom/homework/bridgetask.pm:1.244
--- loncom/homework/bridgetask.pm:1.243 Fri Dec 5 10:23:50 2008
+++ loncom/homework/bridgetask.pm Mon Mar 9 01:58:47 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.243 2008/12/05 10:23:50 bisitz Exp $
+# $Id: bridgetask.pm,v 1.244 2009/03/09 01:58:47 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3144,7 +3144,7 @@
'vali' => 'Validate',
'stui' => "Student who should be logged in is:",
'name' => "Name:",
- 'sid' => "Student ID:",
+ 'sid' => "Student/Employee ID:",
'unam' => "Username:",
);
my $result= (<<ENDCHECKOUT);
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.555 loncom/homework/grades.pm:1.556
--- loncom/homework/grades.pm:1.555 Fri Mar 6 21:14:50 2009
+++ loncom/homework/grades.pm Mon Mar 9 01:58:48 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.555 2009/03/06 21:14:50 raeburn Exp $
+# $Id: grades.pm,v 1.556 2009/03/09 01:58:48 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3767,7 +3767,7 @@
sub csvupload_fields {
my ($symb) = @_;
my (@parts) = &getpartlist($symb);
- my @fields=(['ID','Student ID'],
+ my @fields=(['ID','Student/Employee ID'],
['username','Student Username'],
['domain','Student Domain']);
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
@@ -4680,10 +4680,10 @@
bubbles' (it's an error because it may have been mis-scanned
because too light bubbling), 'double bubble' (each bubble line should
have no more that one letter picked), invalid or duplicated CODE,
-invalid student ID
+invalid student/employee ID
If the CODE option is used that determines the randomization of the
-homework problems, either way the student ID is looked up into a
+homework problems, either way the student/employee ID is looked up into a
username:domain.
During the validation phase the instructor can choose to skip scanlines.
@@ -5200,8 +5200,8 @@
CODEstart - (only matter if a CODE exists) column in the line where
the CODE starts
CODElength - length of the CODE
- IDstart - column where the student ID number starts
- IDlength - length of the student ID info
+ IDstart - column where the student/employee ID number starts
+ IDlength - length of the student/employee ID info
Qstart - column where the information from the bubbled
'questions' start
Qlength - number of columns comprising a single bubble line from
@@ -5261,7 +5261,7 @@
=item username_to_idmap
- creates a hash keyed by student id with values of the corresponding
+ creates a hash keyed by student/employee ID with values of the corresponding
student username:domain.
Arguments:
@@ -5300,7 +5300,7 @@
$whichline - line number of the passed in scanline
$field - type of change to process
(either
- 'ID' -> correct the student ID number
+ 'ID' -> correct the student/employee ID number
'CODE' -> correct the CODE
'answer' -> fixup the submitted answers)
@@ -5474,7 +5474,7 @@
CODE_ignore_dup - 1 if the CODE is a duplicated use when unique
CODEs were selected, but the usage has been
forced by the operator
- ID - student ID
+ ID - student/employee ID
PaperID - if used, the ID number printed on the sheet when the
paper was scanned
FirstName - first name from the sheet
@@ -9177,7 +9177,7 @@
=item scantron_validate_ID() :
Validates all scanlines in the selected file to not have any
- invalid or underspecified student IDs
+ invalid or underspecified student/employee IDs
=back
Index: loncom/enrollment/Enrollment.pm
diff -u loncom/enrollment/Enrollment.pm:1.39 loncom/enrollment/Enrollment.pm:1.40
--- loncom/enrollment/Enrollment.pm:1.39 Wed Aug 27 02:37:39 2008
+++ loncom/enrollment/Enrollment.pm Mon Mar 9 01:58:52 2009
@@ -1,5 +1,5 @@
# Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.39 2008/08/27 02:37:39 raeburn Exp $
+# $Id: Enrollment.pm,v 1.40 2009/03/09 01:58:52 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -171,7 +171,7 @@
push @okusers, $uname;
}
}
-# Get mapping of student IDs to usernames for users in institutional data for this class
+# Get mapping of student/employee IDs to usernames for users in institutional data for this class
my @allINids = ();
my %unameFromINid = ();
foreach my $uname (@okusers) {
@@ -283,15 +283,15 @@
# Check for changed usernames by checking studentIDs
if ( ($stuinfo[ $place{studentID} ] ne '') && (grep/^$stuinfo[ $place{studentID} ]$/,@LCids) ) {
foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } } ) {
- $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student ID: [_2].',$match,$stuinfo[ $place{studentID} ]);
+ $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student/employee ID: [_2].',$match,$stuinfo[ $place{studentID} ]);
if (grep/^$match$/,@okusers) {
- $$logmsg .= &mt('The username [_1] remains in the institutional classlist, but the same student ID is used for new user: [_2] now found in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to determine how to resolve this issue and whether to move student data files for user: [_1] to [_2].',$match,$uname).' ';
+ $$logmsg .= &mt('The username [_1] remains in the institutional classlist, but the same student/employee ID is used for new user: [_2] now found in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to determine how to resolve this issue and whether to move student data files for user: [_1] to [_2].',$match,$uname).' ';
} else {
unless ($drops == 1) {
- $$logmsg .= &mt('This username - [_1] - has been dropped from the institutional classlist, but the student ID of this user is also used by [_2] who now appears in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to request a move of the student data files for user: [_1] to [_2].',$match,$uname).' ';
+ $$logmsg .= &mt('This username - [_1] - has been dropped from the institutional classlist, but the student/employee ID of this user is also used by [_2] who now appears in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to request a move of the student data files for user: [_1] to [_2].',$match,$uname).' ';
}
}
- $$logmsg .= &mt('Because of this student ID conflict, the new username - [_1] - has not been added to the LON-CAPA classlist',$uname).$linefeed;
+ $$logmsg .= &mt('Because of this student/employee ID conflict, the new username - [_1] - has not been added to the LON-CAPA classlist',$uname).$linefeed;
}
} elsif ($adds == 1) {
my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);
@@ -373,7 +373,7 @@
# Check for changed usernames by checking studentIDs
if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) {
foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) {
- $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student ID: [_2].',$uname,$$currlist{$uname}[ $place{studentID} ]).' '.&mt('This username has been dropped from the institutional classlist, but the same student ID is used for user: [_1] who still appears in the institutional classlist.',$match).' '.&mt('You may need to move the student data files for user: [_1] to [_2]',$uname,$match).' '.&mt('Because of this, user [_1] has not been dropped from the course.',$uname).$linefeed;
+ $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student/employee ID: [_2].',$uname,$$currlist{$uname}[ $place{studentID} ]).' '.&mt('This username has been dropped from the institutional classlist, but the same student/employee ID is used for user: [_1] who still appears in the institutional classlist.',$match).' '.&mt('You may need to move the student data files for user: [_1] to [_2]',$uname,$match).' '.&mt('Because of this, user [_1] has not been dropped from the course.',$uname).$linefeed;
push @saved,$uname;
}
} elsif (@saved == 0) {
@@ -874,7 +874,7 @@
'missing' => 'were missing',
'error' => 'were not imported because an error occurred',
'nouser' => 'were for users without accounts',
- 'noid' => 'were for users without student IDs',
+ 'noid' => 'were for users without student/employee IDs',
);
return %lt;
}
Index: loncom/enrollment/localenroll.pm
diff -u loncom/enrollment/localenroll.pm:1.33 loncom/enrollment/localenroll.pm:1.34
--- loncom/enrollment/localenroll.pm:1.33 Fri Feb 20 13:59:20 2009
+++ loncom/enrollment/localenroll.pm Mon Mar 9 01:58:52 2009
@@ -1,6 +1,6 @@
# functions to glue school database system into Lon-CAPA for
# automated enrollment
-# $Id: localenroll.pm,v 1.33 2009/02/20 13:59:20 bisitz Exp $
+# $Id: localenroll.pm,v 1.34 2009/03/09 01:58:52 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -401,7 +401,7 @@
existing photo, photo was found to be missing from institution's
data store, photo used is same as before, or photo was
deleted from storage on LON-CAPA server housing student's
- information, no student ID was available.
+ information, no student/employee ID was available.
(e) $action: the type of action needed. (e.g., update, delete);
(f) $students: a reference to a hash with the keys set to student
Index: loncom/html/adm/help/tex/Course_Create_Class_List.tex
diff -u loncom/html/adm/help/tex/Course_Create_Class_List.tex:1.12 loncom/html/adm/help/tex/Course_Create_Class_List.tex:1.13
--- loncom/html/adm/help/tex/Course_Create_Class_List.tex:1.12 Thu May 29 15:33:15 2008
+++ loncom/html/adm/help/tex/Course_Create_Class_List.tex Mon Mar 9 01:58:57 2009
@@ -19,7 +19,7 @@
NOTE: If you wish to associate a particular column to more than one field
(if, for example, you wish to make the students' initial passwords the
- same as their student numbers), click the \fbox{Reverse
+ same as their student/employee id), click the \fbox{Reverse
Association} button. Then you can assign columns of the spreadsheet to more
than one field. You can also set the login type, the start/end dates for
the students from this page.
Index: loncom/html/adm/help/tex/Institutional_Integration_Format_Checks.tex
diff -u loncom/html/adm/help/tex/Institutional_Integration_Format_Checks.tex:1.3 loncom/html/adm/help/tex/Institutional_Integration_Format_Checks.tex:1.4
--- loncom/html/adm/help/tex/Institutional_Integration_Format_Checks.tex:1.3 Tue Jul 29 20:52:20 2008
+++ loncom/html/adm/help/tex/Institutional_Integration_Format_Checks.tex Mon Mar 9 01:58:57 2009
@@ -81,7 +81,7 @@
\item \$rulesorder - reference to array containing rule names in order to
be displayed
\end{enumerate}
-At MSU, studentIDs and employee IDs are eight digits prefaced by A
+At MSU, student/employee IDs are eight digits prefaced by A
or Z. The rule itself is defined in \emph{id\_rules()}, and the code
which checks for compliance is in \emph{id\_check()}:
Index: loncom/html/adm/help/tex/Slot_SelectingField.tex
diff -u loncom/html/adm/help/tex/Slot_SelectingField.tex:1.2 loncom/html/adm/help/tex/Slot_SelectingField.tex:1.3
--- loncom/html/adm/help/tex/Slot_SelectingField.tex:1.2 Tue Dec 5 15:06:43 2006
+++ loncom/html/adm/help/tex/Slot_SelectingField.tex Mon Mar 9 01:58:57 2009
@@ -23,5 +23,5 @@
\item \textbf{Secret word proctor uses to validate}. The password the proctors use when authenticating the students.
\item \textbf{Resource Restriction}. Restricts which page (only test/homework pages) can be opened using this slot. This must be a full symb reference \ref{About_Symbs} to a resource.
\item \textbf{Sections slot is restricted to}. When choosing preassigned slot type, you can choose a section that can access this slot. Only students in that section can open a particular slot. Separate multiple sections by commas.
- \item \textbf{Users slot is restricted to}. When choosing preassigned slot type, you can choose a list of students that can open this slot. Student ids are separated by commas.
+ \item \textbf{Users slot is restricted to}. When choosing preassigned slot type, you can choose a list of students that can open this slot. Student/employee ids are separated by commas.
\end{itemize}
Index: loncom/html/adm/help/tex/exam_scoring.tex
diff -u loncom/html/adm/help/tex/exam_scoring.tex:1.1 loncom/html/adm/help/tex/exam_scoring.tex:1.2
--- loncom/html/adm/help/tex/exam_scoring.tex:1.1 Fri Dec 8 23:06:57 2006
+++ loncom/html/adm/help/tex/exam_scoring.tex Mon Mar 9 01:58:57 2009
@@ -50,7 +50,7 @@
sequence number of the student so you can compare it to the Scantron
bubble sheet. Many students who forget to bubble in their name or
ID usually write this information on the Scantron form.
-\item In the cases of incorrect student ID, misspelled name, and incorrect
+\item In the cases of incorrect student/employee ID, misspelled name, and incorrect
code with specified code file, LON-CAPA will provide you with the
closest matches to choose from. In the case of a missing code or incorrect
code with no code file, you will need to track down which code the
--weissno1236563937--