lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorg code install

Browse Source
This commit is contained in:
Laurent Destailleur 2006-10-20 22:31:07 +00:00
parent d7077ea640
commit 5109cff29b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/install/upgrade.php
View File

@ -94,10 +94,13 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{ {
if($db->database_selected == 1) if($db->database_selected == 1)
{ {
print "<tr><td nowrap>";
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("Database connection successfull : $dolibarr_main_db_name"); dolibarr_install_syslog("Database connection successfull : $dolibarr_main_db_name");
} }
else else
{ {
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
$ok = 0 ; $ok = 0 ;
} }
} }
@ -107,9 +110,9 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{ {
$version=$db->getVersion(); $version=$db->getVersion();
$versionarray=$db->getVersionArray(); $versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>'; print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>'; print '<td align="right">'.$version.'</td></tr>';
dolibarr_install_syslog($langs->trans("DatabaseVersion")." : $version"); dolibarr_install_syslog($langs->trans("ServerVersion")." : $version");
//print '<td align="right">'.join('.',$versionarray).'</td></tr>'; //print '<td align="right">'.join('.',$versionarray).'</td></tr>';
} }

10
htdocs/langs/en_US/install.lang
View File

@ -12,8 +12,8 @@ ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions.
ErrorDirDoesNotExists=Directory %s does not exists. ErrorDirDoesNotExists=Directory %s does not exists.
ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
ErrorFaileToCreateDatabase=Failed to create database '%'. ErrorFailedToCreateDatabase=Failed to create database '%'.
ErrorFaileToConnectToDatabase=Failed to connect to database '%'. ErrorFailedToConnectToDatabase=Failed to connect to database '%'.
ErrorPHPVersionTooLow=PHP version too old. Version %s is required. ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
PHPVersion=PHP Version PHPVersion=PHP Version
YouCanContinue=You can continue... YouCanContinue=You can continue...
@ -90,11 +90,7 @@ YouMustCreateWithPermission=You must create file %s and set write permissions on
CorrectProblemAndReloadPage=Correct problem and <a href="index.php">reload page</a> (Press F5 key). CorrectProblemAndReloadPage=Correct problem and <a href="index.php">reload page</a> (Press F5 key).
AlreadyDone=Already migrated AlreadyDone=Already migrated
DatabaseVersion=Database version DatabaseVersion=Database version
ServerVersion=Database server version
######### #########
# upgrade # upgrade

5
htdocs/langs/fr_FR/install.lang
View File

@ -12,8 +12,8 @@ ErrorPHPDoesNotSupportSessions=Votre installation PHP ne supporte pas les sessio
ErrorDirDoesNotExists=Le répertoire <b>%s</b> n'existe pas ou n'est pas accessible. ErrorDirDoesNotExists=Le répertoire <b>%s</b> n'existe pas ou n'est pas accessible.
ErrorGoBackAndCorrectParameters=Revenez en arrière et corrigez les paramètres invalides. 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'. ErrorWrongValueForParameter=Vous avez peut-être saisi une mauvaise valeur pour le paramètre '%s'.
ErrorFaileToCreateDatabase=Echec de création de la base '%'. ErrorFailedToCreateDatabase=Echec de création de la base '%'.
ErrorFaileToConnectToDatabase=Echec de connection à la base '%'. ErrorFailedToConnectToDatabase=Echec de connection à la base '%'.
ErrorPHPVersionTooLow=Version de PHP trop ancienne. La version %s est requise. ErrorPHPVersionTooLow=Version de PHP trop ancienne. La version %s est requise.
PHPVersion=Version PHP PHPVersion=Version PHP
YouCanContinue=Vous pouvez continuer... YouCanContinue=Vous pouvez continuer...
@ -91,6 +91,7 @@ YouMustCreateWithPermission=Vous devez cr
CorrectProblemAndReloadPage=Corrigez le problème et <a href="index.php">rechargez la page</a> (Touche F5). CorrectProblemAndReloadPage=Corrigez le problème et <a href="index.php">rechargez la page</a> (Touche F5).
AlreadyDone=Déjà migré AlreadyDone=Déjà migré
DatabaseVersion=Version de la base DatabaseVersion=Version de la base
ServerVersion=Version du serveur de base de donnée
######### #########
# upgrade # upgrade