From 869a014d320ff738def8b02e91a126425aba93f7 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Sat, 23 Feb 2013 11:42:12 +0100 Subject: [PATCH] english standardization --- htdocs/user/class/user.class.php | 10 ++-------- htdocs/user/fiche.php | 28 ++++++++++++++-------------- htdocs/user/ldap.php | 4 ++-- htdocs/user/note.php | 4 ++-- htdocs/user/param_ihm.php | 4 ++-- htdocs/user/perms.php | 2 +- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 5569f1b6784..bf3437dd4b0 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -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'; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 4c1f40049a0..38751435534 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -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='
'.$langs->trans("NameNotDefined").'
'; $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='
'.$langs->trans("NameNotDefined").'
'; $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 '
'; } - print dol_set_focus('#nom'); + print dol_set_focus('#lastname'); print '
'; print ''; @@ -694,17 +694,17 @@ if (($action == 'create') || ($action == 'adduserldap')) print ''; - // Nom + // Lastname print ''.$langs->trans("Lastname").''; print ''; - if (! empty($ldap_nom)) + if (! empty($ldap_lastname)) { - print ''; - print $ldap_nom; + print ''; + print $ldap_lastname; } else { - print ''; + print ''; } print ''; @@ -1558,12 +1558,12 @@ else print ''; if ($caneditfield && !$object->ldap_sid) { - print ''; + print ''; } else { - print ''; - print $object->nom; + print ''; + print $object->lastname; } print ''; // Photo diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index a04674720f6..837684334b2 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -100,9 +100,9 @@ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user- print ''; print ''; -// Nom +// Lastname print ''.$langs->trans("Lastname").''; -print ''.$fuser->nom.''; +print ''.$fuser->lastname.''; print "\n"; // Prenom diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 72c6237ef44..13a45f61cb2 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -101,8 +101,8 @@ if ($id) print ''; print ''; - // Nom - print ''.$langs->trans("Lastname").''.$fuser->nom.' '; + // Lastname + print ''.$langs->trans("Lastname").''.$fuser->lastname.' '; print ''; // Prenom diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 534ae00ddc4..f389fdaf713 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -130,9 +130,9 @@ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user- print ''; print ''; -// Nom +// LastName print ''.$langs->trans("LastName").''; -print ''.$fuser->nom.''; +print ''.$fuser->lastname.''; print "\n"; // Prenom diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 7443d3d69b5..dc6421d886b 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -256,7 +256,7 @@ print ''."\n"; // Lastname print ''.$langs->trans("Lastname").''; -print ''.$fuser->nom.''; +print ''.$fuser->lastName.''; print ''."\n"; // Firstname