diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 5b66d0b5734..2daa2f0285f 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -334,7 +334,7 @@ else // Array of install choices print ''; - # Sho first install line + # Show first install line print ''; print ' @@ -370,7 +370,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t @@ -387,7 +387,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - -
'.$langs->trans("FreshInstall").''; print ''; @@ -403,7 +403,12 @@ else { print '
'; //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); - print '
'.$langs->trans("InstallChoiceSuggested").'
'; + print '
'.$langs->trans("InstallChoiceSuggested").'
'; + if ($count < sizeof($migarray)) // There is other choices after + { + print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION); + } + print '
'; // Ok '; $foundrecommandedchoice=1; // To show only once } diff --git a/htdocs/install/default.css b/htdocs/install/default.css index ed5237d940f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -177,7 +177,7 @@ color: black; padding: 5px 5px 5px 5px; margin: 0em 0em 0em 0em; text-decoration:none; -font-size: 12px; +font-size: 11px; border-bottom: 1px solid #8CACBB; } diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index b8bfe31e595..c6f4366ffca 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -343,7 +343,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
> trans("CheckToCreateDatabase"); ?> > trans("CheckToCreateUser"); ?>
trans("Login"); ?>
trans("DatabaseRootLoginDescription"); ?> @@ -398,7 +398,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
trans("Password"); ?> @@ -410,6 +410,27 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
'."\n"; + print ''."\n"; print ''.$langs->trans("DolibarrSetup").''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 52e29a12e65..356b0ffd64c 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -138,6 +138,7 @@ IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s InstallChoiceSuggested=Install choice suggested by installer. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". OpenBaseDir=PHP openbasedir parameter diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 44aaa3dca85..a92b62d50fe 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -139,6 +139,7 @@ IfLoginDoesNotExistsCheckCreateUser=Si le login n'existe pas encore, vous devez ErrorConnection=Le serveur "%s", nom de base "%s", login "%s", ou mot de passe de la base de données est peut-être incorrect ou la version du client PHP trop ancienne par rapport à la version de la base de données. InstallChoiceRecommanded=Choix recommandé pour installer la version %s depuis votre version actuelle %s InstallChoiceSuggested=Choix suggéré par l'installeur. +MigrateIsDoneStepByStep=La version cible (%s) ayant un écart de plusieurs versions, l'installeur reviendra proposer la migration suivante une fois celle-ci exécutée. CheckThatDatabasenameIsCorrect=Vérifiez que le nom de base "%s" est correct. IfAlreadyExistsCheckOption=Si ce nom est correct et que cette base n'existe pas déjà, vous devez cocher l'option "Créer la base de données". OpenBaseDir=Paramètre php openbasedir