diff --git a/ecrire/inc/install.php b/ecrire/inc/install.php index b7528ebeb337c7da70985c169a5d122d01b3b5cf..dbb8bb86aae56de4bb16d086b607169c70a4d13a 100644 --- a/ecrire/inc/install.php +++ b/ecrire/inc/install.php @@ -317,6 +317,11 @@ function install_connexion_form($db, $login, $pass, $predef, $hidden, $etape) : ('<fieldset><legend>' ._T('install_select_type_db') . "</legend>" + .'<label for="sql_serveur_db">' + . _T('install_types_db_connus') + // Passer l'avertissement SQLIte en commentaire, on pourra facilement le supprimer par la suite sans changer les traductions. + . "<br /><small>(". _T('install_types_db_connus_avertissement') .')</small>' + .'</label>' . "\n<div style='text-align: center;'><select name='server_db' id='sql_serveur_db' >" . ($mysql ? "\n<option value='mysql'>"._T('install_select_type_mysql')."</option>" diff --git a/ecrire/inc/lang.php b/ecrire/inc/lang.php index 4b70ecc650d187043374b68c2c8b53653ce52ca9..0e1eb8b6796685408dd642827c753f48f9d930ad 100644 --- a/ecrire/inc/lang.php +++ b/ecrire/inc/lang.php @@ -131,7 +131,10 @@ function menu_langues($nom_select) { function select_langues($nom_select, $change, $options) { static $cpt = 0; - return "<select name='$nom_select' id='menu_langues" . $cpt++ . "' " + $id = "menu_langues" . $cpt++; + return + "<label for='$id'>"._T('info_langues')."</label> " + . "<select name='$nom_select' id='$id' " . ((!test_espace_prive()) ? ("class='forml menu_langues'") : (($nom_select == 'var_lang_ecrire') ? diff --git a/ecrire/install/etape_1.php b/ecrire/install/etape_1.php index 7e34d34ea4d6cbf10a5b75f3b726d3811efed0bb..c6ddb319b1b18fa5c7b5172a580b390147ffbf74 100644 --- a/ecrire/install/etape_1.php +++ b/ecrire/install/etape_1.php @@ -55,11 +55,6 @@ function install_etape_1_dist() '<p>' . _T('texte_connexion_mysql') .'</p>' - .'<p>' - . _T('install_types_db_connus') - // Passer l'avertissement SQLIte en commentaire, on pourra facilement le supprimer par la suite sans changer les traductions. - . "<br /><small>(". _T('install_types_db_connus_avertissement') .')</small>' - .'</p>' ); echo install_connexion_form($db, $login, $pass, $predef, "\n<input type='hidden' name='chmod' value='$chmod' />", 2); echo install_fin_html(); diff --git a/ecrire/install/etape_4.php b/ecrire/install/etape_4.php index ec1bd3dc3d2cf3824befee70025b3c812ac66aab..a4c94be078861476d247a0adc47aa06d80009670 100644 --- a/ecrire/install/etape_4.php +++ b/ecrire/install/etape_4.php @@ -30,7 +30,7 @@ function install_etape_4_dist() if($login) { $echec = ($pass!=$pass_verif) ? _T('info_passes_identiques') - : ((strlen($pass)<5) ? + : ((strlen($pass)<6) ? _T('info_passe_trop_court') : ((strlen($login)<3) ? _T('info_login_trop_court')