From 33d035139fbeb4719dca98411a5b216460fe54f0 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Dec 2018 10:17:52 +0100 Subject: [PATCH 1/3] fix typo and add translation --- htdocs/modulebuilder/template/class/myobject.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index 6029fc7d3f9..cce57d95ac1 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -224,7 +224,7 @@ class MyObject extends CommonObject } /** - * Clone and object into another one + * Clone an object into another one * * @param User $user User that creates * @param int $fromid Id of object to clone @@ -557,9 +557,9 @@ class MyObject extends CommonObject } /** - * Charge les informations d'ordre info dans l'objet commande + * Load the info information in the object * - * @param int $id Id of order + * @param int $id Id of object * @return void */ public function info($id) @@ -623,7 +623,7 @@ class MyObject extends CommonObject /** * Action executed by scheduler - * CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters' + * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters' * * @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK) */ From c3a898daa6627dcc083a6cae797c900aac95b790 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Dec 2018 13:44:49 +0100 Subject: [PATCH 2/3] better form display and fix --- htdocs/adherents/admin/adherent_extrafields.php | 4 ++-- htdocs/modulebuilder/index.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 81896a12490..17921eabf3c 100644 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { - print "
"; + print '

'; print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; @@ -107,7 +107,7 @@ if ($action == 'create') /* ************************************************************************** */ if ($action == 'edit' && ! empty($attrname)) { - print "
"; + print '

'; print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 24596255043..db69f9052b8 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1576,7 +1576,7 @@ elseif (! empty($module)) $pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql'; $pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.sql'; $pathtosqlkey = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.key.sql'; - $pathtolib = strtolower($module).'/lib/'.strtolower($tabobj).'.lib.php'; + $pathtolib = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php'; $pathtopicto = strtolower($module).'/img/object_'.strtolower($tabobj).'.png'; $pathtoscript = strtolower($module).'/scripts/'.strtolower($tabobj).'.php'; From 27facab545cbfae81d064eefec42e82a976bd960 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Dec 2018 14:18:22 +0100 Subject: [PATCH 3/3] fix typo and translation --- htdocs/adherents/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 732504ed923..accdedc0141 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -94,7 +94,7 @@ if ($id > 0) // Define variables to know what current user can do on properties of user linked to edited member if ($object->user_id) { - // $ User is the user who edits, $ object->user_id is the id of the related user in the edited member + // $User is the user who edits, $object->user_id is the id of the related user in 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) @@ -268,7 +268,7 @@ if (empty($reshook)) $langs->load("errors"); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors'); } - // Test si le login existe deja + // Check if the login already exists if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { if (empty($login)) {