[LON-CAPA-cvs] cvs: loncom /interface lonuserutils.pm /localize/localize ar.pm de.pm es.pm fa.pm pt.pm ru.pm tr.pm zh.pm

bisitz bisitz at source.lon-capa.org
Fri Dec 6 07:11:14 EST 2013 

bisitz		Fri Dec  6 12:11:14 2013 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
    /loncom/localize/localize	ar.pm de.pm es.pm fa.pm pt.pm ru.pm tr.pm 
                             	zh.pm 
  Log:
  Improved and consistent error messages; better clarify what the unacceptable content is
  Update related translation phrases
  
  
-------------- next part --------------
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.156 loncom/interface/lonuserutils.pm:1.157
--- loncom/interface/lonuserutils.pm:1.156	Thu Sep 26 17:46:42 2013
+++ loncom/interface/lonuserutils.pm	Fri Dec  6 12:11:09 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.156 2013/09/26 17:46:42 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.157 2013/12/06 12:11:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4271,18 +4271,23 @@
                     if ($entries{$fields{'username'}} =~ /\s/) {
                         $nowhitespace = ' - '.&mt('usernames may not contain spaces.');
                     }
-                    $r->print('<br />'.
-      &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
-          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen).
-                              $nowhitespace);
+                    $r->print(
+                        '<br />'.
+                        &mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
+                                '"<b>'.$entries{$fields{'username'}}.'</b>"',
+                                $fname,$mname,$lname,$gen).
+                        $nowhitespace);
                     next;
                 } else {
                     $entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
                     if ($entries{$fields{'domain'}} 
                         ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
-                        $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
-                                  '</b>: '.&mt('Unacceptable domain for user [_1] [_2] [_3] [_4]',$fname,$mname,$lname,$gen));
-                        next;
+                        $r->print(
+                            '<br />'.
+                            &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+                                   '"<b>'.$entries{$fields{'domain'}}.'</b>"',
+                                    $fname,$mname,$lname,$gen));
+                    next;
                     }
                     my $username = $entries{$fields{'username'}};
                     my $userdomain = $entries{$fields{'domain'}};
Index: loncom/localize/localize/ar.pm
diff -u loncom/localize/localize/ar.pm:1.23 loncom/localize/localize/ar.pm:1.24
--- loncom/localize/localize/ar.pm:1.23	Mon Sep 23 17:34:57 2013
+++ loncom/localize/localize/ar.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Arabic Localization Lexicon
 #
-# $Id: ar.pm,v 1.23 2013/09/23 17:34:57 bisitz Exp $
+# $Id: ar.pm,v 1.24 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -1486,13 +1486,16 @@
 => '<- سابق',
 
    '<b>[_1]</b>:  Unable to enroll: [_2]'
-=> '<b>[_1]</b>:  لا يمكن التسجيل l: [_2] (34)',
+=> '<b>[_1]</b>:  لا يمكن التسجيل l: [_2]',
 
    '<b>[_1]</b>: Unable to enroll.  No password specified.'
 => '<b>[_1]</b>: لا يمكن التسجيل. لم تحدد كلمة المرور l.',
 
