diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 7da2443ae2e..da4fdd8229b 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -94,10 +94,13 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{
if($db->database_selected == 1)
{
+ print "
| ";
+ print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name." | ".$langs->trans("OK")." |
";
dolibarr_install_syslog("Database connection successfull : $dolibarr_main_db_name");
}
else
{
+ print "| ".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)." | ".$langs->trans("Error")." |
";
$ok = 0 ;
}
}
@@ -107,9 +110,9 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{
$version=$db->getVersion();
$versionarray=$db->getVersionArray();
- print '| '.$langs->trans("DatabaseVersion").' | ';
+ print '
| '.$langs->trans("ServerVersion").' | ';
print ''.$version.' |
';
- dolibarr_install_syslog($langs->trans("DatabaseVersion")." : $version");
+ dolibarr_install_syslog($langs->trans("ServerVersion")." : $version");
//print ''.join('.',$versionarray).' | ';
}
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 7e513da6293..5890784a374 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -12,8 +12,8 @@ ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions.
ErrorDirDoesNotExists=Directory %s does not exists.
ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFaileToCreateDatabase=Failed to create database '%'.
-ErrorFaileToConnectToDatabase=Failed to connect to database '%'.
+ErrorFailedToCreateDatabase=Failed to create database '%'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%'.
ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
PHPVersion=PHP Version
YouCanContinue=You can continue...
@@ -90,11 +90,7 @@ YouMustCreateWithPermission=You must create file %s and set write permissions on
CorrectProblemAndReloadPage=Correct problem and reload page (Press F5 key).
AlreadyDone=Already migrated
DatabaseVersion=Database version
-
-
-
-
-
+ServerVersion=Database server version
#########
# upgrade
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 0748ed119e1..034cbfbfb05 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -12,8 +12,8 @@ ErrorPHPDoesNotSupportSessions=Votre installation PHP ne supporte pas les sessio
ErrorDirDoesNotExists=Le répertoire %s n'existe pas ou n'est pas accessible.
ErrorGoBackAndCorrectParameters=Revenez en arrière et corrigez les paramètres invalides.
ErrorWrongValueForParameter=Vous avez peut-être saisi une mauvaise valeur pour le paramètre '%s'.
-ErrorFaileToCreateDatabase=Echec de création de la base '%'.
-ErrorFaileToConnectToDatabase=Echec de connection à la base '%'.
+ErrorFailedToCreateDatabase=Echec de création de la base '%'.
+ErrorFailedToConnectToDatabase=Echec de connection à la base '%'.
ErrorPHPVersionTooLow=Version de PHP trop ancienne. La version %s est requise.
PHPVersion=Version PHP
YouCanContinue=Vous pouvez continuer...
@@ -91,6 +91,7 @@ YouMustCreateWithPermission=Vous devez cr
CorrectProblemAndReloadPage=Corrigez le problème et rechargez la page (Touche F5).
AlreadyDone=Déjà migré
DatabaseVersion=Version de la base
+ServerVersion=Version du serveur de base de donnée
#########
# upgrade