From 86c826bd878df69cf9f4103d2c3aef781fd8ca19 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Nov 2019 15:54:09 +0100 Subject: [PATCH 1/5] internationalization --- htdocs/adherents/agenda.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 710d69fe62153..2c7fd1445ab1f 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -110,7 +110,7 @@ $form = new Form($db); /* - * Fiche categorie de client et/ou fournisseur + * Customer and/or supplier category sheet */ if ($object->id > 0) { From 0690467b153fbefdcfb738fd7825e95bc0333b74 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Nov 2019 16:11:37 +0100 Subject: [PATCH 2/5] internationalization --- htdocs/adherents/subscription.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index f2250af579087..b591a29a6e9aa 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -24,7 +24,7 @@ /** * \file htdocs/adherents/subscription.php * \ingroup member - * \brief Onglet d'ajout, edition, suppression des adhesions d'un adherent + * \brief tab for Adding, editing, deleting a member's memberships */ require '../main.inc.php'; @@ -86,7 +86,7 @@ // Define variables to know what current user can do on properties of user linked to edited member if ($object->user_id) { - // $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite + // $user is the user editing, $object->user_id is the user's id linked to the edited member $caneditfielduser=( (($user->id == $object->user_id) && $user->rights->user->self->creer) || (($user->id != $object->user_id) && $user->rights->user->user->creer) ); $caneditpassworduser=( (($user->id == $object->user_id) && $user->rights->user->self->password) @@ -554,12 +554,12 @@ if (! $adht->subscription) { print $langs->trans("SubscriptionNotRecorded"); - if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie + if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled } else { print $langs->trans("SubscriptionNotReceived"); - if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie + if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled } } print ''; From 1ac4bf54d28a56159f7091fb0f8567ef2c526fad Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Nov 2019 16:16:16 +0100 Subject: [PATCH 3/5] internationalization --- htdocs/adherents/type_ldap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php index 847c259b6b2b6..5658bf8ad0a54 100644 --- a/htdocs/adherents/type_ldap.php +++ b/htdocs/adherents/type_ldap.php @@ -121,7 +121,7 @@ dol_fiche_end(); /* - * Barre d'actions + * Action bar */ print '
'; @@ -137,7 +137,7 @@ -// Affichage attributs LDAP +// Display LDAP attributes print load_fiche_titre($langs->trans("LDAPInformationsForThisMemberType")); print ''; @@ -147,7 +147,7 @@ print ''; print ''; -// Lecture LDAP +// LDAP reading $ldap=new Ldap(); $result=$ldap->connect_bind(); if ($result > 0) From ab267cdf0ca70f0c91094ff1211123bd2167bdbb Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Nov 2019 16:23:06 +0100 Subject: [PATCH 4/5] internationalization --- htdocs/adherents/type_translation.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php index 673b6ef55b8ae..08504a39df620 100644 --- a/htdocs/adherents/type_translation.php +++ b/htdocs/adherents/type_translation.php @@ -22,7 +22,7 @@ /** * \file htdocs/adherents/type_translation.php * \ingroup product - * \brief Page de traduction des produits + * \brief Member translation page */ require '../main.inc.php'; @@ -50,7 +50,7 @@ * Actions */ -// retour a l'affichage des traduction si annulation +// return to translation display if cancellation if ($cancel == $langs->trans("Cancel")) { $action = ''; @@ -70,7 +70,7 @@ $object->fetch($id); $current_lang = $langs->getDefaultLang(); - // update de l'objet + // update of object if ( $_POST["forcelangprod"] == $current_lang ) { $object->label = $_POST["libelle"]; @@ -84,7 +84,7 @@ $object->multilangs[$_POST["forcelangprod"]]["other"] = dol_htmlcleanlastbr($_POST["other"]); } - // sauvegarde en base + // backup into database if ( $object->setMultiLangs($user) > 0 ) { $action = ''; @@ -103,7 +103,7 @@ $object->fetch($id); $current_lang = $langs->getDefaultLang(); - foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet + foreach ($object->multilangs as $key => $value) // saving new values in the object { if ( $key == $current_lang ) { From d760b799d908b7748ae3e295ebeff58d29338693 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Nov 2019 16:26:57 +0100 Subject: [PATCH 5/5] internationalization --- htdocs/adherents/type.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 68d82c5d12a45..0c1ec419a32ab 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -412,7 +412,7 @@ $object->fetch_optionals(); /* - * Confirmation suppression + * Confirmation deletion */ if ($action == 'delete') {
'.$langs->trans("Value").'