-   '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '<b>[_1]</b>:  لا يُقبل الاسم الاستخدامي لهذا المستخدم l [_2] [_3] [_4] [_5] (36)',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'لا يُقبل الاسم الاستخدامي لهذا المستخدم l [_1] [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    'ALL'
 => 'جميع',
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.561 loncom/localize/localize/de.pm:1.562
--- loncom/localize/localize/de.pm:1.561	Thu Dec  5 18:04:53 2013
+++ loncom/localize/localize/de.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.561 2013/12/05 18:04:53 bisitz Exp $
+# $Id: de.pm,v 1.562 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3260,8 +3260,11 @@
    'can not be accessed from your location.'
 => 'kann von Ihrer Position aus nicht aufgerufen werden.',
 
-   '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '[_1]: Unzulässige Benutzerkennung für den Benutzer [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unzulässige Benutzerkennung [_1] für den Benutzer [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unzulässige Domäne [_1] für Benutzer [_2] [_3] [_4] [_5]',
 
    'usernames may not contain spaces.'
 => 'Benutzerkennungen dürfen keine Leerzeichen enthalten.',
@@ -28055,9 +28058,6 @@
    'Choose the role and/or section(s) and/or credits to assign to users without values specified in the uploaded file.'
 => 'Wählen sie die Rolle und/oder Sektion(en) und/oder Credits, die Benutzern zugewiesen werden sollen, für die in der hochgeladenen Datei keine Werte angegeben wurden.',
 
-   'Unacceptable domain for user [_1] [_2] [_3] [_4]'
-=> 'Ungültige Domäne für Benutzer [_1] [_2] [_3] [_4]',
-
    'You may not specify an initial password for each user, as this is only available when new users use LON-CAPA internal authentication.'
 => 'Sie können nicht für jeden einzelnen Benutzer ein initiales Passwort angeben, da dies nur verfügbar ist, wenn neue Benutzer interne Authentifizierung verwenden.',
 
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.75 loncom/localize/localize/es.pm:1.76
--- loncom/localize/localize/es.pm:1.75	Wed Dec  4 15:57:18 2013
+++ loncom/localize/localize/es.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.75 2013/12/04 15:57:18 bisitz Exp $
+# $Id: es.pm,v 1.76 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2664,8 +2664,11 @@
 
 #SYNC Fri Nov  7 16:59:44 2003
 
-   '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '[_1]: No se acepta ese Nombre de usuario [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'No se acepta [_1] ese Nombre de usuario [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    'All Documents in Course'
 => 'Todos los documentos del Curso',
Index: loncom/localize/localize/fa.pm
diff -u loncom/localize/localize/fa.pm:1.21 loncom/localize/localize/fa.pm:1.22
--- loncom/localize/localize/fa.pm:1.21	Mon Sep 23 17:34:58 2013
+++ loncom/localize/localize/fa.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Farsi Localization Lexicon
 #
-# $Id: fa.pm,v 1.21 2013/09/23 17:34:58 bisitz Exp $
+# $Id: fa.pm,v 1.22 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -1452,8 +1452,11 @@
    '<b>[_1]</b>: Unable to enroll.  No password specified.'
 => '<b>[_1]</b>: ثبت نام ميسر نشد. رمز عبور مشخص نشده ا',
 
-   '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '<b>[_1]</b>: نام كاربرى براى اين كاربر غير قابل قبول استr [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'نام كاربرى براى اين كاربر غير قابل قبول است [_1] [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    'ALL'
 => 'همه',
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.67 loncom/localize/localize/pt.pm:1.68
--- loncom/localize/localize/pt.pm:1.67	Wed Dec  4 16:15:25 2013
+++ loncom/localize/localize/pt.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Portuguese Localization Lexicon
 #
-# $Id: pt.pm,v 1.67 2013/12/04 16:15:25 bisitz Exp $
+# $Id: pt.pm,v 1.68 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright UNICAMP, Sao Paulo
 # Supported in part by Partnership in Global Learning
@@ -2454,8 +2454,11 @@
    '<b>[_1]</b>: Unable to enroll.  No password specified.'
 => '<b>[_1]</b>: Não é possível matricular. Não foi especificada uma senha.',
 
-   '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '<b>[_1]</b>: Username ináceitavel para o usuário [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Username [_1] ináceitavel para o usuário [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    'Administrator'
 => 'Administrador',
@@ -20773,9 +20776,6 @@
    '[_1]: Unable to modify authentication: [_2]'
 => '[_1]: Unable to modify authentication: [_2]',
 
-   '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
-
    '[_1]: You do not have permission to add the requested role [_2] for the user.'
 => '[_1]: You do not have permission to add the requested role [_2] for the user.',
 
Index: loncom/localize/localize/ru.pm
diff -u loncom/localize/localize/ru.pm:1.66 loncom/localize/localize/ru.pm:1.67
--- loncom/localize/localize/ru.pm:1.66	Mon Sep 23 17:34:58 2013
+++ loncom/localize/localize/ru.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Russian Localization Lexicon
 #
-# $Id: ru.pm,v 1.66 2013/09/23 17:34:58 bisitz Exp $
+# $Id: ru.pm,v 1.67 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -189,8 +189,11 @@
    '<b>[_1]</b>: Unable to enroll.  No password specified.'
 => '<b>[_1]</b>: Зачисление невозможно.  Пароль не задан.',
 
-   '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '<b>[_1]</b>: Неприемлимое имя пользователя для пользователя [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Неприемлимое имя пользователя [_1] для пользователя [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    '<b>HTML allowed</b>: Discussion participants can use limited HTML in their postings.'
 => '<b>HTML разрешен</b>: Участники обсуждений могут использовать элементы HTML  в курсовых обсуждениях.',
Index: loncom/localize/localize/tr.pm
diff -u loncom/localize/localize/tr.pm:1.21 loncom/localize/localize/tr.pm:1.22
--- loncom/localize/localize/tr.pm:1.21	Mon Sep 23 17:34:58 2013
+++ loncom/localize/localize/tr.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Turkish Localization Lexicon
 #
-# $Id: tr.pm,v 1.21 2013/09/23 17:34:58 bisitz Exp $
+# $Id: tr.pm,v 1.22 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2625,9 +2625,12 @@
    '<b>[_1]</b>: Unable to enroll.  No password specified.'
 => '<b>[_1]</b>: Unable to enroll.  No password specified.',
 # <b>[_1]</b>: Unable -e Ãœye Olmak.  No passwveyad specified.
-   '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
-# <b>[_1]</b>: Unacceptable kullanýcýÝsim fveya kullanýcý [_2] [_3] [_4] [_5]
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
+# Unacceptable kullanýcýÝsim [_1] fveya kullanýcý [_2] [_3] [_4] [_5]
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+
    '<p>Your current LON-CAPA domain is "<b>[_1]</b>".</p>'
 => '<p>Your current LON-CAPA domain is "<b>[_1]</b>".</p>',
 # <p>Your curTekrarnt LON-CAPA Alan is "<b>[_1]</b>".</p>
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.114 loncom/localize/localize/zh.pm:1.115
--- loncom/localize/localize/zh.pm:1.114	Wed Dec  4 15:57:19 2013
+++ loncom/localize/localize/zh.pm	Fri Dec  6 12:11:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.114 2013/12/04 15:57:19 bisitz Exp $
+# $Id: zh.pm,v 1.115 2013/12/06 12:11:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2631,8 +2631,11 @@
    'can not be accessed from your location.'
 => 'can not be accessed from your location.',
 
-   '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]'
-=> '[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
+   'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
+
+   'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]'
+=> 'Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
 
    'All Documents in Course'
 => 'All Documents in Course',

More information about the LON-CAPA-cvs mailing list