| [ghelda-devel] [5] Cleanup and add the title for new persons ( and corresponding translations) |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/ghelda-devel Archives
]
Revision: 5
Author: odyx
Date: 2008-11-26 09:45:52 +0100 (Wed, 26 Nov 2008)
Log Message:
-----------
Cleanup and add the title for new persons (and corresponding translations)
Modified Paths:
--------------
trunk/init/log.php
trunk/locale/fr.UTF-8/LC_MESSAGES/People.po
trunk/locale/templates/People.pot
trunk/locale/templates/g_core.pot
trunk/plugins/People.php
Modified: trunk/init/log.php
===================================================================
--- trunk/init/log.php 2008-11-26 08:33:36 UTC (rev 4)
+++ trunk/init/log.php 2008-11-26 08:45:52 UTC (rev 5)
@@ -39,12 +39,6 @@
$g_H_DisplayLogger = &Log::singleton('Display','DisplayLogger','Ghelda',array(),PEAR_LOG_ERR);
$Logger->addChild($g_H_DisplayLogger);
-// (Un-comment this to have a live window with the debug messages (may destroy your layout)
-/*
-$g_H_WinLogger = &Log::singleton('win', 'LogWindow', 'ident', array('title' => 'GHELDA Debug'),PEAR_LOG_INFO);
-$Logger->addChild($g_H_WinLogger);
-// */
-
// Require both errors handlers
require_once "inc/error_handlers.php";
@@ -54,19 +48,16 @@
// PHP Errors
set_error_handler('g_PHP_errorHandler');
-// PEAR::raiseError('Page loading started.', PEAR_LOG_NOTICE);
-// trigger_error('Page loading started.', E_USER_NOTICE);
-
//! Array of error levels names
$errorLevels = array(
- PEAR_LOG_EMERG => "emerg", /* System is unusable */
- PEAR_LOG_ALERT => "alert", /* Immediate action required */
- PEAR_LOG_CRIT => "crit", /* Critical conditions */
- PEAR_LOG_ERR => "err", /* Error conditions */
+ PEAR_LOG_EMERG => "emerg", /* System is unusable */
+ PEAR_LOG_ALERT => "alert", /* Immediate action required */
+ PEAR_LOG_CRIT => "crit", /* Critical conditions */
+ PEAR_LOG_ERR => "err", /* Error conditions */
PEAR_LOG_WARNING=> "warning", /* Warning conditions */
PEAR_LOG_NOTICE => "notice", /* Normal but significant */
- PEAR_LOG_INFO => "info", /* Informational */
- PEAR_LOG_DEBUG => "debug", /* Debug-level messages */
+ PEAR_LOG_INFO => "info", /* Informational */
+ PEAR_LOG_DEBUG => "debug", /* Debug-level messages */
);
Modified: trunk/locale/fr.UTF-8/LC_MESSAGES/People.po
===================================================================
--- trunk/locale/fr.UTF-8/LC_MESSAGES/People.po 2008-11-26 08:33:36 UTC (rev 4)
+++ trunk/locale/fr.UTF-8/LC_MESSAGES/People.po 2008-11-26 08:45:52 UTC (rev 5)
@@ -21,7 +21,7 @@
msgstr ""
"Project-Id-Version: People\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 15:27+0100\n"
+"POT-Creation-Date: 2008-11-26 09:43+0100\n"
"PO-Revision-Date: 2008-09-24 22:02+0200\n"
"Last-Translator: Didier Raboud <didier@xxxxxxxxxx>\n"
"Language-Team: <fr@xxxxxx>\n"
@@ -39,47 +39,51 @@
msgid "Username"
msgstr "Nom d'utilisateur"
-#: plugins/People/config_core.php:33
+#: plugins/People/config_core.php:34
msgid "Password"
msgstr "Mot de passe"
-#: plugins/People/config_core.php:34
+#: plugins/People/config_core.php:35
msgid "Repeat the password"
msgstr "Répétez le mot de passe"
-#: plugins/People/config_core.php:40
+#: plugins/People/config_core.php:41
msgid "E-mail"
msgstr "Courriel"
-#: plugins/People/config_core.php:47
+#: plugins/People/config_core.php:48
msgid "Name"
msgstr "Nom"
-#: plugins/People/config_core.php:51
+#: plugins/People/config_core.php:52
msgid "Surname"
msgstr "Prénom"
-#: plugins/People/config_core.php:55
+#: plugins/People/config_core.php:56
msgid "Genre"
msgstr "Genre"
-#: plugins/People/config_core.php:56
+#: plugins/People/config_core.php:57
msgid "female - ♀"
msgstr "femme - ♀"
-#: plugins/People/config_core.php:57
+#: plugins/People/config_core.php:58
msgid "male - ♂"
msgstr "homme - ♂"
-#: plugins/People/config_core.php:60
+#: plugins/People/config_core.php:62
msgid "Date of birth"
msgstr "Date de naissance"
-#: plugins/People/config_core.php:63
+#: plugins/People/config_core.php:66
+msgid "Mobile phone number"
+msgstr "Numéro de Natel"
+
+#: plugins/People/config_core.php:71
msgid "New Social Security Number"
msgstr "Nouveau numéro de Sécurité Sociale"
-#: plugins/People/config_core.php:69
+#: plugins/People/config_core.php:77
msgid "Comment"
msgstr "Commentaire"
@@ -103,57 +107,55 @@
msgid "List"
msgstr "Liste"
-#: plugins/People.php:57
+#: plugins/People.php:58
msgid "Intrusion tentative detected: "
msgstr "Tentative d'intrusion détectée :"
-#: plugins/People.php:57
+#: plugins/People.php:58
msgid "Don't try to use undefined mode names!"
msgstr "N'essayez pas d'utiliser des noms de modes indéfinis !"
-#: plugins/People.php:113
+#: plugins/People.php:121
msgid "Edit"
msgstr "Édition"
-#: plugins/People.php:115
+#: plugins/People.php:123
msgid "Edit connection settings"
msgstr "Éditer les paramètres de connexion"
-#: plugins/People.php:116
+#: plugins/People.php:124
msgid "Delete"
msgstr "Destruction"
-#: plugins/People.php:146
+#: plugins/People.php:154
msgid "The provided username is empty!"
msgstr "Le nom d'utilisateur fourni est vide !"
-#: plugins/People.php:163
+#: plugins/People.php:171
msgid "The provided username is already defined."
msgstr "Le nom d'utilisateur fourni existe déjà."
-#: plugins/People.php:178
+#: plugins/People.php:186
msgid "The provided password is empty (a random one has been provided)."
msgstr ""
"Le mot de passe fourni est vide (un mot de passe aléatoire a été généré)."
-#: plugins/People.php:189
+#: plugins/People.php:197
msgid "The two provided passwords are different."
msgstr "Les deux mots de passe fournis sont différents."
-#: plugins/People.php:296
+#: plugins/People.php:305
msgid "Execute"
msgstr "Exécuter"
-#: plugins/People.php:331
+#: plugins/People.php:310
+msgid "New person"
+msgstr "Nouvelle personne"
+
+#: plugins/People.php:348
msgid "Confirm deletion"
msgstr "Confirmer la destruction"
-#: plugins/People.php:331
+#: plugins/People.php:348
msgid "Do you really want to delete the following entry?"
msgstr "Voulez-vous vraiment détruire la fiche suivante ?"
-
-#~ msgid "♀"
-#~ msgstr "♀"
-
-#~ msgid "♂"
-#~ msgstr "♂"
Modified: trunk/locale/templates/People.pot
===================================================================
--- trunk/locale/templates/People.pot 2008-11-26 08:33:36 UTC (rev 4)
+++ trunk/locale/templates/People.pot 2008-11-26 08:45:52 UTC (rev 5)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 15:27+0100\n"
+"POT-Creation-Date: 2008-11-26 09:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -24,47 +24,51 @@
msgid "Username"
msgstr ""
-#: plugins/People/config_core.php:33
+#: plugins/People/config_core.php:34
msgid "Password"
msgstr ""
-#: plugins/People/config_core.php:34
+#: plugins/People/config_core.php:35
msgid "Repeat the password"
msgstr ""
-#: plugins/People/config_core.php:40
+#: plugins/People/config_core.php:41
msgid "E-mail"
msgstr ""
-#: plugins/People/config_core.php:47
+#: plugins/People/config_core.php:48
msgid "Name"
msgstr ""
-#: plugins/People/config_core.php:51
+#: plugins/People/config_core.php:52
msgid "Surname"
msgstr ""
-#: plugins/People/config_core.php:55
+#: plugins/People/config_core.php:56
msgid "Genre"
msgstr ""
-#: plugins/People/config_core.php:56
+#: plugins/People/config_core.php:57
msgid "female - ♀"
msgstr ""
-#: plugins/People/config_core.php:57
+#: plugins/People/config_core.php:58
msgid "male - ♂"
msgstr ""
-#: plugins/People/config_core.php:60
+#: plugins/People/config_core.php:62
msgid "Date of birth"
msgstr ""
-#: plugins/People/config_core.php:63
+#: plugins/People/config_core.php:66
+msgid "Mobile phone number"
+msgstr ""
+
+#: plugins/People/config_core.php:71
msgid "New Social Security Number"
msgstr ""
-#: plugins/People/config_core.php:69
+#: plugins/People/config_core.php:77
msgid "Comment"
msgstr ""
@@ -88,50 +92,54 @@
msgid "List"
msgstr ""
-#: plugins/People.php:57
+#: plugins/People.php:58
msgid "Intrusion tentative detected: "
msgstr ""
-#: plugins/People.php:57
+#: plugins/People.php:58
msgid "Don't try to use undefined mode names!"
msgstr ""
-#: plugins/People.php:113
+#: plugins/People.php:121
msgid "Edit"
msgstr ""
-#: plugins/People.php:115
+#: plugins/People.php:123
msgid "Edit connection settings"
msgstr ""
-#: plugins/People.php:116
+#: plugins/People.php:124
msgid "Delete"
msgstr ""
-#: plugins/People.php:146
+#: plugins/People.php:154
msgid "The provided username is empty!"
msgstr ""
-#: plugins/People.php:163
+#: plugins/People.php:171
msgid "The provided username is already defined."
msgstr ""
-#: plugins/People.php:178
+#: plugins/People.php:186
msgid "The provided password is empty (a random one has been provided)."
msgstr ""
-#: plugins/People.php:189
+#: plugins/People.php:197
msgid "The two provided passwords are different."
msgstr ""
-#: plugins/People.php:296
+#: plugins/People.php:305
msgid "Execute"
msgstr ""
-#: plugins/People.php:331
+#: plugins/People.php:310
+msgid "New person"
+msgstr ""
+
+#: plugins/People.php:348
msgid "Confirm deletion"
msgstr ""
-#: plugins/People.php:331
+#: plugins/People.php:348
msgid "Do you really want to delete the following entry?"
msgstr ""
Modified: trunk/locale/templates/g_core.pot
===================================================================
--- trunk/locale/templates/g_core.pot 2008-11-26 08:33:36 UTC (rev 4)
+++ trunk/locale/templates/g_core.pot 2008-11-26 08:45:52 UTC (rev 5)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 15:27+0100\n"
+"POT-Creation-Date: 2008-11-26 09:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
Modified: trunk/plugins/People.php
===================================================================
--- trunk/plugins/People.php 2008-11-26 08:33:36 UTC (rev 4)
+++ trunk/plugins/People.php 2008-11-26 08:45:52 UTC (rev 5)
@@ -183,7 +183,7 @@
if($id == G_MEM_ID_NEW || $editBase) { // We are creating a new one or modifying => check its uniqueness and size
if(empty($_POST[$fieldName])) {
$fieldsSpec[$fieldName]['error'] = true;
- trigger_error(T_('The provided password is empty (a random one has been provided).'), E_USER_ERROR);
+ trigger_error(T_('The provided password is empty (a random one has been provided).'), G_E_DISPLAY);
unset($fieldsSpec[$fieldName]['noShow']);
$newError = true;
$fieldsContents[G_DB_PEOPLE_PASSWORD] = md5(microtime());
@@ -194,7 +194,7 @@
$fieldContent = $hash($_POST[$fieldName]);
} else { // Both passwords are differents
$fieldsSpec[$fieldName]['error'] = true;
- trigger_error(T_('The two provided passwords are different.'), E_USER_ERROR);
+ trigger_error(T_('The two provided passwords are different.'), G_E_DISPLAY);
unset($fieldsSpec[$fieldName]['noShow']);
$newError = true;
// Empty password (no leaks)
@@ -301,8 +301,17 @@
// trigger_error(' => ' .var_export($fieldsContents,true),G_E_LOG);
- $this->output->displayFields($fieldsSpec,$fieldsContents,array('id'=>'People_view','command'=>T_('Execute'),'target'=>$this->url->getURL(),'action'=>'change'));
+ $displayOptions['id'] = 'People_view';
+ $displayOptions['command'] = T_('Execute');
+ $displayOptions['target'] = $this->url->getURL();
+ $displayOptions['action'] = 'change';
+ if( $id == G_MEM_ID_NEW ) {
+ $displayOptions['title'] = T_('New person');
+ }
+
+ $this->output->displayFields($fieldsSpec,$fieldsContents,$displayOptions);
+
// Call the functionality
$this->_parent->functionality('People.edit.bottom',$fieldsContents);
}