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

english standardization

Browse Source
This commit is contained in:
Grand Philippe 2013-02-23 11:42:12 +01:00
parent 250a941096
commit 869a014d32
6 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/user/class/user.class.php
View File

@ -46,7 +46,6 @@ class User extends CommonObject
var $ref_ext;
var $ldap_sid;
var $search_sid;
var $nom; // TODO deprecated
var $prenom; // TODO deprecated
var $lastname;
var $firstname;
@ -190,7 +189,6 @@ class User extends CommonObject
$this->ref_ext = $obj->ref_ext;
$this->ldap_sid = $obj->ldap_sid;
$this->nom = $obj->name; // TODO deprecated
$this->lastname = $obj->name;
$this->prenom = $obj->firstname; // TODO deprecated
$this->firstname = $obj->firstname;
@ -910,7 +908,6 @@ class User extends CommonObject
// Positionne parametres
$this->admin = 0;
$this->nom = $contact->nom; // TODO deprecated
$this->prenom = $contact->prenom; // TODO deprecated
$this->lastname = $contact->lastname;
$this->firstname = $contact->firstname;
@ -1090,7 +1087,6 @@ class User extends CommonObject
dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
// Clean parameters
$this->nom = trim($this->nom); // deprecated
$this->prenom = trim($this->prenom); // deprecated
$this->lastname = trim($this->lastname);
$this->firstname = trim($this->firstname);
@ -1189,7 +1185,6 @@ class User extends CommonObject
if ($result >= 0)
{
$adh->prenom=$this->firstname; // deprecated
$adh->nom=$this->lastname; // deprecated
$adh->firstname=$this->firstname;
$adh->lastname=$this->lastname;
$adh->login=$this->login;
@ -1728,7 +1723,7 @@ class User extends CommonObject
/**
* Return a link to the user card (with optionnaly the picto)
* Use this->id,this->nom, this->prenom
* Use this->id,this->lastname, this->prenom
*
* @param int $withpicto Include picto in link (0=No picto, 1=Inclut le picto dans le lien, 2=Picto seul)
* @param string $option On what the link point to
@ -1887,7 +1882,7 @@ class User extends CommonObject
$soc = new Societe($this->db);
$soc->fetch($this->societe_id);
$info["o"] = $soc->nom;
$info["o"] = $soc->lastname;
if ($soc->client == 1) $info["businessCategory"] = "Customers";
if ($soc->client == 2) $info["businessCategory"] = "Prospects";
if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
@ -1946,7 +1941,6 @@ class User extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
$this->nom='DOLIBARR'; // deprecated
$this->prenom='SPECIMEN'; // deprecated
$this->lastname='DOLIBARR';
$this->firstname='SPECIMEN';

28
htdocs/user/fiche.php
View File

@ -151,7 +151,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser)
// Action ajout user
if ($action == 'add' && $canadduser)
{
if (! $_POST["nom"])
if (! $_POST["lastname"])
{
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
$action="create"; // Go back to create page
@ -174,7 +174,7 @@ if ($action == 'add' && $canadduser)
if (! $message)
{
$object->lastname = $_POST["nom"];
$object->lastname = $_POST["lastname"];
$object->firstname = $_POST["prenom"];
$object->login = $_POST["login"];
$object->admin = $_POST["admin"];
@ -277,7 +277,7 @@ if ($action == 'update' && ! $_POST["cancel"])
{
$error=0;
if (! $_POST["nom"])
if (! $_POST["lastname"])
{
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
$action="edit"; // Go back to create page
@ -315,7 +315,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$object->oldcopy=dol_clone($object);
$object->lastname = GETPOST("nom");
$object->lastname = GETPOST("lastname");
$object->firstname = GETPOST("prenom");
$object->login = GETPOST("login");
$object->pass = GETPOST("password");
@ -546,7 +546,7 @@ if ($action == 'adduserldap')
{
foreach ($ldapusers as $key => $attribute)
{
$ldap_nom = $attribute[$conf->global->LDAP_FIELD_NAME];
$ldap_lastname = $attribute[$conf->global->LDAP_FIELD_NAME];
$ldap_prenom = $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
$ldap_login = $attribute[$conf->global->LDAP_FIELD_LOGIN];
$ldap_loginsmb = $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
@ -682,7 +682,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<br>';
}
print dol_set_focus('#nom');
print dol_set_focus('#lastname');
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -694,17 +694,17 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<tr>';
// Nom
// Lastname
print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
print '<td>';
if (! empty($ldap_nom))
if (! empty($ldap_lastname))
{
print '<input type="hidden" id="nom" name="nom" value="'.$ldap_nom.'">';
print $ldap_nom;
print '<input type="hidden" id="lastname" name="lastname" value="'.$ldap_lastname.'">';
print $ldap_lastname;
}
else
{
print '<input size="30" type="text" id="nom" name="nom" value="'.GETPOST('nom').'">';
print '<input size="30" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">';
}
print '</td></tr>';
@ -1558,12 +1558,12 @@ else
print '<td>';
if ($caneditfield && !$object->ldap_sid)
{
print '<input size="30" type="text" class="flat" name="nom" value="'.$object->nom.'">';
print '<input size="30" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
}
else
{
print '<input type="hidden" name="nom" value="'.$object->nom.'">';
print $object->nom;
print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
print $object->lastname;
}
print '</td>';
// Photo

4
htdocs/user/ldap.php
View File

@ -100,9 +100,9 @@ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user-
print '</td>';
print '</tr>';
// Nom
// Lastname
print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
print '<td>'.$fuser->nom.'</td>';
print '<td>'.$fuser->lastname.'</td>';
print "</tr>\n";
// Prenom

4
htdocs/user/note.php
View File

@ -101,8 +101,8 @@ if ($id)
print '</td>';
print '</tr>';
// Nom
print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$fuser->nom.'&nbsp;</td>';
// Lastname
print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$fuser->lastname.'&nbsp;</td>';
print '</tr>';
// Prenom

4
htdocs/user/param_ihm.php
View File

@ -130,9 +130,9 @@ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user-
print '</td>';
print '</tr>';
// Nom
// LastName
print '<tr><td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
print '<td colspan="2">'.$fuser->nom.'</td>';
print '<td colspan="2">'.$fuser->lastname.'</td>';
print "</tr>\n";
// Prenom

2
htdocs/user/perms.php
View File

@ -256,7 +256,7 @@ print '</tr>'."\n";
// Lastname
print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
print '<td>'.$fuser->nom.'</td>';
print '<td>'.$fuser->lastName.'</td>';
print '</tr>'."\n";
// Firstname