[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface loncreateuser.pm lonuserutils.pm /localize/localize de.pm

bisitz bisitz@source.lon-capa.org
Mon, 11 May 2009 13:07:24 -0000


This is a MIME encoded message

--bisitz1242047244
Content-Type: text/plain

bisitz		Mon May 11 13:07:24 2009 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
    /loncom/homework	grades.pm 
    /loncom/interface	lonuserutils.pm loncreateuser.pm 
  Log:
  "Student/Employee ID"
  - Consistent wording
  - Lower-/Uppercase
  - German wording: "Studierenden-/Mitarbeiter-ID" (Studierende_n_)
  - Removed unused translation phrases
  - not just "ID" (i.e. could be "Course ID"; more to do)
  
  
--bisitz1242047244
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090511130724.txt"

Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.292 loncom/localize/localize/de.pm:1.293
--- loncom/localize/localize/de.pm:1.292	Fri May  8 12:06:36 2009
+++ loncom/localize/localize/de.pm	Mon May 11 13:07:14 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.292 2009/05/08 12:06:36 bisitz Exp $
+# $Id: de.pm,v 1.293 2009/05/11 13:07:14 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2752,7 +2752,7 @@
 => 'Verbergen',
 
    'Student/Employee ID'
-=> 'Studierende-/Mitarbeiter-ID',
+=> 'Studierenden-/Mitarbeiter-ID',
 
    'Identify fields'
 => 'Identifiziere Felder',
@@ -2865,15 +2865,12 @@
    'The optional name field was not specified.'
 => 'Das optionale Namensfeld wurde nicht ausgefüllt.',
 
-   'The optional ID number field was not specified.'
-=> 'Das optionale Matrikelnummer-Feld wurde nicht ausgefüllt.',
+   'The optional student/employee ID field was not specified.'
+=> 'Das optionale Studierenden-/Mitarbeiter-ID-Feld wurde nicht ausgefüllt.',
 
    'The optional section or group field was not specified.'
 => 'Das optionale Sektions- oder Gruppenfeld wurde nicht ausgefüllt.',
 
-   'The optional student/employee ID field was not specified.'
-=> 'Das optionale Matrikelnummer-Feld wurde nicht ausgefüllt.',
-
    'The optional section field was not specified.'
 => 'Das optionale Sektionsfeld wurde nicht ausgefüllt.',
 
@@ -4530,9 +4527,6 @@
    'You are working with an unsaved version of your map.'
 => 'Sie arbeiten momentan an einer nicht gespeicherten Version Ihrer Inhaltszusammenstellung.',
 
-   '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.'
 => 'Ihre Versuch zur Änderung der Rolleninformationen für diese/n Studenten/in wurde abgelehnt. Sie haben offensichtlich nicht genügend Rechte zum Ändern der Studierendendaten.',
 
@@ -8536,7 +8530,7 @@
 => 'Aufgabenteil-Parameter',
 
    'For User [_1] or Student/Employee ID [_2] at Domain [_3]'
-=> 'Für Benutzer [_1] oder Studierende-/Mitarbeiter-ID [_2] in der Domäne [_3]',
+=> 'Für Benutzer [_1] oder Studierenden-/Mitarbeiter-ID [_2] in der Domäne [_3]',
 
    'Group Portfolio'
 => 'Gruppen-Portfolio',
@@ -11226,8 +11220,8 @@
    'Not allowed to modify grades for [_1]'
 => 'Keine Berechtigung zur Änderung der Bewertungen für [_1].',
 
-   'You need to specify the username or ID'
-=> 'Sie müssen eine Benutzerkennung oder eine ID/Matrikelnummer angeben',
+   'You need to specify the username or the student/employee ID'
+=> 'Sie müssen eine Benutzerkennung oder eine Studierenden-/Mitarbeiter-ID angeben',
 
    'You need to specify at least one grading field'
 => 'Sie müssen mindestens ein Bewertungsfeld ausfüllen',
@@ -11763,7 +11757,7 @@
    'Students selected from this list can be dropped.'
 => 'Studierende, die von dieser Liste gewählt wurden, können aus dem Kurs ausgeschlossen werden.',
 
-   'Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).'
+   'Update student/employee ID in courses in which user is active/future student,[_1](if forcing change).'
 => 'Aktualisierung der Studierenden-/Mitarbeiter-ID in Kursen, in denen der Benutzer aktueller/zukünftige/r Student/in ist<br />(falls Änderung erzwungen wird).',
 
    'make these dates the default access dates for future student enrollment'
@@ -15376,7 +15370,7 @@
    'You do not have the authority to modify this users authentification information'
 => 'Sie haben nicht die Berechtigung, um die Authentifizierungsinformationen dieses Benutzers zu modifizieren',
 
-   'New Student/Employee ID does not match existing ID for this user.'
+   'New student/employee ID does not match existing ID for this user.'
 => 'Die neue Studierenden-/Mitarbeiter-ID stimmt nicht mit der bestehenden ID dieses Benutzers überein.',
 
    "Change is not permitted without checking the 'Force ID change' checkbox on the previous page."
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.572 loncom/homework/grades.pm:1.573
--- loncom/homework/grades.pm:1.572	Thu May  7 19:36:45 2009
+++ loncom/homework/grades.pm	Mon May 11 13:07:19 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.572 2009/05/07 19:36:45 www Exp $
+# $Id: grades.pm,v 1.573 2009/05/11 13:07:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3681,7 +3681,7 @@
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -3721,7 +3721,7 @@
 }
 
 sub csvupload_javascript_forward_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -5241,7 +5241,7 @@
       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/employee ID number starts
