Trad: Traductions manquantes dans étape install

This commit is contained in:
Laurent Destailleur 2005-06-11 11:35:58 +00:00
parent 1274840619
commit d3d047990c
3 changed files with 72 additions and 58 deletions

View File

@ -70,16 +70,13 @@ div.main-inside {
margin-top: 10px; margin-top: 10px;
} }
div.error { div.error {
font-size: 1.3em; color: #550000; font-weight: bold;
padding: 10px; padding: 0.2em 0.2em 0.2em 0.2em;
margin-top: 10px; margin: 0.5em 0em 0.5em 0em;
border: 1px solid red; border: 1px solid #6C7C8B;
} }
div.barrebottom { div.barrebottom {
text-align: right; text-align: right;
margin-top: 10px; margin-top: 10px;

View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,7 +25,7 @@
/** /**
\file htdocs/install/etape4.php \file htdocs/install/etape4.php
\brief Demande le login et mode de passe de l'administrateur Dolibarr \brief Demande le login et mot de passe de l'administrateur Dolibarr
\version $Revision$ \version $Revision$
*/ */
@ -52,7 +53,7 @@ else
require ($dolibarr_main_document_root . "/conf/conf.class.php"); require ($dolibarr_main_document_root . "/conf/conf.class.php");
print '<table cellspacing="0" cellpadding="4" border="1" width="100%">'; print '<table cellspacing="0" cellpadding="2" width="100%">';
$err=0; $err=0;
@ -78,11 +79,13 @@ if ($db->ok == 1)
if (isset($_GET["error"]) && $_GET["error"] == 1) if (isset($_GET["error"]) && $_GET["error"] == 1)
{ {
print '<br>';
print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>'; print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
} }
if (isset($_GET["error"]) && $_GET["error"] == 2) if (isset($_GET["error"]) && $_GET["error"] == 2)
{ {
print '<br>';
print '<div class="error">'; print '<div class="error">';
print $langs->trans("PleaseTypePassword"); print $langs->trans("PleaseTypePassword");
print '</div>'; print '</div>';
@ -90,6 +93,7 @@ if ($db->ok == 1)
if (isset($_GET["error"]) && $_GET["error"] == 3) if (isset($_GET["error"]) && $_GET["error"] == 3)
{ {
print '<br>';
print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>'; print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
} }

View File

@ -20,10 +20,10 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** \file htdocs/install/etape5.php /**
\file htdocs/install/etape5.php
\brief Page de fin d'installation \brief Page de fin d'installation
\version $Revision$ \version $Revision$
*/ */
@ -50,6 +50,7 @@ else
require ($dolibarr_main_document_root . "/conf/conf.class.php"); require ($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set") if ($_POST["action"] == "set")
{ {
if ($_POST["pass"] <> $_POST["pass_verif"]) if ($_POST["pass"] <> $_POST["pass_verif"])
@ -70,7 +71,7 @@ if ($_POST["action"] == "set")
pHeader($langs->trans("SetupEnd"),"etape5"); pHeader($langs->trans("SetupEnd"),"etape5");
print '<table cellspacing="0" cellpadding="4" border="1" width="100%">'; print '<table cellspacing="0" cellpadding="2" width="100%">';
$error=0; $error=0;
$conf = new Conf(); $conf = new Conf();
@ -90,7 +91,9 @@ if ($_POST["action"] == "set")
$sql .= ",1,'Administrateur','ADM')"; $sql .= ",1,'Administrateur','ADM')";
} }
if ($db->query($sql) || $db->errno() == 1062) $resql=$db->query($sql);
if ($resql)
{ {
$db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'"); $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
print $langs->trans("AdminLoginCreatedSuccessfuly")."<br>"; print $langs->trans("AdminLoginCreatedSuccessfuly")."<br>";
@ -98,17 +101,27 @@ if ($_POST["action"] == "set")
} }
else else
{ {
print "Echec de la création du compte administrateur<br>"; if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
print $langs->trans("AdminLoginAlreadyExists",$_POST["login"])."<br>";
} }
else {
print $langs->trans("FailedToCreateAdminLogin")."<br>";
}
}
// Si install non Français, on configure pour fonctionner en mode internationnal
if ($langs->defaultlang != "fr_FR") {
$db->query("INSERT INTO llx_const(name,value,type,visible) values ('COMPANY_CREATE_TWO_STEPS','1','yesno',0)");
}
print '</table>'; print '</table>';
$db->close(); $db->close();
} }
?> print "<br>";
<br>
<?php
print $langs->trans("SystemIsInstalled")."<br>"; print $langs->trans("SystemIsInstalled")."<br>";
print $langs->trans("YouNeedToPersonalizeSetup")."<br>"; print $langs->trans("YouNeedToPersonalizeSetup")."<br>";