diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 4a47e07e245..40486fd978c 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -136,7 +136,7 @@ print dol_get_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'act print ''.$langs->trans("AgendaAutoActionDesc")." ".$langs->trans("OnlyActiveElementsAreShown", 'modules.php').'
'; print "
\n"; -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; print ''; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 394fdad8f35..3700ecf631f 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -57,7 +57,7 @@ if (GETPOSTISSET('AGENDA_EXPORT_FIX_TZ')) { $AGENDA_EXPORT_FIX_TZ = trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')); } -// Sauvegardes parametres +// Sauvegardes parameters if ($actionsave) { $i = 0; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index bfac2487dec..be817438610 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -356,8 +356,8 @@ if ($resql) { print dol_escape_htmltag($obj->label); print "'; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 36b98d52059..9c4cf2561e6 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -135,8 +135,8 @@ if ($action == 'updateMask') { } elseif ($action == 'unsetdoc') { dolibarr_del_const($db, "CONTRACT_ADDON_PDF", $conf->entity); } elseif ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify si the chosen numbering module can be activated by + // the method call canBeActivated dolibarr_set_const($db, "CONTRACT_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'set_other') { @@ -410,7 +410,7 @@ foreach ($dirmodels as $reldir) { print ""; } - // Defaut + // Default print ''; print '
\n"; print $langs->trans('BarcodeDesc'.$obj->encoding); - //print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle.
"; - //print "L'utilisation des symbologies EAN8 impose la souscription et l'abonnement aupres d'organisme tel que GENCOD.
"; + //print "L'EAN se compose de 8 characters, 7 chiffres plus une cle de verification.
"; + //print "L'utilisation des symbologies EAN8 impose la souscription et l'abonnement aupres d'organismes comme GENCOD.
"; //print "Codes numeriques utilises exclusivement a l'identification des produits susceptibles d'etre vendus au grand public."; print '
'; if (getDolGlobalString('CONTRACT_ADDON_PDF') == $name) { print 'scandir).'&label='.urlencode($module->name).'&type=order_supplier" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').''; @@ -522,7 +522,7 @@ print ''.$langs->trans("AllowOnlineSign").''; if (getDolGlobalString('CONTRACT_ALLOW_ONLINESIGN')) { print ''; - print img_picto($langs->trans("Activited"), 'switch_on'); + print img_picto($langs->trans("Activated"), 'switch_on'); print ''; } else { print ''; diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php index eeccec2a957..e20c40a5db1 100644 --- a/htdocs/admin/delivery.php +++ b/htdocs/admin/delivery.php @@ -188,8 +188,8 @@ if ($action == 'setdoc') { } if ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be activated + // by calling method canBeActivated dolibarr_set_const($db, "DELIVERY_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity); } diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index f47d011fbb7..73ed83daf82 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -537,7 +537,7 @@ $tabcond[44] = isModEnabled('asset'); // List of help for fields (no more used, help is defined into tabcomplete) $tabhelp = array(); -// Table to store complete informations (will replace all other table). Key is table name. +// Table to store complete information (will replace all other table). Key is table name. $tabcomplete = array( 'c_forme_juridique'=>array( 'picto'=>'company', @@ -601,7 +601,7 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls $i = 0; foreach ($tabcomplete as $key => $value) { $i++; - // When a dictionnary is commented + // When a dictionary is commented if (!isset($tabcond[$i])) { continue; } @@ -627,7 +627,7 @@ if ($id > 0) { } } -// Defaut sortorder +// Default sortorder if (empty($sortfield)) { $tmp1 = explode(',', empty($tabcomplete[$keytable]['sqlsort']) ? '' : $tabcomplete[$keytable]['sqlsort']); $tmp2 = explode(' ', $tmp1[0]); @@ -741,7 +741,7 @@ if (empty($reshook)) { if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) { continue; // For some pages, country is not mandatory } - // Discard check of mandatory fiedls for other fields + // Discard check of mandatory fields for other fields if ($value == 'localtax1' && !GETPOST('localtax1_type')) { continue; } @@ -1386,7 +1386,7 @@ if ($id > 0) { } // Define field friendly name from its technical name - $valuetoshow = ucfirst($value); // Par defaut + $valuetoshow = ucfirst($value); // Par default $valuetoshow = $langs->trans($valuetoshow); // try to translate $class = ''; @@ -2537,7 +2537,7 @@ $db->close(); * @param array $fieldlist Array of fields * @param Object $obj If we show a particular record, obj is filled with record fields * @param string $tabname Name of SQL table - * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered + * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered * @return string '' or value of entity into table */ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php index 96302b13402..9ff92554e09 100644 --- a/htdocs/admin/dolistore/ajax/image.php +++ b/htdocs/admin/dolistore/ajax/image.php @@ -25,7 +25,7 @@ if (!defined('NOTOKENRENEWAL')) { /** * \file htdocs/admin/dolistore/ajax/image.php * \ingroup admin - * \brief Page des informations dolistore + * \brief Page des information dolistore */ require "../../../main.inc.php"; diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php index 57f8d2d2e5c..2fee52df32b 100644 --- a/htdocs/admin/dolistore/class/dolistore.class.php +++ b/htdocs/admin/dolistore/class/dolistore.class.php @@ -48,7 +48,7 @@ class Dolistore public $url; // the url of this page public $shop_url; // the url of the shop public $lang; // the integer representing the lang in the store - public $debug_api; // usefull if no dialog + public $debug_api; // useful if no dialog public $api; public $products; @@ -177,7 +177,7 @@ class Dolistore $opt['sort'] = 'id_desc'; $opt['filter[active]'] = '[1]'; $opt['limit'] = "$this->start,$this->end"; - // $opt['filter[id]'] contais list of product id that are result of search + // $opt['filter[id]'] contains list of product id that are result of search // Call API to get the detail dol_syslog("Call API with opt = ".var_export($opt, true)); @@ -246,7 +246,7 @@ class Dolistore // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Return list of product formated for output + * Return list of product formatted for output * * @return string HTML output */ diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index a6ff78a0ba0..f68df7a58f4 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -75,7 +75,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); -// Initialize array of search criterias +// Initialize array of search criteria $search_all = GETPOST("search_all", 'alpha'); $search = array(); foreach ($object->fields as $key => $val) { diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index ba233bfc087..84da0f49c03 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -91,7 +91,7 @@ if ($user->socid > 0) { // Protection if external user } //$result = restrictedArea($user, 'emailcollector', $id, ''); -// Initialize array of search criterias +// Initialize array of search criteria $search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { @@ -420,7 +420,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''."\n"; @@ -694,7 +694,7 @@ print ''."\n"; print load_fiche_titre($langs->trans("Other"), '', ''); -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
'; print ''; diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php index 7e1b74e336e..7016986b0bd 100644 --- a/htdocs/admin/eventorganization.php +++ b/htdocs/admin/eventorganization.php @@ -340,7 +340,7 @@ if ($action == 'edit') { if ($result < 0) { setEventMessages(null, $c->errors, 'errors'); } - $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text + $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text $toprint = array(); foreach ($ways as $way) { $toprint[] = '
  • color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '
  • '; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index c8cc698101c..0ddc49e5c85 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir) { print ""; } - // Defaut + // Default print '
    '; if (getDolGlobalString('EXPEDITION_ADDON_PDF') == $name) { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index a4ebcbdb540..a1360b92966 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -138,7 +138,7 @@ if ($action == 'updateMask') { } } elseif ($action == 'setmod') { // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // par appel method canBeActivated dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'setoptions') { diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 7dd152fa3d1..b9c200b3b50 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -193,7 +193,7 @@ print '
    '; print '
    '; print ''; -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 3384a0d31d6..30525d92a68 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -149,7 +149,7 @@ if ($action == 'updateMask') { } } elseif ($action == 'setmod') { // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // par appel method canBeActivated dolibarr_set_const($db, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'setribchq') { @@ -389,7 +389,7 @@ foreach ($dirmodels as $reldir) { $htmltooltip .= $langs->trans($module->error).'
    '; } } - // Example for remplacement + // Example for replacement $facture->type = 1; $nextval = $module->getNextValue($mysoc, $facture); if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval @@ -554,7 +554,7 @@ foreach ($dirmodels as $reldir) { print ""; } - // Defaut + // Default print '
    '; if ($conf->global->FACTURE_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php index f165ce419a6..b514ef81721 100644 --- a/htdocs/admin/facture_situation.php +++ b/htdocs/admin/facture_situation.php @@ -61,7 +61,7 @@ $form = new Form($db); $formSetup = new FormSetup($db); -// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style +// Setup conf MYMODULE_MYPARAM4 : example of quick define write style $formSetup->newItem('INVOICE_USE_SITUATION') ->setAsYesNo() ->nameText = $langs->trans('UseSituationInvoices'); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index c2f99935add..f068f4c9eb7 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -133,8 +133,8 @@ if ($action == 'updateMask') { $ret = addDocumentModel($value, $type, $label, $scandir); } } elseif ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be activated + // by calling method canBeActivated dolibarr_set_const($db, "FICHEINTER_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'set_FICHINTER_FREE_TEXT') { diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 2678333976c..21280dd8008 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -134,7 +134,7 @@ if ($action == 'updateMask') { } } elseif ($action == 'setmod') { // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // par appel method canBeActivated dolibarr_set_const($db, "HOLIDAY_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'set_other') { diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php index 6b75e92bfca..ae0c57284df 100644 --- a/htdocs/admin/hrm.php +++ b/htdocs/admin/hrm.php @@ -602,7 +602,7 @@ if ($action == 'edit') { if ($result < 0) { setEventMessages(null, $c->errors, 'errors'); } - $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text + $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text $toprint = array(); foreach ($ways as $way) { $toprint[] = '
  • color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '
  • '; diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php index 40e92d8270a..c50951f1e3f 100644 --- a/htdocs/admin/knowledgemanagement.php +++ b/htdocs/admin/knowledgemanagement.php @@ -299,7 +299,7 @@ if ($action == 'edit') { if ($result < 0) { setEventMessages(null, $c->errors, 'errors'); } - $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text + $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text $toprint = array(); foreach ($ways as $way) { $toprint[] = '
  • color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '
  • '; diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 622c08f6a57..3a21d0ca030 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -130,7 +130,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test if the LDAP functionality is available if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -146,12 +146,12 @@ print dol_get_fiche_head($head, 'ldap', '', -1); print ''; -// Liste de synchro actives +// List of active synchronisations print ''; print ''; print "\n"; -// Synchro utilisateurs/groupes active +// Synchronise active users and groups print ''; print ''; print "\n"; -// DN pour les groupes +// DN (Domain Name) for the groups print ''; print ''; print ''; print "\n"; -// DN Pour les utilisateurs +// DN (Domain Name) for the users print ''; print '
    '.$langs->trans("LDAPSynchronization").'
    '.$langs->trans("LDAPDnSynchroActive").''; print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_SYNCHRO_ACTIVE'), 'activesynchro'); @@ -269,7 +269,7 @@ print '
    '; /* - * Test de la connexion + * Test the connection */ if (function_exists("ldap_connect")) { if (getDolGlobalString('LDAP_SERVER_HOST')) { @@ -277,7 +277,7 @@ if (function_exists("ldap_connect")) { } if ($action == 'test') { - $ldap = new Ldap(); // Les parametres sont passes et recuperes via $conf + $ldap = new Ldap(); // The parameters are provided and recovered through $conf $result = $ldap->connect_bind(); if ($result > 0) { diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index afb76a6f245..d18a88340aa 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -132,7 +132,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test si function LDAP actives if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -281,7 +281,7 @@ print ''; /* - * Test de la connexion + * Test the connection */ $butlabel = $langs->trans("LDAPTestSynchroContact"); $testlabel = 'test'; @@ -294,7 +294,7 @@ show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass); if (function_exists("ldap_connect")) { if ($_GET["action"] == 'test') { - // Creation objet + // Create object $object = new Contact($db); $object->initAsSpecimen(); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 36ef3b7ad7c..c98341a6779 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -109,7 +109,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test if the LDAP functionality is available if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -130,7 +130,7 @@ print '
    '.$langs->trans("LDAPSynchronizeGroups").'
    '.$langs->trans("LDAPGroupDn").''; print ''; @@ -217,7 +217,7 @@ print ''; /* - * Test de la connexion + * Test the connection */ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) { $butlabel = $langs->trans("LDAPTestSynchroGroup"); @@ -238,7 +238,7 @@ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) { if (function_exists("ldap_connect")) { if ($action == 'testgroup') { - // Creation objet + // Create object $object = new UserGroup($db); $object->initAsSpecimen(); @@ -284,7 +284,7 @@ if (function_exists("ldap_connect")) { } if ($action == 'testsearchgroup') { - // TODO Mutualize code following with other ldap_xxxx.php pages + // TODO Mutualize code below with other ldap_xxxx.php pages // Test synchro $ldap = new Ldap(); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index a533c1c8026..469d8f1735d 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -177,7 +177,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test si function LDAP actives if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -431,7 +431,7 @@ print ''; /* - * Test de la connexion + * Test the connection */ if (getDolGlobalString('LDAP_MEMBER_ACTIVE')) { $butlabel = $langs->trans("LDAPTestSynchroMember"); @@ -445,7 +445,7 @@ if (getDolGlobalString('LDAP_MEMBER_ACTIVE')) { if (function_exists("ldap_connect")) { if ($_GET["action"] == 'testmember') { - // Creation objet + // Create object $object = new Adherent($db); $object->initAsSpecimen(); diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php index 064ea56d795..8e20ede24d9 100644 --- a/htdocs/admin/ldap_members_types.php +++ b/htdocs/admin/ldap_members_types.php @@ -101,7 +101,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test if the LDAP functions are enabled if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -187,7 +187,7 @@ print ''; /* - * Test de la connexion + * Test de la connection */ if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) { $butlabel = $langs->trans("LDAPTestSynchroMemberType"); @@ -201,7 +201,7 @@ if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDA if (function_exists("ldap_connect")) { if ($_GET["action"] == 'testmembertype') { - // Creation objet + // Create object $object = new AdherentType($db); $object->initAsSpecimen(); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 54863009e0d..ca84c912a5e 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -165,7 +165,7 @@ print load_fiche_titre($langs->trans("LDAPSetup"), $linkback, 'title_setup'); $head = ldap_prepare_head(); -// Test si fonction LDAP actives +// Test if the LDAP functionality is available if (!function_exists("ldap_connect")) { setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors'); } @@ -187,7 +187,7 @@ print '
    '.$langs->trans("LDAPSynchronizeUsers").'
    '.$langs->trans("LDAPUserDn").''; print ''; @@ -394,7 +394,7 @@ print ''; /* - * Test de la connexion + * Test de la connection */ if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) { $butlabel = $langs->trans("LDAPTestSynchroUser"); @@ -415,7 +415,7 @@ if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) if (function_exists("ldap_connect")) { if ($action == 'testuser') { - // Creation objet + // Create object $object = new User($db); $object->initAsSpecimen(); @@ -458,7 +458,7 @@ if (function_exists("ldap_connect")) { } if ($action == 'testsearchuser') { - // Creation objet + // Create object $object = new User($db); $object->initAsSpecimen(); diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 2ca03d168cb..6499dc7bc8f 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -82,7 +82,7 @@ if ($action == 'setvalue') { $error++; } - // Create temporary encryption key if nedded + // Create temporary encryption key if needed $res = dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE_KEY", $checkread_key, 'chaine', 0, '', $conf->entity); if (!($res > 0)) { $error++; diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index fdfc0068533..4c014640d00 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -78,7 +78,7 @@ if ($action == 'update' || $action == 'add') { } } -// Action activation d'un sous module du module adherent +// Action to activate a submodule of the 'adherent' module if ($action == 'set') { $result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity); if ($result < 0) { @@ -86,7 +86,7 @@ if ($action == 'set') { } } -// Action desactivation d'un sous module du module adherent +// Action to deactivate a submodule of the 'adherent' module if ($action == 'unset') { $result = dolibarr_del_const($db, $_GET["name"], $conf->entity); if ($result < 0) { @@ -157,7 +157,7 @@ if (getDolGlobalString('ADHERENT_USE_MAILMAN')) { //$link.=$langs->trans("Disable"); $link .= img_picto($langs->trans("Activated"), 'switch_on'); $link .= ''; - // Edition des varibales globales + // Edit the global variables $constantes = array( 'ADHERENT_MAILMAN_ADMIN_PASSWORD', 'ADHERENT_MAILMAN_URL', diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 7468b2a0d0e..56332dfe37b 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -659,7 +659,7 @@ if ($action == 'edit') { print "

    \n"; if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; @@ -817,7 +817,7 @@ if ($action == 'edit') { print '
    '; - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Parameters").'
    '; print ''; @@ -848,7 +848,7 @@ if ($action == 'edit') { print '
    '; - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("ParametersForTestEnvironment").''.$langs->trans("Value").'
    '; print ''; @@ -1112,9 +1112,9 @@ if ($action == 'edit') { $formmail->withdeliveryreceipt = 1; $formmail->withfckeditor = ($action == 'testhtml' ? 1 : 0); $formmail->ckeditortoolbar = 'dolibarr_mailings'; - // Tableau des substitutions + // Array of substitutions $formmail->substit = $substitutionarrayfortest; - // Tableau des parametres complementaires du post + // Array of complementary POST parameters $formmail->param["action"] = "send"; $formmail->param["models"] = "body"; $formmail->param["mailid"] = 0; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index ceacd309b14..5f14face633 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -516,7 +516,7 @@ if ($action == 'edit') { print ''.$langs->trans("EMailsDesc")."
    \n"; print "

    \n"; - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("OtherOptions").'
    '; print ''; @@ -733,7 +733,7 @@ if ($action == 'edit') { $formmail->ckeditortoolbar = 'dolibarr_mailings'; // Tableau des substitutions $formmail->substit = $substitutionarrayfortest; - // Tableau des parametres complementaires du post + // Tableau des parameters complementaires du post $formmail->param["action"] = "send"; $formmail->param["models"] = "body"; $formmail->param["mailid"] = 0; diff --git a/htdocs/admin/mails_ingoing.php b/htdocs/admin/mails_ingoing.php index 010d933821e..98af4d10564 100644 --- a/htdocs/admin/mails_ingoing.php +++ b/htdocs/admin/mails_ingoing.php @@ -107,13 +107,13 @@ print ''.$langs->trans("EMailsInGoingDesc", $langs-> print "

    \n"; /* -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Parameters").'
    '; print ''; print '
    '; -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Parameter").''.$langs->trans("Value").'
    '; // SMTPS oauth service diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 59fc05920f0..192215451be 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -19,7 +19,7 @@ /** * \file htdocs/admin/mails_senderprofile_list.php * \ingroup core - * \brief Page to adminsiter email sender profiles + * \brief Page to administer email sender profiles */ // Load Dolibarr environment @@ -80,7 +80,7 @@ if (!$sortorder) { $sortorder = "ASC"; } -// Initialize array of search criterias +// Initialize array of search criteria $search_all = trim(GETPOST("search_all", 'alphanohtml')); $search = array(); foreach ($object->fields as $key => $val) { @@ -539,7 +539,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '."\n"; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index cabbe69c319..51c35a615be 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -715,7 +715,7 @@ if ($action == 'create') { foreach ($fieldlist as $field => $value) { // Determine le nom du champ par rapport aux noms possibles // dans les dictionnaires de donnees - $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut + $valuetoshow = ucfirst($fieldlist[$field]); // Par default $valuetoshow = $langs->trans($valuetoshow); // try to translate $css = "left"; if ($fieldlist[$field] == 'module') { @@ -975,7 +975,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print getTitleFieldOfList(''); } foreach ($fieldlist as $field => $value) { - $showfield = 1; // By defaut + $showfield = 1; // By default $css = "left"; $sortable = 1; $valuetoshow = ''; @@ -987,7 +987,7 @@ foreach ($fieldlist as $field => $value) { $css=$tmp['align']; $sortable=$tmp['sortable']; */ - $valuetoshow = ucfirst($fieldlist[$field]); // By defaut + $valuetoshow = ucfirst($fieldlist[$field]); // By default $valuetoshow = $langs->trans($valuetoshow); // try to translate if ($fieldlist[$field] == 'module') { $css = 'tdoverflowmax100'; @@ -1351,7 +1351,7 @@ $db->close(); * @param array $fieldlist Array of fields * @param Object $obj If we show a particular record, obj is filled with record fields * @param string $tabname Name of SQL table - * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered + * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered * @return void */ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index 17cf5a85b32..fbb5edddfc3 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -493,7 +493,7 @@ if ($action == 'edit') { print ''.$langs->trans("EMailsDesc")."
    \n"; print "

    \n"; - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '; print ''; @@ -695,7 +695,7 @@ if ($action == 'edit') { $formmail->ckeditortoolbar = 'dolibarr_mailings'; // Tableau des substitutions $formmail->substit = $substitutionarrayfortest; - // Tableau des parametres complementaires du post + // Tableau des parameters complementaires du post $formmail->param["action"] = "send"; $formmail->param["models"] = "body"; $formmail->param["mailid"] = 0; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 2e85101d6d9..f0a84949504 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -49,8 +49,8 @@ foreach ($dirmenus as $dirmenu) { $error = 0; -// Cette page peut etre longue. On augmente le delai autorise. -// Ne fonctionne que si on est pas en safe_mode. +// This can be a big page. The execution time limit is increased. +// This setting can only be changed when the 'safe_mode' is inactive. $err = error_reporting(); error_reporting(0); // Disable all errors //error_reporting(E_ALL); @@ -63,7 +63,7 @@ error_reporting($err); */ if ($action == 'update' && !$cancel) { - $_SESSION["mainmenu"] = "home"; // Le gestionnaire de menu a pu changer + $_SESSION["mainmenu"] = "home"; // The menu manager may have changed dolibarr_set_const($db, "MAIN_MENU_STANDARD", GETPOST('MAIN_MENU_STANDARD', 'alpha'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MENU_SMARTPHONE", GETPOST('MAIN_MENU_SMARTPHONE', 'alpha'), 'chaine', 0, '', $conf->entity); diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index aef29238078..95de2e96b99 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -279,7 +279,7 @@ if ($action == 'create') { print dol_get_fiche_head(); - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Parameters").'
    '; // Id @@ -412,7 +412,7 @@ if ($action == 'create') { print dol_get_fiche_head(); - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '; $menu = new Menubase($db); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 6d630ed6b6d..d18f205f4de 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -258,25 +258,25 @@ print ''; print '
    '; -// ARBORESCENCE +// MENU TREE /*-------------------- MAIN ----------------------- -tableau des elements de l'arbre: -c'est un tableau a 2 dimensions. -Une ligne represente un element : data[$x] -chaque ligne est decomposee en 3 donnees: - - l'index de l'élément - - l'index de l'élément parent - - la chaine a afficher -ie: data[]= array (index, index parent, chaine ) +Array of the menu tree: +- Is an array in with 2 dimensions. +- A single line represents an item : data[$x] +- Each line has 3 data items: + - The index of the item; + - The index of the item's parent; + - The string to show +i.e.: data[]= array (index, parent index, string ) */ -//il faut d'abord declarer un element racine de l'arbre +// First the root item of the tree must be declared: $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>''); -//puis tous les elements enfants +// Then all child items must be declared $sql = "SELECT m.rowid, m.titre, m.langs, m.mainmenu, m.leftmenu, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.position, m.module"; $sql .= " FROM ".MAIN_DB_PREFIX."menu as m"; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 39ac596e954..27d0b5c0581 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -224,7 +224,7 @@ if ($action == 'install') { $modulenamearrays[$modulename] = $modulename; //var_dump($modulenamearrays);exit; - // Lop on each packacge of the metapackage + // Lop on each package of the metapackage foreach ($modulenamearrays as $modulenameval) { if (strpos($modulenameval, '#') === 0) { continue; // Discard comments @@ -940,7 +940,7 @@ if ($mode == 'common' || $mode == 'commonkanban') { } else { // Module not yet activated // Set $codeenabledisable if (!empty($objMod->always_enabled)) { - // A 'always_enabled' module should not never be disabled. If this happen, we keep a link to reenable it. + // A 'always_enabled' module should not never be disabled. If this happen, we keep a link to re-enable it. $codeenabledisable .= ''."\n"; $codeenabledisable .= ''; if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) { - // $options is array with filter criterias + // $options is array with filter criteria //var_dump($options); $dolistore->getRemoteCategories(); $dolistore->getRemoteProducts($options); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 26ee5a374f5..e9af7bdc816 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -403,7 +403,7 @@ if ($conf->use_javascript_ajax) { } print ''; -// Place customer adress to the ISO location +// Place customer address to the ISO location print ''; -// Swicth in Bold +// Switch in Bold print ''; -// Swicth in Bold +// Switch in Bold print '"; } - // Defaut + // Default print ""; } - // Defaut + // Default print ''."\n"; print ''; -// Utilisation formulaire Ajax sur choix produit +// Use an Ajax form for the product choice print ''; print ''; if (empty($conf->use_javascript_ajax)) { diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index d09149bab56..4d6f5bcd6df 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -283,7 +283,7 @@ if ($action == 'edit') { $formsms->withcancel = 1; // Tableau des substitutions $formsms->substit = $substitutionarrayfortest; - // Tableau des parametres complementaires du post + // Tableau des parameters complementaires du post $formsms->param["action"] = "send"; $formsms->param["models"] = "body"; $formsms->param["smsid"] = 0; diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index be64e2b8707..f9009151061 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -88,7 +88,7 @@ if ($action == 'set') { } } -// Action desactivation d'un sous module du module adherent +// Action deactivation d'un sous module du module adherent if ($action == 'unset') { $result = dolibarr_del_const($db, $_GET["name"], $conf->entity); if ($result < 0) { @@ -129,7 +129,7 @@ if (getDolGlobalString('ADHERENT_USE_SPIP')) { //$link.=$langs->trans("Disable"); $link .= img_picto($langs->trans("Activated"), 'switch_on'); $link .= ''; - // Edition des varibales globales + // Edition des variables globales $constantes = array( 'ADHERENT_SPIP_SERVEUR', 'ADHERENT_SPIP_DB', diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index a784792ae02..2e28b567e41 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -209,7 +209,7 @@ print ''; print ''; // Title rule for stock decrease -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("PlaceCustomerAddressToIsoLocation").''; if ($conf->use_javascript_ajax) { @@ -568,7 +568,7 @@ if ($conf->use_javascript_ajax) { } print '
    '.$langs->trans("BoldLabelOnPDF").''; if ($conf->use_javascript_ajax) { @@ -578,7 +578,7 @@ if ($conf->use_javascript_ajax) { } print '
    '.$langs->trans("BoldRefAndPeriodOnPDF").''; if ($conf->use_javascript_ajax) { diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 23c34f57fcf..0f6d91f26eb 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -186,8 +186,8 @@ if ($action == 'updateMask') { $ret = addDocumentModel($value, $type, $label, $scandir); } } elseif ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be active + // by calling method canBeActivated dolibarr_set_const($db, "PROPALE_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif (preg_match('/set_(.*)/', $action, $reg)) { @@ -437,7 +437,7 @@ foreach ($dirmodels as $reldir) { print ""; if ($conf->global->PROPALE_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php index 61a30f80fc6..2f921128690 100644 --- a/htdocs/admin/reception_setup.php +++ b/htdocs/admin/reception_setup.php @@ -378,7 +378,7 @@ foreach ($dirmodels as $reldir) { print "'; if ($conf->global->RECEPTION_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index 9b421a17a6d..abdcb33770b 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -83,7 +83,7 @@ print ''.$langs->trans("Value").'
    '.$langs->trans("UseSearchToSelectResource").'
    '; print ''; print "\n"; @@ -305,7 +305,7 @@ print '
    '; // Title rule for stock increase -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    ".$langs->trans("RuleForStockManagementDecrease")."
    '; print ''; print "\n"; @@ -410,7 +410,7 @@ print ''; print '
    '; -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    ".$langs->trans("RuleForStockManagementIncrease")."
    '; print ''; print "\n"; @@ -488,7 +488,7 @@ if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') } if ($virtualdiffersfromphysical) { - print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    ".$langs->trans("RuleForStockAvailability")."
    '; print ''; print "\n"; @@ -548,7 +548,7 @@ if ($resql) { } -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    ".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))."
    '."\n"; print ''."\n"; print ''; @@ -675,7 +675,7 @@ print ''; print load_fiche_titre($langs->trans("Other"), '', ''); -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Name").'
    '; print ''; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index b15f06d4867..52b1342f88e 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -157,8 +157,8 @@ if ($action == 'specimen') { // For invoices } if ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be activated + // by calling method canBeActivated dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity); } diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index fa6e884d1bf..849a6dff7f3 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -145,8 +145,8 @@ if ($action == 'specimen') { // For orders } elseif ($action == 'unsetdoc') { dolibarr_del_const($db, "COMMANDE_SUPPLIER_ADDON_PDF", $conf->entity); } elseif ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be activated + // by calling method canBeActivated dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity); } elseif ($action == 'addcat') { diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index ec7ea316c04..ef3dfb2fd99 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -176,8 +176,8 @@ if ($action == 'set') { $ret = addDocumentModel($value, $type, $label, $scandir); } } elseif ($action == 'setmod') { - // TODO Verifier si module numerotation choisi peut etre active - // par appel methode canBeActivated + // TODO Verify if the chosen numbering module can be activated + // by calling method canBeActivated dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON", $value, 'chaine', 0, '', $conf->entity); } elseif (preg_match('/set_(.*)/', $action, $reg)) { @@ -426,7 +426,7 @@ foreach ($dirmodels as $reldir) { print ""; } - // Defaut + // Default print '
    '; if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 6f8ecb0f806..71dc5df45f6 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -110,7 +110,7 @@ if ($action == 'set') { $activeModules = $newActiveModules; - dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure ther is not a setup into another entity + dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure there is not a setup into another entity dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0); // Check configuration @@ -194,7 +194,7 @@ print load_fiche_titre($langs->trans("SyslogOutput"), '', ''); print ''; print ''; -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; print ''; @@ -286,7 +286,7 @@ print load_fiche_titre($langs->trans("SyslogLevel"), '', ''); print ''; print ''; -print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
    '; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
    '.$langs->trans("Type").'
    '; print ''; print ''; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index f86b6404019..8c6897f8143 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -19,7 +19,7 @@ /** * \file htdocs/admin/system/browser.php - * \brief Page to show Dolibarr informations + * \brief Page to show Dolibarr information */ // Load Dolibarr environment diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index dcf41aacf25..f7cc9050c25 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -158,7 +158,7 @@ foreach ($configfileparameters as $key) { if (preg_match('/^\?/', $key) && empty(${$newkey})) { $i++; - continue; // We discard parametes starting with ? + continue; // We discard parameters starting with ? } if ($newkey == 'separator' && $lastkeyshown == 'separator') { diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 424ca02458a..b2e070f0815 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -85,7 +85,7 @@ print '
    '.$langs->trans("Parameter").''.$langs->trans("Value").'
    '.$langs->trans("Ver print '
    '.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')'.DOL_VERSION; // If current version differs from last upgrade if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) { - // Compare version with last install database version (upgrades never occured) + // Compare version with last install database version (upgrades never occurred) if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) { print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_INSTALL'))); } diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 177dd99cb67..aecb1fd6f7a 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -59,7 +59,7 @@ print '
    '.$langs->trans("VersionLastUpgrade") print '
    '.$langs->trans("VersionProgram").''.DOL_VERSION; // If current version differs from last upgrade if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) { - // Compare version with last install database version (upgrades never occured) + // Compare version with last install database version (upgrades never occurred) if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) { print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_INSTALL'))); } @@ -262,7 +262,7 @@ if (empty($error) && !empty($xml)) { } } - // Files missings + // Files missing $out .= load_fiche_titre($langs->trans("FilesMissing")); $out .= '
    '; diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php index 6ad04701a52..5e47edf1eca 100644 --- a/htdocs/admin/system/security.php +++ b/htdocs/admin/system/security.php @@ -634,7 +634,7 @@ if (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') != 'password_hash') { print '
    '; } if (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') != 'password_hash') { - print '
    The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.
    '; + print '
    The recommended value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.
    '; print 'If you really want to switch, you must:
    '; print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'
    '; print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password
    '; diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php index 4453dc694d4..7fba49adbf0 100644 --- a/htdocs/admin/system/xcache.php +++ b/htdocs/admin/system/xcache.php @@ -51,11 +51,11 @@ if (!function_exists('xcache_info')) { print 'Opcode cache XCache is on

    '."\n\n"; -print $langs->trans("Split").': '.ini_get('xcache.count').'       '.$langs->trans("Recommanded").': (cat /proc/cpuinfo | grep -c processor) + 1
    '."\n"; -print $langs->trans("Size").': '.ini_get('xcache.size').'       '.$langs->trans("Recommanded").': 16*Split
    '."\n"; +print $langs->trans("Split").': '.ini_get('xcache.count').'       '.$langs->trans("Recommended").': (cat /proc/cpuinfo | grep -c processor) + 1
    '."\n"; +print $langs->trans("Size").': '.ini_get('xcache.size').'       '.$langs->trans("Recommended").': 16*Split
    '."\n"; print $langs->trans("xcache.cacher").': '.yn(ini_get('xcache.cacher')).'
    '."\n"; -print $langs->trans("xcache.optimizer").': '.yn(ini_get('xcache.optimizer')).' (will be usefull only with xcache v2)
    '."\n"; +print $langs->trans("xcache.optimizer").': '.yn(ini_get('xcache.optimizer')).' (will be useful only with xcache v2)
    '."\n"; print $langs->trans("xcache.stat").': '.yn(ini_get('xcache.stat')).'
    '."\n"; print $langs->trans("xcache.coverager").': '.yn(ini_get('xcache.coverager')).'
    '."\n"; diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php index 5854d2f2261..719b81859c3 100644 --- a/htdocs/admin/system/xdebug.php +++ b/htdocs/admin/system/xdebug.php @@ -64,7 +64,7 @@ if (function_exists('socket_create')) { if (function_exists('xdebug_get_profiler_filename')) { print xdebug_get_profiler_filename() ? "(currently on into file ".xdebug_get_profiler_filename().")" : "(currently off)"; } else { - print "(currenlty not available)"; + print "(currently not available)"; } print ":
    \n"; print 'xdebug.profiler_enable = '.ini_get('xdebug.profiler_enable')."
    \n"; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index e78d85ec6f5..f917784870e 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -197,7 +197,7 @@ if (empty($mysoc->tva_assuj)) { print ''; - // Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT + // Case for the parameters TAX_MODE_SELL/BUY_SERVICE/PRODUCT print ''; print ''; print "\n"; diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 9789527d024..7fd6a95a4c9 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -142,7 +142,7 @@ if (in_array($type, array('mysql', 'mysqli'))) { print '
    '; print ''.$langs->trans('RestoreMySQL').''; print '
    '; - // Parameteres execution + // Parameters execution $command = $db->getPathOfRestore(); if (preg_match("/\s/", $command)) { $command = $command = escapeshellarg($command); // Use quotes on command @@ -176,7 +176,7 @@ if (in_array($type, array('mysql', 'mysqli'))) { print '
    '; print 'Restore PostgreSQL'; print '
    '; - // Parameteres execution + // Parameters execution $command = $db->getPathOfRestore(); if (preg_match("/\s/", $command)) { $command = $command = escapeshellarg($command); // Use quotes on command diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index ec09a3700ef..1254bdeedc7 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -104,7 +104,7 @@ $usefilter = 0; $listofsessions = listOfSessions(); $num = count($listofsessions); -print_barre_liste($langs->trans("Sessions"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, ($num ? $num : ''), 'setup'); // Do not show numer (0) if no session found (it means we can't know) +print_barre_liste($langs->trans("Sessions"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, ($num ? $num : ''), 'setup'); // Do not show number (0) if no session found (it means we can't know) $savehandler = ini_get("session.save_handler"); $savepath = ini_get("session.save_path"); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index bc006525992..2053df210be 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir) { print ""; } - // Defaut + // Default print '
    "; } - // Defaut + // Default print '
    '.$langs->trans('OptionVatMode').''.$langs->trans('Description').'
    '; if (getDolGlobalString('USER_ADDON_PDF_ODT') == $name) { //print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index 8dcf7d2a8b5..19d6a23afd2 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -201,7 +201,7 @@ foreach ($dirmodels as $reldir) { print "'; if (getDolGlobalString('USERGROUP_ADDON_PDF') == $name) { print img_picto($langs->trans("Default"), 'on'); diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php index cc7527579aa..4301353540f 100644 --- a/htdocs/admin/webhook.php +++ b/htdocs/admin/webhook.php @@ -330,7 +330,7 @@ if ($action == 'edit') { if ($result < 0) { setEventMessages(null, $c->errors, 'errors'); } elseif ($result > 0) { - $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text + $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text $toprint = array(); foreach ($ways as $way) { $toprint[] = '
  • color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '
  • '; diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 7ab168c2cdf..47a019fb9a2 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -450,7 +450,7 @@ if ($id) { // Determine le nom du champ par rapport aux noms possibles // dans les dictionnaires de donnees - $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut + $valuetoshow = ucfirst($fieldlist[$field]); // By default $valuetoshow = $langs->trans($valuetoshow); // try to translate $align = ''; if ($fieldlist[$field] == 'lang') { @@ -528,7 +528,7 @@ if ($id) { foreach ($fieldlist as $field => $value) { // Determine le nom du champ par rapport aux noms possibles // dans les dictionnaires de donnees - $showfield = 1; // Par defaut + $showfield = 1; // By default $align = "left"; $sortable = 1; $valuetoshow = ''; @@ -543,7 +543,7 @@ if ($id) { $align=$tmp['align']; $sortable=$tmp['sortable']; */ - $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut + $valuetoshow = ucfirst($fieldlist[$field]); // By default $valuetoshow = $langs->trans($valuetoshow); // try to translate if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); @@ -678,7 +678,7 @@ $db->close(); * @param array $fieldlist Array of fields * @param Object $obj If we show a particular record, obj is filled with record fields * @param string $tabname Name of SQL table - * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered + * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered * @return void */ function fieldListWebsites($fieldlist, $obj = null, $tabname = '', $context = '')