From d3d2ffe43e38a82000651da02b87d6af396a7cee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Apr 2013 16:16:41 +0200
Subject: [PATCH] Qual: A better error management for suse rpm package

---
 build/rpm/README               | 1 +
 htdocs/install/etape1.php      | 3 ++-
 htdocs/langs/en_US/errors.lang | 1 +
 htdocs/langs/fr_FR/errors.lang | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/rpm/README b/build/rpm/README
index 6f2e6634f4b..cd581a0eef4 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -28,6 +28,7 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
 # On OpenSuse
 # yast --install dolibarr-...rpm    To install package and dependencies
 # yast --remove  dolibarr           To remove package
+# Log of Yast available into /var/log/YaST2/y2log
 #
 # On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 53f1aba9e19..486748f92a7 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -196,7 +196,8 @@ if (! $error)
             elseif ($db->error && ! (! empty($_POST["db_create_database"]) && $db->connected))
             {
             	// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
-                print '<div class="error">'.$db->error.'</div>';
+                if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
+                else print '<div class="error">'.$db->error.'</div>';
                 if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                 //print '<a href="#" onClick="javascript: history.back();">';
                 print $langs->trans("ErrorGoBackAndCorrectParameters");
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3cfee357c81..a9de1c511a8 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -121,6 +121,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 5081f66d5f7..08c14dc5c35 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -122,6 +122,7 @@ ErrorFailedToAddToMailmanList=Echec de l'ajout de %s à la liste Mailman %s ou b
 ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailman %s ou base SPIP
 ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'ancienne
 ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayer de recommencer le processus de réinit de mot de passe depuis le début.
+ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de donnée. Vérifier que Mysql est bien lancé (dans la plupart des cas, vous pouvez le lancer depuis la ligne de commande par la commande 'sudo /etc/init.d/mysql start').
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées