From 8d7654916fc16f0aa4eefe2ee308ddc6b961409c Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Sat, 23 Feb 2013 15:46:12 +0100 Subject: [PATCH] english language standardization --- htdocs/compta/dons/fiche.php | 20 +++++++++---------- htdocs/compta/dons/liste.php | 10 +++++----- htdocs/compta/index.php | 6 +++--- .../class/bonprelevement.class.php | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 9f5d08cdf60..3ffa3847ba3 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -85,8 +85,8 @@ if ($action == 'update') { $don->fetch($id); - $don->prenom = $_POST["prenom"]; - $don->nom = $_POST["nom"]; + $don->firstname = $_POST["firstname"]; + $don->lastname = $_POST["lastname"]; $don->societe = $_POST["societe"]; $don->address = $_POST["address"]; $don->amount = price2num($_POST["amount"]); @@ -137,8 +137,8 @@ if ($action == 'add') if (! $error) { - $don->prenom = $_POST["prenom"]; - $don->nom = $_POST["nom"]; + $don->firstname = $_POST["firstname"]; + $don->lastname = $_POST["lastname"]; $don->societe = $_POST["societe"]; $don->address = $_POST["address"]; $don->amount = price2num($_POST["amount"]); @@ -297,8 +297,8 @@ if ($action == 'create') print "\n"; print "".''.$langs->trans("Company").''; - print "".''.$langs->trans("Firstname").''; - print "".''.$langs->trans("Lastname").''; + print "".''.$langs->trans("Firstname").''; + print "".''.$langs->trans("Lastname").''; print "".''.$langs->trans("Address").''; print ''; @@ -387,8 +387,8 @@ if (! empty($id) && $action == 'edit') $langs->load("companies"); print "".''.$langs->trans("Company").''; - print "".''.$langs->trans("Firstname").''; - print "".''.$langs->trans("Lastname").''; + print "".''.$langs->trans("Firstname").''; + print "".''.$langs->trans("Lastname").''; print "".''.$langs->trans("Address").''; print ''; @@ -483,8 +483,8 @@ if (! empty($id) && $action != 'edit') print "\n"; print "".''.$langs->trans("Company").''.$don->societe.''; - print "".''.$langs->trans("Firstname").''.$don->prenom.''; - print "".''.$langs->trans("Lastname").''.$don->nom.''; + print "".''.$langs->trans("Firstname").''.$don->firstname.''; + print "".''.$langs->trans("Lastname").''.$don->lastname.''; print "".''.$langs->trans("Address").''.dol_nl2br($don->address).''; // Zip / Town diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index bf96d5243f8..38ad764182d 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -60,7 +60,7 @@ llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M $donationstatic=new Don($db); // Genere requete de liste des dons -$sql = "SELECT d.rowid, d.datedon, d.prenom, d.nom, d.societe,"; +$sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,"; $sql.= " d.amount, d.fk_statut as statut, "; $sql.= " p.rowid as pid, p.ref, p.title, p.public"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p"; @@ -79,7 +79,7 @@ if (trim($search_company) != '') } if (trim($search_name) != '') { - $sql.= ' AND d.nom LIKE \'%'.$db->escape(trim($search_name)) . '%\' OR d.prenom LIKE \'%'.$db->escape(trim($search_name)) . '%\''; + $sql.= ' AND d.lastname LIKE \'%'.$db->escape(trim($search_name)) . '%\' OR d.firstname LIKE \'%'.$db->escape(trim($search_name)) . '%\''; } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); @@ -109,7 +109,7 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","&page=$page&statut=$statut","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.nom","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","&page=$page&statut=$statut","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder); if (! empty($conf->projet->enabled)) { @@ -154,8 +154,8 @@ if ($resql) print ""; $donationstatic->id=$objp->rowid; $donationstatic->ref=$objp->rowid; - $donationstatic->nom=$objp->nom; - $donationstatic->prenom=$objp->prenom; + $donationstatic->lastname=$objp->lastname; + $donationstatic->firstname=$objp->firstname; print "".$donationstatic->getNomUrl(1)."\n"; print "".$objp->societe."\n"; print "".$donationstatic->getFullName($langs)."\n"; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 281c315eec4..e6a5162b61d 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -512,7 +512,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) $langs->load("boxes"); $donationstatic=new Don($db); - $sql = "SELECT d.rowid, d.nom, d.prenom, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut"; + $sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " WHERE d.entity = ".$conf->entity; $sql.= $db->order("d.tms","DESC"); @@ -544,8 +544,8 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) $var=!$var; print ''; $donationstatic->id=$objp->rowid; - $donationstatic->nom=$objp->nom; - $donationstatic->prenom=$objp->prenom; + $donationstatic->lastname=$objp->lastname; + $donationstatic->firstname=$objp->firstname; $label=$donationstatic->getFullName($langs); if ($objp->societe) $label.=($label?' - ':'').$objp->societe; $donationstatic->ref=$label; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 4182e66c919..0c0c55ebf57 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -540,7 +540,7 @@ class BonPrelevement extends CommonObject $this->method_trans = $method; $langs->load('withdrawals'); $subject = $langs->trans("InfoTransSubject", $this->ref); - $message = $langs->trans("InfoTransMessage", $this->ref, $user->prenom, $user->nom); + $message = $langs->trans("InfoTransMessage", $this->ref, $user->firstname, $user->lastname); $message .=$langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date,'day')); // TODO Call trigger to create a notification using notification module