Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

english language standardization

Browse Source
This commit is contained in:
Grand Philippe
2013-02-23 15:26:39 +01:00
parent 37cce5d860
commit a237be0d24
26 changed files with 87 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 $prenom; // TODO deprecated
var $lastname;
var $firstname;
var $note;
@@ -190,7 +189,6 @@ class User extends CommonObject
$this->ldap_sid = $obj->ldap_sid;
$this->lastname = $obj->name;
$this->prenom = $obj->firstname; // TODO deprecated
$this->firstname = $obj->firstname;
$this->login = $obj->login;
@@ -908,7 +906,6 @@ class User extends CommonObject
// Positionne parametres
$this->admin = 0;
$this->prenom = $contact->prenom; // TODO deprecated
$this->lastname = $contact->lastname;
$this->firstname = $contact->firstname;
$this->email = $contact->email;
@@ -1087,7 +1084,6 @@ class User extends CommonObject
dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
// Clean parameters
$this->prenom = trim($this->prenom); // deprecated
$this->lastname = trim($this->lastname);
$this->firstname = trim($this->firstname);
$this->login = trim($this->login);
@@ -1184,7 +1180,6 @@ class User extends CommonObject
if ($result >= 0)
{
$adh->prenom=$this->firstname; // deprecated
$adh->firstname=$this->firstname;
$adh->lastname=$this->lastname;
$adh->login=$this->login;
@@ -1723,7 +1718,7 @@ class User extends CommonObject
/**
* Return a link to the user card (with optionnaly the picto)
* Use this->id,this->lastname, this->prenom
* Use this->id,this->lastname, this->firstname
*
* @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
@@ -1941,7 +1936,6 @@ class User extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
$this->prenom='SPECIMEN'; // deprecated
$this->lastname='DOLIBARR';
$this->firstname='SPECIMEN';
$this->note='This is a note';

4
htdocs/user/clicktodial.php
View File

@@ -102,9 +102,9 @@ if ($id > 0)
print '<td colspan="2">'.$fuser->lastname.'</td>';
print "</tr>\n";
// Prenom
// Firstname
print '<tr><td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
print '<td colspan="2">'.$fuser->name.'</td>';
print '<td colspan="2">'.$fuser->firstname.'</td>';
print "</tr>\n";
print "</table>\n";

26
htdocs/user/fiche.php
View File

@@ -175,7 +175,7 @@ if ($action == 'add' && $canadduser)
if (! $message)
{
$object->lastname = $_POST["lastname"];
$object->firstname = $_POST["prenom"];
$object->firstname = $_POST["firstname"];
$object->login = $_POST["login"];
$object->admin = $_POST["admin"];
$object->office_phone = $_POST["office_phone"];
@@ -316,7 +316,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$object->oldcopy=dol_clone($object);
$object->lastname = GETPOST("lastname");
$object->firstname = GETPOST("prenom");
$object->firstname = GETPOST("firstname");
$object->login = GETPOST("login");
$object->pass = GETPOST("password");
$object->admin = empty($user->admin)?0:GETPOST("admin"); // A user can only be set admin by an admin
@@ -546,8 +546,8 @@ if ($action == 'adduserldap')
{
foreach ($ldapusers as $key => $attribute)
{
$ldap_lastname = $attribute[$conf->global->LDAP_FIELD_NAME];
$ldap_prenom = $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
$ldap_lastname = $attribute[$conf->global->LDAP_FIELD_NAME];
$ldap_firstname = $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
$ldap_login = $attribute[$conf->global->LDAP_FIELD_LOGIN];
$ldap_loginsmb = $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
$ldap_pass = $attribute[$conf->global->LDAP_FIELD_PASSWORD];
@@ -708,17 +708,17 @@ if (($action == 'create') || ($action == 'adduserldap'))
}
print '</td></tr>';
// Prenom
// Firstname
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>';
if (! empty($ldap_prenom))
if (! empty($ldap_firstname))
{
print '<input type="hidden" name="prenom" value="'.$ldap_prenom.'">';
print $ldap_prenom;
print '<input type="hidden" name="firstname" value="'.$ldap_firstname.'">';
print $ldap_firstname;
}
else
{
print '<input size="30" type="text" name="prenom" value="'.GETPOST('prenom').'">';
print '<input size="30" type="text" name="firstname" value="'.GETPOST('firstname').'">';
}
print '</td></tr>';
@@ -1087,7 +1087,7 @@ else
// Firstname
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>'.$object->prenom.'</td>';
print '<td>'.$object->Firstname.'</td>';
print '</tr>'."\n";
// Position/Job
@@ -1587,12 +1587,12 @@ else
print '<td>';
if ($caneditfield && !$object->ldap_sid)
{
print '<input size="30" type="text" class="flat" name="prenom" value="'.$object->prenom.'">';
print '<input size="30" type="text" class="flat" name="Firstname" value="'.$object->Firstname.'">';
}
else
{
print '<input type="hidden" name="prenom" value="'.$object->prenom.'">';
print $object->prenom;
print '<input type="hidden" name="Firstname" value="'.$object->Firstname.'">';
print $object->Firstname;
}
print '</td></tr>';

4
htdocs/user/ldap.php
View File

@@ -105,9 +105,9 @@ print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
print '<td>'.$fuser->lastname.'</td>';
print "</tr>\n";
// Prenom
// Firstname
print '<tr><td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>'.$fuser->prenom.'</td>';
print '<td>'.$fuser->firstname.'</td>';
print "</tr>\n";
// Login

4
htdocs/user/note.php
View File

@@ -105,8 +105,8 @@ if ($id)
print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$fuser->lastname.'&nbsp;</td>';
print '</tr>';
// Prenom
print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$fuser->prenom.'&nbsp;</td></tr>';
// Firstname
print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$fuser->firstname.'&nbsp;</td></tr>';
// Login
print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$fuser->login.'&nbsp;</td></tr>';

4
htdocs/user/param_ihm.php
View File

@@ -135,9 +135,9 @@ print '<tr><td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
print '<td colspan="2">'.$fuser->lastname.'</td>';
print "</tr>\n";
// Prenom
// FirstName
print '<tr><td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
print '<td colspan="2">'.$fuser->prenom.'</td>';
print '<td colspan="2">'.$fuser->firstname.'</td>';
print "</tr>\n";
print '</table><br>';

2
htdocs/user/perms.php
View File

@@ -261,7 +261,7 @@ print '</tr>'."\n";
// Firstname
print '<tr><td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>'.$fuser->prenom.'</td>';
print '<td>'.$fuser->firstname.'</td>';
print '</tr>'."\n";
print '</table><br>';