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

Ajout: l'utilisateur a la possibilit de changer de traduction

Browse Source
This commit is contained in:
Regis Houssin 2005-07-25 15:41:50 +00:00
parent 4d7981da1d
commit 1908bc1e01
8 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
COPYRIGHT
View File

@ -25,3 +25,4 @@ Copyright (C) 2005
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Eric Seigne <erics@rycks.com>
- Matthieu Valleton <mv@seeschloss.org>
- Regis Houssin <regis.houssin@cap-networks.com>

3
htdocs/langs/en_US/users.lang
View File

@ -65,4 +65,5 @@ NoLogin=No login
CreateDolibarrLogin=Create Dolibarr account
TasksHistoryForThisContact=Tasks history for this contact
LoginAccountDisable=Account disabled, put a new login to activate it.
ErrorFailedToSaveFile=Error - Failed to save file
ErrorFailedToSaveFile=Error - Failed to save file
GuiLanguage=Interface language

1
htdocs/langs/fr_FR/users.lang
View File

@ -66,3 +66,4 @@ CreateDolibarrLogin=Cr
TasksHistoryForThisContact=Historique des actions pour ce contact
LoginAccountDisable=Le compte est désactivé, mettre un nouveau login pour l'activer.
ErrorFailedToSaveFile=Erreur - l'enregistrement du fichier a échoué
GuiLanguage=Langage de l'interface

1
htdocs/master.inc.php
View File

@ -166,6 +166,7 @@ if (! defined('MAIN_LANG_DEFAULT'))
{
define('MAIN_LANG_DEFAULT',"fr_FR");
}
$conf->langage=MAIN_LANG_DEFAULT;
// On corrige $conf->langage si il ne vaut pas le code long: fr -> fr_FR par exemple

10
htdocs/user.class.php
View File

@ -4,6 +4,7 @@
* Copyright (c) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005 Regis Houssin <regis.houssin@cap-networks.com>
*
* 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
@ -31,6 +32,7 @@
\author Laurent Destailleur
\author Sebastien Di Cintio
\author Benoit Mortier
\author Regis Houssin
\version $Revision$
*/
@ -60,6 +62,7 @@ class User
var $datem;
var $societe_id;
var $webcal_login;
var $gui_lang;
var $datelastaccess;
var $error;
@ -97,7 +100,7 @@ class User
function fetch($login='')
{
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note,";
$sql.= " u.fk_societe, u.fk_socpeople,";
$sql.= " u.fk_societe, u.fk_socpeople, u.gui_lang,";
$sql.= " ".$this->db->pdate("u.datec")." as datec, ".$this->db->pdate("u.tms")." as datem,";
$sql.= " ".$this->db->pdate("u.datelastaccess")." as datel";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
@ -130,13 +133,13 @@ class User
$this->contact_id = $obj->fk_socpeople;
$this->note = stripslashes($obj->note);
$this->lang = 'fr_FR'; // \todo Gérer la langue par défaut d'un utilisateur Dolibarr
$this->datec = $obj->datec;
$this->datem = $obj->datem;
$this->datelastaccess = $obj->datel;
$this->webcal_login = $obj->webcal_login;
$this->gui_lang = $obj->gui_lang;
$this->societe_id = $obj->fk_societe;
}
$this->db->free($result);
@ -658,6 +661,7 @@ class User
$sql .= ", webcal_login = '$this->webcal_login'";
$sql .= ", code = '$this->code'";
$sql .= ", note = '$this->note'";
$sql .= ", gui_lang = '$this->gui_lang'";
$sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);

17
htdocs/user/fiche.php
View File

@ -101,6 +101,7 @@ if ($_POST["action"] == 'add' && $user->admin)
$edituser->email = trim($_POST["email"]);
$edituser->admin = trim($_POST["admin"]);
$edituser->webcal_login = trim($_POST["webcal_login"]);
$edituser->gui_lang = trim($_POST["gui_lang"]);
$db->begin();
@ -167,6 +168,7 @@ if ($_POST["action"] == 'update' && $user->admin)
$edituser->email = $_POST["email"];
$edituser->admin = $_POST["admin"];
$edituser->webcal_login = $_POST["webcal_login"];
$edituser->gui_lang = $_POST["gui_lang"];
$ret=$edituser->update();
if ($ret < 0)
@ -300,6 +302,11 @@ if ($action == 'create')
print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
print '<td class="valeur"><input size="30" type="text" name="webcal_login" value=""></td></tr>';
}
// Langue par defaut
print '<tr><td width="30%">'.$langs->trans("GuiLanguage").'</td><td>';
$html=new Form($db);
$html->select_lang(MAIN_LANG_DEFAULT,'gui_lang');
print '</td></tr>';
print "<tr>".'<td align="center" colspan="2"><input value="'.$langs->trans("CreateUser").'" type="submit"></td></tr>';
print "</form>";
@ -467,6 +474,10 @@ else
print '<td colspan="2">'.$fuser->webcal_login.'&nbsp;</td>';
print "</tr>\n";
}
// Langue par defaut
print '<tr><td width="25%" valign="top">'.$langs->trans("GuiLanguage").'</td>';
print '<td colspan="2">'.$fuser->gui_lang.'&nbsp;</td>';
print "</tr>\n";
print "</table>\n";
// print "<br>\n";
@ -680,6 +691,12 @@ else
$langs->load("other");
print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
print '<td class="valeur" colspan="2"><input size="30" type="text" name="webcal_login" value="'.$fuser->webcal_login.'"></td></tr>';
// Langue par defaut
print '<tr><td width="30%">'.$langs->trans("GuiLanguage").'</td><td>';
$html=new Form($db);
$html->select_lang(MAIN_LANG_DEFAULT,'gui_lang');
print '</td></tr>';
print '<tr><td align="center" colspan="3"><input value="'.$langs->trans("Save").'" type="submit"></td></tr>';

1
mysql/migration/1.1.0-2.0.0.sql
View File

@ -340,6 +340,7 @@ alter table llx_facturedet add date_start date;
alter table llx_facturedet add date_end date;
alter table llx_user add egroupware_id integer;
alter table llx_user add gui_lang varchar(5);
alter table llx_societe add code_client varchar(15) after nom;
alter table llx_societe add code_fournisseur varchar(15) after code_client;
alter table llx_societe add code_compta varchar(15) after code_fournisseur;

2
mysql/tables/llx_user.sql
View File

@ -39,6 +39,8 @@ create table llx_user
fk_socpeople integer DEFAULT 0,
note text,
datelastaccess datetime,
egroupware_id integer,
gui_lang varchar(5),
UNIQUE INDEX(login)
)type=innodb;