From fcf48eba139ca088142b308d145476ff150f7bc3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 24 Jun 2006 18:51:18 +0000 Subject: [PATCH] Ajout traduction --- htdocs/admin/ldap.php | 124 ++++++++++++++++++++++++---------- htdocs/langs/en_US/admin.lang | 58 +++++++++++----- htdocs/langs/fr_FR/admin.lang | 58 +++++++++++----- htdocs/user/fiche.php | 4 +- 4 files changed, 174 insertions(+), 70 deletions(-) diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 9cbd9ed876e..38cb796b4fb 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -86,10 +86,6 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_ADMIN_DN',$_POST["admin"])) - { - print $db->error(); - } if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"])) { print $db->error(); @@ -102,6 +98,10 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } + if (! dolibarr_set_const($db, 'LDAP_SYNCHRO_ACTIVE',$_POST["activesynchro"])) + { + print $db->error(); + } if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contact"])) { print $db->error(); @@ -110,11 +110,15 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } + if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) + { + print $db->error(); + } if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_FIELD_REALNAME',$_POST["fieldrealname"])) + if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) { print $db->error(); } @@ -126,11 +130,19 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } + if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) + { + print $db->error(); + } + if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) + { + print $db->error(); + } if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"])) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) + if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) { print $db->error(); } @@ -190,19 +202,19 @@ $arraylist=array(); $arraylist['3']='Version 3'; $arraylist['2']='Version 2'; $html->select_array('version',$arraylist,$conf->global->LDAP_SERVER_PROTOCOLVERSION); -print ' '; +print ''.$langs->trans("LDAPServerProtocolVersion").''; -// Serveur +// Serveur primaire $var=!$var; print ''; -print $langs->trans("LDAPServer").''; +print $langs->trans("LDAPPrimaryServer").''; print ''; print ''.$langs->trans("LDAPServerExample").''; -// Serveur +// Serveur secondaire $var=!$var; print ''; -print $langs->trans("LDAPServerSlave").''; +print $langs->trans("LDAPSecondaryServer").''; print ''; print ''.$langs->trans("LDAPServerExample").''; @@ -221,15 +233,15 @@ print ''.$langs->trans("LDAPServerPortExample").''; // DNserver $var=!$var; -print ''.$langs->trans("DNServer").''; +print ''.$langs->trans("LDAPServerDn").''; print ''; print ''.$langs->trans("LDAPServerDnExample").''; // DNAdmin $var=!$var; -print ''.$langs->trans("DNAdmin").''; +print ''.$langs->trans("LDAPAdminDn").''; print ''; -print ' '; +print ''.$langs->trans("LDAPAdminDnExample").''; // Pass $var=!$var; @@ -246,7 +258,7 @@ print ' '; // Utiliser TLS $var=!$var; -print ''.$langs->trans("LDAPUseTLS").''; +print ''.$langs->trans("LDAPServerUseTLS").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['1']=$langs->trans("Yes"); @@ -260,18 +272,19 @@ print "\n"; // Synchro utilisateurs/groupes active $var=!$var; -print ''.$langs->trans("DNUserGroupActive").''; +print ''.$langs->trans("LDAPDnSynchroActive").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); -$arraylist['1']=$langs->trans("Yes"); -$html->select_array('activecontact',$arraylist,$conf->global->LDAP_USERGROUP_ACTIVE); -print ''.$langs->trans("NotYetAvailable").''; +$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr"); +$arraylist['dolibarr2ldap']=$langs->trans("DolibarrToLDAP"); +$html->select_array('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE); +print ''.$langs->trans("LDAPDnSynchroActiveExample").''; // DN Pour les utilisateurs $var=!$var; -print ''.$langs->trans("DNUser").''; +print ''.$langs->trans("LDAPUserDn").''; print ''; -print ''.$langs->trans("DNUserExample").''; +print ''.$langs->trans("LDAPUserDnExample").''; // Champ de login $var=!$var; @@ -301,9 +314,9 @@ print ''.$langs->trans("LDAPFilterConnectionExample").''; // DN pour les groupes $var=!$var; -print ''.$langs->trans("DNGroup").''; +print ''.$langs->trans("LDAPGroupDn").''; print ''; -print ''.$langs->trans("DNGroupExample").''; +print ''.$langs->trans("LDAPGroupDnExample").''; print ''; @@ -312,24 +325,37 @@ print "\n"; // Synchro contact active $var=!$var; -print ''.$langs->trans("DNContactActive").''; +print ''.$langs->trans("LDAPDnContactActive").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['1']=$langs->trans("Yes"); $html->select_array('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE); -print ''.$langs->trans("DNContactActiveExample").''; +print ''.$langs->trans("LDAPDnContactActiveExample").''; // DN Pour les contacts $var=!$var; -print ''.$langs->trans("DNContact").''; +print ''.$langs->trans("LDAPContactDn").''; print ''; -print ''.$langs->trans("DNContactExample").''; +print ''.$langs->trans("LDAPContactDnExample").''; print ''; -print ''.$langs->trans("ConnectionDolibarrLdap").''; +print ''.$langs->trans("LDAPAttributes").''; print "\n"; -// SAMAccountName +// Login +$var=!$var; +print ''.$langs->trans("LDAPFieldLoginSamba").''; +if ($conf->global->LDAP_FIELD_LOGIN_SAMBA) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldLoginSambaExample").''; + +// Name $var=!$var; print ''.$langs->trans("LDAPFieldName").''; if ($conf->global->LDAP_FIELD_NAME) @@ -338,22 +364,22 @@ if ($conf->global->LDAP_FIELD_NAME) } else { - print ''; + print ''; } print ''.$langs->trans("LDAPFieldNameExample").''; -// RealName +// Firstname $var=!$var; -print ''.$langs->trans("LDAPFieldRealName").''; -if ($conf->global->LDAP_FIELD_REALNAME) +print ''.$langs->trans("LDAPFieldFirstName").''; +if ($conf->global->LDAP_FIELD_FIRSTNAME) { - print ''; + print ''; } else { - print ''; + print ''; } -print ''.$langs->trans("LDAPFieldRealNameExample").''; +print ''.$langs->trans("LDAPFieldFirstNameExample").''; // Mail $var=!$var; @@ -381,6 +407,32 @@ else } print ''.$langs->trans("LDAPFieldPhoneExample").''; +// Fax +$var=!$var; +print ''.$langs->trans("LDAPFieldFax").''; +if ($conf->global->LDAP_FIELD_FAX) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldFaxExample").''; + +// Mobile +$var=!$var; +print ''.$langs->trans("LDAPFieldMobile").''; +if ($conf->global->LDAP_FIELD_MOBILE) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldMobileExample").''; + print ''; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 08065797bf2..e36febe917e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -434,34 +434,60 @@ AdherentMailRequired=EMail required to create a new member ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPFunctionsNotAvailableOnPHP=LDAP functions are not availbale on your PHP -LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr users and groups to LDAP +LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr or LDAP users and groups +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP LDAPSynchronizeContacts=Synchronize Dolibarr contacts to LDAP LDAPTypeExample=OpenLdap, Egroupware or Active Directory -LDAPServer=LDAP Server +LDAPPrimaryServer=LDAP primary server +LDAPSecondaryServer=LDAP secondary server LDAPServerPort=LDAP server port LDAPServerPortExample=Default port : 389 -#LDAPSuffix=LDAP suffix -DNAdmin=Administrator DN +LDAPServerProtocolVersion=LDAP protocol version +LDAPServerUseTLS=Use TLS +LDAPServerUseTLSExample=Your LDAP server use TLS +LDAPServerDn=Server DN +LDAPAdminDn=Administrator DN +LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=com) LDAPPassword=administrator password -DNUser=Dolibarr users' DN -DNGroup=Dolibarr groups' DN +LDAPUserDn=Users' DN +LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=com) +LDAPGroupDn=Groups' DN +LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=com) LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) -#LDAPSuffixExample=Complete DN (ex: dc=company,dc=com) -DNAdminExample=Complete DN (ex: cn=adminldap,dc=society,dc=com) +LDAPServerDnExample=Complete DN (ex: dc=company,dc=com) LDAPPasswordExample=Admin password -DNUserGroupActive=Users and groups synchronization -DNUserExample=Complete DN (ex: ou=users,dc=society,dc=com) -DNGroupExample=Complete DN (ex: ou=groups,dc=society,dc=com) -DNContactActive=Contacts' synchronization -DNContactActiveYes=Activated synchronization -DNContactActiveExample=Activated/Unactivated synchronization -DNContact=Dolibarr contacts' DN -DNContactExample=Complete DN (ex: ou=contacts,dc=society,dc=com) +LDAPDnSynchroActive=Users and groups synchronization +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Contacts' synchronization +LDAPDnContactActiveYes=Activated synchronization +LDAPDnContactActiveExample=Activated/Unactivated synchronization +LDAPContactDn=Dolibarr contacts' DN +LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPTestConnect=Test LDAP connection LDAPTestOK=Connect to LDAP server successful LDAPTestKO=Connect to LDAP server failed LDAPSetupForVersion3=LDAP server configured for version 3 LDAPSetupForVersion2=LDAP server configured for version 2 +LDAPFieldLogin=Login attribute +LDAPFieldLoginExample=Default attribute : uid +LDAPFilterConnection=Search filter +LDAPFilterConnectionExample=Default filter : &(objectClass=user)(objectCategory=person) +LDAPAttributes=LDAP attributes +LDAPFieldLoginSamba=Login +LDAPFieldLoginSambaExample=Default attribute : samaccountname (Samba and ActiveDirectory) +LDAPFieldName=Name +LDAPFieldNameExample=Default attribute : sn +LDAPFieldFirstName=Firstname +LDAPFieldFirstNameExample=Default attribute : givenname +LDAPFieldMail=E-Mail address +LDAPFieldMailExample=Default attribute : mail +LDAPFieldPhone=Phone number +LDAPFieldPhoneExample=Default attribute : telephonenumber +LDAPFieldFax=Fax number +LDAPFieldFaxExample=Default attribute : facsimiletelephonenumber +LDAPFieldMobile=Cellular phone +LDAPFieldMobileExample=Default attribute : mobile ##### Products ##### ProductSetup=Products module setup NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 1162e5b1b82..c9817956b0b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -434,34 +434,60 @@ AdherentMailRequired=EMail obligatoire pour cr ##### LDAP setup ##### LDAPSetup=Configuration du module LDAP LDAPFunctionsNotAvailableOnPHP=Les fonctions LDAP ne sont pas disponibles sur votre PHP -LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr vers LDAP +LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr ou LDAP +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP LDAPSynchronizeContacts=Synchronisation des contacts Dolibarr vers LDAP LDAPTypeExample=OpenLdap, Egroupware ou Active Directory -LDAPServer=Serveur LDAP +LDAPPrimaryServer=Serveur primaire +LDAPSecondaryServer=Serveur secondaire LDAPServerPort=Port du serveur LDAP LDAPServerPortExample=Port par défaut : 389 -#LDAPSuffix=Suffix LDAP -DNAdmin=DN de l'administrateur +LDAPServerProtocolVersion=Version du protocole LDAP +LDAPServerUseTLS=Utiliser TLS +LDAPServerUseTLSExample=Votre serveur utilise le TLS +LDAPServerDn=DN du serveur +LDAPAdminDn=DN de l'administrateur +LDAPAdminDnExample=DN complet (ex: cn=adminldap,dc=societe,dc=com) LDAPPassword=Mot de passe de l'administrateur -DNUser=DN des utilisateurs Dolibarr -DNGroup=DN des groupes Dolibarr +LDAPUserDn=DN des utilisateurs +LDAPUserDnExample=DN complet (ex: ou=users,dc=societe,dc=com) +LDAPGroupDn=DN des groupes +LDAPGroupDnExample=DN complet (ex: ou=groups,dc=societe,dc=com) LDAPServerExample=Adresse du serveur (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) -#LDAPSuffixExample=DN complet (ex: dc=societe,dc=com) -DNAdminExample=DN complet (ex: cn=adminldap,dc=societe,dc=com) +LDAPServerDnExample=DN complet (ex: dc=societe,dc=com) LDAPPasswordExample=Mot de passe de l'administrateur -DNUserGroupActive=Synchronisation des utilisateurs et groupes -DNUserExample=DN complet (ex: ou=users,dc=societe,dc=com) -DNGroupExample=DN complet (ex: ou=groups,dc=societe,dc=com) -DNContactActive=Synchronisation des contacts -DNContactActiveYes=Synchronisation activée -DNContactActiveExample=Synchronisation activée/désactivée -DNContact=DN des contacts Dolibarr -DNContactExample=DN complet (ex: ou=contacts,dc=societe,dc=com) +LDAPDnSynchroActive=Synchronisation des utilisateurs et groupes +LDAPDnSynchroActiveExample=Synchronisation de LDAP vers Dolibarr ou Dolibarr vers LDAP +LDAPDnContactActive=Synchronisation des contacts +LDAPDnContactActiveYes=Synchronisation activée +LDAPDnContactActiveExample=Synchronisation activée/désactivée +LDAPContactDn=DN des contacts Dolibarr +LDAPContactDnExample=DN complet (ex: ou=contacts,dc=societe,dc=com) LDAPTestConnect=Tester la connexion LDAP LDAPTestOK=Connexion au serveur LDAP réussie LDAPTestKO=Connexion au serveur LDAP echouée LDAPSetupForVersion3=Serveur LDAP configuré en version 3 LDAPSetupForVersion2=Serveur LDAP configuré en version 2 +LDAPFieldLogin=Attribut du Login +LDAPFieldLoginExample=Attribut par défaut : uid +LDAPFilterConnection=Filtre de recherche +LDAPFilterConnectionExample=Filtre par défaut : &(objectClass=user)(objectCategory=person) +LDAPAttributes=Attributs LDAP +LDAPFieldLoginSamba=Login +LDAPFieldLoginSambaExample=Attribut par défaut : samaccountname (Samba et ActiveDirectory) +LDAPFieldName=Nom +LDAPFieldNameExample=Attribut par défaut : sn +LDAPFieldFirstName=Prénom +LDAPFieldFirstNameExample=Attribut par défaut : givenname +LDAPFieldMail=Adresse E-Mail +LDAPFieldMailExample=Attribut par défaut : mail +LDAPFieldPhone=Numéro de téléphone +LDAPFieldPhoneExample=Attribut par défaut : telephonenumber +LDAPFieldFax=Numéro de fax +LDAPFieldFaxExample=Attribut par défaut : facsimiletelephonenumber +LDAPFieldMobile=Téléphone portable +LDAPFieldMobileExample=Attribut par défaut : mobile ##### Products ##### ProductSetup=Configuration du module Produits NumberOfProductShowInSelect=Nombre de produits max dans les listes déroulantes (0=aucune limite) diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index f405bb4ee96..173a5213388 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -202,8 +202,8 @@ if ($_POST["action"] == 'update' && $caneditfield) $edituser->pass = trim($_POST["pass"]); $edituser->admin = trim($_POST["admin"]); $edituser->office_phone = trim($_POST["office_phone"]); - $edituser->office_fax = trim($_POST["office_fax"]); - $edituser->user_mobile = trim($_POST["user_mobile"]); + $edituser->office_fax = trim($_POST["office_fax"]); + $edituser->user_mobile = trim($_POST["user_mobile"]); $edituser->email = trim($_POST["email"]); $edituser->note = trim($_POST["note"]); $edituser->webcal_login = trim($_POST["webcal_login"]);