From 20564e34d484c8c34c6db3d6890c45574397f305 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 10 Dec 2004 19:57:46 +0000 Subject: [PATCH] Fix: Lastname sans le N majuscule partout et Firstname sans le N majuscule partout. --- htdocs/adherents/fiche.php | 4 ++-- htdocs/adherents/index.php | 2 +- htdocs/boutique/commande/ca.php | 2 +- htdocs/boutique/commande/fiche.php | 2 +- htdocs/comm/fiche.php | 2 +- htdocs/compta/dons/fiche.php | 6 +++--- htdocs/contact/fiche.php | 2 +- htdocs/fourn/fiche.php | 4 ++-- htdocs/langs/en_US/companies.lang | 4 ++-- htdocs/langs/fr_BE/companies.lang | 4 ++-- htdocs/langs/fr_FR/companies.lang | 2 +- htdocs/langs/nl_BE/companies.lang | 4 ++-- htdocs/user/addon.php | 4 ++-- htdocs/user/fiche.php | 12 ++++++------ htdocs/user/index.php | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 77fd22715ad..79bda6f3109 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -380,7 +380,7 @@ if ($action == 'create') { print ''; print ''.$langs->trans("Firstname").'*'; - print ''.$langs->trans("LastName").'*'; + print ''.$langs->trans("Lastname").'*'; print ''.$langs->trans("Company").''; print ''.$langs->trans("Address").''; print ''; @@ -531,7 +531,7 @@ if ($rowid > 0) print ''.$langs->trans("Firstname").'*'.$adh->prenom.' '; - print ''.$langs->trans("LastName").'*'.$adh->nom.' '; + print ''.$langs->trans("Lastname").'*'.$adh->nom.' '; print ''.$langs->trans("Company").''.$adh->societe.' '; print ''.$langs->trans("Address").''.nl2br($adh->adresse).' '; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index c61f6d0c5af..35fa58a5f06 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -143,7 +143,7 @@ print "\n"; print ""; print ''; -print $langs->trans("LastName").'/'.$langs->trans("Firstname").' '; +print $langs->trans("Lastname").'/'.$langs->trans("Firstname").' '; print '  '; print ''; diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index d89ff792ac7..02e8678943c 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -42,7 +42,7 @@ print_barre_liste("Liste des commandes", $page, "ca.php"); print ''; print ''; -print ''; +print ''; $sql = "SELECT sum(t.value) as value"; $sql .= " FROM ".DB_NAME_OSC.".orders_total as t"; diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index d3eb16ec420..34f7762c467 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -112,7 +112,7 @@ if ($id) print '
'.$langs->trans("Description").''.$langs->trans("LastName").'
'.$langs->trans("Lastname").'
'; print ""; print ''; - print ''; + print ''; print "
Frais d\'expéditions'.price($commande->total_ot_shipping).' EUR
'.$langs->trans("LastName").''.price($commande->total_ot_total).' EUR
'.$langs->trans("Lastname").''.price($commande->total_ot_total).' EUR
"; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index f7234c67951..bb1ba7be191 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -434,7 +434,7 @@ if ($_socid > 0) */ print ''; - print ''; + print ''; print ''; print ''; print ""; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index d840c89a753..210be49adcc 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -213,7 +213,7 @@ if ($_GET["action"] == 'create') { $langs->load("companies"); print "".''; print "".''; - print "".''; + print "".''; print "".''; print "".''; @@ -290,7 +290,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') $langs->load("companies"); print "".''; print "".''; - print "".''; + print "".''; print "".''; print "".''; @@ -356,7 +356,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print "".''; print "".''; - print "".''; + print "".''; print "".''; print "".''; print "".''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index d2f5480a612..aa3901ce182 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -221,7 +221,7 @@ if ($_GET["action"] == 'create') print $form->select_civilite($obj->civilite); print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 915afdfb6ee..5a894317f22 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -226,9 +226,9 @@ if ( $societe->fetch($socid) ) */ $langs->load("companies"); - print '
'.$langs->trans("Firstname").' '.$langs->trans("LastName").'
'.$langs->trans("Firstname").' '.$langs->trans("Lastname").''.$langs->trans("Poste").''.$langs->trans("Tel").''.$langs->trans("Fax").''.$langs->trans("EMail").'id."&action=create\">".$langs->trans("AddContact")."
'.$langs->trans("Company").'
'.$langs->trans("Firstname").'
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").'
'.$langs->trans("Address").''; print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").'
'.$langs->trans("Company").'
'.$langs->trans("Firstname").'
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").'
'.$langs->trans("Address").''; print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").'
'.$langs->trans("Company").''.$don->societe.'
'.$langs->trans("Firstname").''.$don->prenom.'
'.$langs->trans("LastName").''.$don->nom.'
'.$langs->trans("Lastname").''.$don->nom.'
'.$langs->trans("Address").''.nl2br($don->adresse).'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$don->cp.' '.$don->ville.'
'.$langs->trans("Country").''.$don->pays.'
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").''.$langs->trans("Firstname").'Tel Pro
'; + print '
'; - print ''; + print ''; print ''; print ""; print ""; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 0b41f078bda..1de2d55f57a 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -6,8 +6,8 @@ NewCompany=New company (prospect, customer, supplier) Company=Company Companies=Companies Name=Name -LastName=Lastname -FirstName=Firstname +Lastname=Lastname +Firstname=Firstname UserTitle=Title Surname=Surname/Pseudo Address=Address diff --git a/htdocs/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang index 5b9ad4bf09f..fb10281e7c4 100644 --- a/htdocs/langs/fr_BE/companies.lang +++ b/htdocs/langs/fr_BE/companies.lang @@ -4,8 +4,8 @@ NewCompany=Nouvelle soci Company=Société Companies=Sociétés Name=Nom -LastName=Nom -FirstName=Prénom +Lastname=Nom +Firstname=Prénom Surname=Prénom Address=Adresse State=Province diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index a6ad535f6c5..17ce18fb59f 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -7,7 +7,7 @@ NewCompany=Nouvelle soci Company=Société Companies=Sociétés Name=Nom -LastName=Nom +Lastname=Nom Firstname=Prénom UserTitle=Titre civilité Surname=Surnom/Pseudo diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang index 0107a494bb5..401e0363711 100644 --- a/htdocs/langs/nl_BE/companies.lang +++ b/htdocs/langs/nl_BE/companies.lang @@ -3,8 +3,8 @@ NewCompany=Nieuwe bedrijf (vooruitzicht, klant, leverancier) Company=Bedrijf Companies=Bedrijven Name=Naam -LastName=Naam -FirstName=Voornaam +Lastname=Naam +Firstname=Voornaam Surname=De familienaam Address=Het adres State=Provincie diff --git a/htdocs/user/addon.php b/htdocs/user/addon.php index b497afeb44e..3d62973236b 100644 --- a/htdocs/user/addon.php +++ b/htdocs/user/addon.php @@ -95,9 +95,9 @@ if ($_GET["id"]) print '
'.$langs->trans("FirstName").' '.$langs->trans("LastName").'
'.$langs->trans("Firstname").' '.$langs->trans("Lastname").'Poste'.$langs->trans("Tel").'".$langs->trans("Fax")."".$langs->trans("EMail")."".$langs->trans("AddContact")."
'; - print "".''; + print "".''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 11d7e3becb3..3646700b75a 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -146,10 +146,10 @@ if ($action == 'create') print '
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").''.$fuser->nom.''.$langs->trans("FirstName").''.$langs->trans("Firstname").''.$fuser->prenom.'
'; - print ''; + print ''; print ''; - print "".''; + print "".''; print ''; print "".''; @@ -314,9 +314,9 @@ else print '
'.$langs->trans("FirstName").'
'.$langs->trans("Firstname").'
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").'
'.$langs->trans("Login").'
'; - print "".''; + print "".''; print ''; - print ''; + print ''; print ''; print "\n"; @@ -437,10 +437,10 @@ else print ''; print '
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").''.$fuser->nom.''.$langs->trans("FirstName").''.$langs->trans("Firstname").''.$fuser->prenom.'
'; - print "".''; + print "".''; print ''; - print "".''; + print "".''; print ''; print "".''; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 4d596f9d09c..bd34a9ad156 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -58,8 +58,8 @@ if ($result) print "
'.$langs->trans("LastName").'
'.$langs->trans("Lastname").'
'.$langs->trans("FirstName").'
'.$langs->trans("Firstname").'
'.$langs->trans("Login").'
"; print ''; - print_liste_field_titre($langs->trans("LastName"),"index.php","name","","","",$sortfield); - print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname","","","",$sortfield); + print_liste_field_titre($langs->trans("Lastname"),"index.php","name","","","",$sortfield); + print_liste_field_titre($langs->trans("Firstname"),"index.php","firstname","","","",$sortfield); print_liste_field_titre($langs->trans("Login"),"index.php","login","","","",$sortfield); print_liste_field_titre($langs->trans("Code"),"index.php","code","","","",$sortfield); print "\n";