From 4819414d3ae170689c4a465fe36a7fa3c3300507 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 19 Sep 2019 22:33:26 +0200 Subject: [PATCH] Translate and some fix --- htdocs/adherents/admin/adherent.php | 14 ++--- htdocs/adherents/admin/adherent_emails.php | 6 +-- htdocs/adherents/admin/website.php | 5 +- .../actions_adherentcard_common.class.php | 5 +- htdocs/adherents/cartes/carte.php | 6 +-- htdocs/admin/accountant.php | 54 +++++++++---------- 6 files changed, 44 insertions(+), 46 deletions(-) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index af2a8841643..e39fb6bb233 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -79,7 +79,7 @@ if ($action == 'updateall') } } -// Action mise a jour ou ajout d'une constante +// Action to update or add a constant if ($action == 'update' || $action == 'add') { $constname=GETPOST('constname', 'alpha'); @@ -108,7 +108,7 @@ if ($action == 'update' || $action == 'add') } } -// Action activation d'un sous module du module adherent +// Action to enable of a submodule of the adherent module if ($action == 'set') { $result=dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity); @@ -118,7 +118,7 @@ if ($action == 'set') } } -// Action desactivation d'un sous module du module adherent +// Action to disable a submodule of the adherent module if ($action == 'unset') { $result=dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity); @@ -220,9 +220,9 @@ if ($conf->facture->enabled) print ''; -print '
'; +print '
'; print ''; -print '
'; +print ''; print ''; @@ -230,7 +230,7 @@ print '
'; /* - * Edition info modele document + * Edit info of model document */ $constantes=array( 'ADHERENT_CARD_TYPE', @@ -254,7 +254,7 @@ print '
'; /* - * Edition info modele document + * Edit info of model document */ $constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT'); diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php index 3f901539380..70ed003f9d4 100644 --- a/htdocs/adherents/admin/adherent_emails.php +++ b/htdocs/adherents/admin/adherent_emails.php @@ -82,7 +82,7 @@ if ($action == 'updateall') } } -// Action mise a jour ou ajout d'une constante +// Action to update or add a constant if ($action == 'update' || $action == 'add') { $constlineid = GETPOST('rowid', 'int'); @@ -108,7 +108,7 @@ if ($action == 'update' || $action == 'add') } } -// Action activation d'un sous module du module adherent +// Action to enable a submodule of the adherent module if ($action == 'set') { $result=dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity); @@ -118,7 +118,7 @@ if ($action == 'set') } } -// Action desactivation d'un sous module du module adherent +// Action to disable a submodule of the adherent module if ($action == 'unset') { $result=dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity); diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index 70a37f0bf4b..f38c0b5ff6d 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -22,7 +22,6 @@ * \file htdocs/adherents/admin/website.php * \ingroup member * \brief File of main public page for member module - * \author Laurent Destailleur */ require '../../main.inc.php'; @@ -211,9 +210,9 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC)) print ''; - print '
'; + print '
'; print ''; - print '
'; + print ''; } diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index 31f957fcf21..c019a8eb88f 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -19,11 +19,11 @@ /** * \file htdocs/adherents/canvas/actions_adherentcard_common.class.php * \ingroup adherent - * \brief Fichier de la classe Adherent card controller (common) + * \brief File of class Thirdparty member card controller (common) */ /** - * Class to maage members using default canvas + * Class to manage members using default canvas */ abstract class ActionsAdherentCardCommon { @@ -170,7 +170,6 @@ abstract class ActionsAdherentCardCommon $this->tpl['nb_emailing'] = $this->object->getNbOfEMailings(); } - // Dolibarr user if ($this->object->user_id) { diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index b0ff07ac867..dc02e48cbab 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/printsheet/modules_labels.php'; $langs->loadLangs(array("members","errors")); -// Choix de l'annee d'impression ou annee courante. +// Choice of printing year or current year. $now = dol_now(); $year=dol_print_date($now, '%Y'); $month=dol_print_date($now, '%m'); @@ -47,7 +47,7 @@ $adherentstatic=new Adherent($db); $object=new Adherent($db); $extrafields = new ExtraFields($db); -// fetch optionals attributes and labels +// Fetch optionals attributes and labels $extralabels = $extrafields->fetch_name_optionals_label('adherent'); @@ -97,7 +97,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg $adherentstatic->lastname=$objp->lastname; $adherentstatic->firstname=$objp->firstname; - // format extrafiled so they can be parsed in function complete_substitutions_array + // Format extrafield so they can be parsed in function complete_substitutions_array if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { $adherentstatic->array_options = array(); diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php index 38e19adb745..abef1ab65a4 100644 --- a/htdocs/admin/accountant.php +++ b/htdocs/admin/accountant.php @@ -112,56 +112,56 @@ if ($action == 'edit' || $action == 'updateedit') print ''; print ''; - print ''."\n"; + print ''."\n"; // Name - print ''."\n"; // Address - print ''."\n"; - print ''."\n"; - print ''."\n"; // Country - print ''."\n"; - print ''."\n"; - print ''; print ''."\n"; - print ''; print ''."\n"; - print ''; print ''."\n"; // Web - print ''; print ''."\n"; // Code - print ''."\n"; // Note - print ''; print ''; @@ -189,24 +189,24 @@ else print '
'; print '
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); print '
'; + print '
'; $formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id'); print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; + print '
'; print '
'; - print ''; + print ''; - print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; - print ''; - if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; print '
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'.$langs->trans("CompanyName").''; + print '
'.$langs->trans("CompanyName").''; print $conf->global->MAIN_INFO_ACCOUNTANT_NAME; print '
'.$langs->trans("CompanyAddress").'' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '
'.$langs->trans("CompanyAddress").'' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '
'.$langs->trans("CompanyZip").'' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '
'.$langs->trans("CompanyZip").'' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '
'.$langs->trans("CompanyTown").'' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '
'.$langs->trans("CompanyTown").'' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '
'.$langs->trans("CompanyCountry").''; + print '
'.$langs->trans("CompanyCountry").''; if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY)) { $code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2); @@ -217,23 +217,23 @@ else print '
'.$langs->trans("Region-State").''; - else print '
'.$langs->trans("State").''; + if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '
'.$langs->trans("Region-State").''; + else print '
'.$langs->trans("State").''; if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT); else print ' '; print '
'.$langs->trans("Phone").'' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . '
'.$langs->trans("Phone").'' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . '
'.$langs->trans("Fax").'' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . '
'.$langs->trans("Fax").'' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . '
'.$langs->trans("Mail").'' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . '
'.$langs->trans("Mail").'' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . '
'.$langs->trans("Web").'' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . '
'.$langs->trans("Web").'' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . '
'.$langs->trans("AccountantFileNumber").'' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '
'.$langs->trans("AccountantFileNumber").'' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '
'.$langs->trans("Note").'' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '
'.$langs->trans("Note").'' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '
'; print "";