diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 2393de6ab00..4585b879574 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -285,6 +285,7 @@ if ($user->rights->adherent->creer && $_POST["action"] == 'add') } if ($num) { $error++; + $langs->load("errors"); $errmsg .= $langs->trans("ErrorLoginAlreadyExists",$login)."
\n"; } } diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0f6b73f6871..6d85dba5fef 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -147,7 +147,7 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") { if ($newuser->error == 'ErrorLoginAlreadyExists') { - dolibarr_install_syslog('install/etape5.php ErrorLoginAlreadyExists', LOG_WARNING); + dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING); print '
'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."

"; $success = 1; } diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index e49ccef91cb..62b74bc61d4 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -1,4 +1,6 @@ # Dolibarr language file - en_US - errors +ErrorLoginAlreadyExists=Login %s already exists. +ErrorGroupAlreadyExists=Group %s already exists. ErrorDuplicateTrigger=A trigger file with class nam '%s' is present sevaral times. Remove duplicate trigger file in directory '%s'. ErrorFailToDeleteFile=Failed to remove file '%s'. ErrorFailToCreateFile=Failed to create file '%s'. diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 5dadc171c9e..8f534d97206 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -37,8 +37,6 @@ NewUser=New user CreateUser=Create user SearchAGroup=Search a group SearchAUser=Search a user -ErrorGroupAlreadyExists=Group %s already exists. -ErrorLoginAlreadyExists=Login %s already exists. ErrorFailedToSendPassword=Failed to send password LoginNotDefined=Login is not defined. NameNotDefined=Name is not defined. diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 2c24844c999..71a1192f272 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -1,4 +1,6 @@ # Dolibarr language file - fr_FR - errors +ErrorLoginAlreadyExists=Le login %s existe déjà. +ErrorGroupAlreadyExists=Le groupe %s existe déjà. ErrorDuplicateTrigger=Un fichier trigger de classe '%s' est present plusieurs fois. Supprimer le doublon du répertoire '%s'. ErrorFailToCreateFile=Echec de la création du fichier '%s'. ErrorFailToDeleteFile=Echec de l'effacement du fichier '%s'. diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 5ae06d98d33..332a1803bb6 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -37,8 +37,6 @@ NewUser=Nouvel utilisateur CreateUser=Créer l'utilisateur SearchAGroup=Rechercher un groupe SearchAUser=Rechercher un utilisateur -ErrorLoginAlreadyExists=Le login %s existe déjà. -ErrorGroupAlreadyExists=Le groupe %s existe déjà. ErrorFailedToSendPassword=Echec de l'envoi du mot de passe LoginNotDefined=Le login n'est pas défini. NameNotDefined=Le nom n'est pas défini. diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 30f3076f1a4..7bb9b64f7e5 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -1,4 +1,6 @@ # Dolibarr language file - it_IT - errors +ErrorLoginAlreadyExists =Login %s esiste già. +ErrorGroupAlreadyExists =Gruppo %s esiste già. ErrorDuplicateTrigger =Un trigger file con class name ' %s ' è presente più volte. Rimuovi file trigger duplicati dalla directory ' %s '. ErrorFailToDeleteFile =Impossibile rimuovere il file ' %s '. ErrorFailToCreateFile =Impossibile creare il file ' %s '. diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang index ecb09af7e45..489863ab5c6 100644 --- a/htdocs/langs/it_IT/users.lang +++ b/htdocs/langs/it_IT/users.lang @@ -37,8 +37,6 @@ NewUser =Nuovo utente CreateUser =Crea utente SearchAGroup =Cerca un gruppo SearchAUser =Cerca un utente -ErrorGroupAlreadyExists =Gruppo %s esiste già. -ErrorLoginAlreadyExists =Login %s esiste già. ErrorFailedToSendPassword =Impossibile inviare la password LoginNotDefined =Login non è definito. NameNotDefined =Nome non è definito. diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang new file mode 100644 index 00000000000..4efc2266bd6 --- /dev/null +++ b/htdocs/langs/pt_PT/errors.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - pt_PT - errors +ErrorLoginAlreadyExists=Login %s já existe. +ErrorGroupAlreadyExists=Grupo %s já existe. diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang index 26b3380c9c8..734ce0ef25d 100644 --- a/htdocs/langs/pt_PT/users.lang +++ b/htdocs/langs/pt_PT/users.lang @@ -27,8 +27,6 @@ NewUser=Novo utilizador CreateUser=Criar utilizador SearchAGroup=Procupar um grupo SearchAUser=Procurar um utilizador -ErrorGroupAlreadyExists=Grupo %s já existe. -ErrorLoginAlreadyExists=Login %s já existe. LoginNotDefined=Login não está definido. NameNotDefined=Nome não está definido. ListOfUsers=Lista de utilizadores diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 4be05987a23..2f018a67367 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -175,10 +175,7 @@ if ($_POST["action"] == 'add' && $canadduser) else { $db->rollback(); - - //$message='
'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'
'; $message='
'.$edituser->error.'
'; - $action="create"; // Go back to create page } @@ -252,6 +249,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $caneditfield) { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { + $langs->load("errors"); $message.='
'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'
'; } else diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index d2a4d4c10f6..3da40e93a8b 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -85,8 +85,8 @@ if ($_POST["action"] == 'add') } else { - $db->rollback(); - + $langs->trans("errors"); + $db->rollback(); $message='
'.$langs->trans("ErrorGroupAlreadyExists",$editgroup->nom).'
'; $action="create"; // Go back to create page }