+      IDstart     - column where the student/employee ID starts
       IDlength    - length of the student/employee ID info
       Qstart      - column where the information from the bubbled
                     'questions' start
@@ -5341,7 +5341,7 @@
     $whichline         - line number of the passed in scanline
     $field             - type of change to process 
                          (either 
-                          'ID'     -> correct the student/employee ID number
+                          'ID'     -> correct the student/employee ID
                           'CODE'   -> correct the CODE
                           'answer' -> fixup the submitted answers)
     
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.92 loncom/interface/lonuserutils.pm:1.93
--- loncom/interface/lonuserutils.pm:1.92	Wed May  6 16:19:34 2009
+++ loncom/interface/lonuserutils.pm	Mon May 11 13:07:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.92 2009/05/06 16:19:34 bisitz Exp $
+# $Id: lonuserutils.pm,v 1.93 2009/05/11 13:07:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -401,7 +401,7 @@
          krb      => 'You need to specify the Kerberos domain.',
          ipass    => 'You need to specify the initial password.',
          name     => 'The optional name field was not specified.',
-         snum     => 'The optional ID number field was not specified.',
+         snum     => 'The optional student/employee ID field was not specified.',
          section  => 'The optional section field was not specified.',
          email    => 'The optional e-mail address field was not specified.',
          role     => 'The optional role field was not specified.',
@@ -845,7 +845,7 @@
     if ($context eq 'domain') {
         $output .= '<br /><label><input type="checkbox" name="recurseid"'.
                    ' value="yes" />'. 
-  &mt('Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
+  &mt('Update student/employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
                    '</label>'."\n";
     }
     $output .= '</p>';
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.292 loncom/interface/loncreateuser.pm:1.293
--- loncom/interface/loncreateuser.pm:1.292	Wed Apr 29 16:57:29 2009
+++ loncom/interface/loncreateuser.pm	Mon May 11 13:07:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.292 2009/04/29 16:57:29 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.293 2009/05/11 13:07:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2100,7 +2100,7 @@
             (!$forceid)) {
             if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
                 $env{'form.cid'} = $userenv{'id'};
-                $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
+                $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";

--bisitz1242047244--