diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index 6116423bdec..40fd63d7639 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -30,10 +30,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("companies"); -$langs->load("admin"); -$langs->load("members"); -$langs->load('interventions'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index df06bab1336..eab70d5d585 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -30,10 +30,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("companies"); -$langs->load("admin"); -$langs->load("members"); -$langs->load('interventions'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 540f897ffe5..b0d085838a8 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -51,9 +51,8 @@ if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ." require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("bills"); -$langs->load("companies"); -$langs->load("interventions"); +// Load translation files required by the page +$langs->loadLangs(array('bills', 'companies', 'interventions')); $id = GETPOST('id','int'); $ref = GETPOST('ref','alpha'); diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index d7be9c95cec..d3b2ea6f78e 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; -$langs->load("interventions"); -$langs->load("sendings"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('interventions', 'sendings', 'companies')); $id = GETPOST('id','int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 4c6d51e89fe..6e84f457eb1 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -38,10 +38,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load("other"); -$langs->load("fichinter"); -$langs->load("companies"); -$langs->load("interventions"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'fichinter', 'companies', 'interventions')); $id = GETPOST('id','int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 1a4068f5911..474c6774f26 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT .'/fichinter/class/fichinter.class.php'; if (!$user->rights->ficheinter->lire) accessforbidden(); +// Load translation files required by the page $langs->load("interventions"); // Security check diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 0a685999afe..fe3d14191d6 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -32,8 +32,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load('companies'); -$langs->load("interventions"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'interventions')); $socid=0; $id = GETPOST('id','int'); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 87d8b366ef8..17a25071e68 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -$langs->load("companies"); -$langs->load("bills"); -$langs->load("interventions"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'bills', 'interventions')); $action=GETPOST('action','alpha'); $massaction=GETPOST('massaction','alpha'); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index cf15841dce9..cece45fdab5 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -31,8 +31,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load('companies'); -$langs->load("interventions"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'interventions')); $id = GETPOST('id','int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 1048dde3c51..c46d76ce4ba 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/modulebuilder.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin", "modulebuilder", "other", "cron")); $action=GETPOST('action','aZ09'); diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php index 0b9eb9bf7ee..bf56d00ede0 100644 --- a/htdocs/modulebuilder/template/mymoduleindex.php +++ b/htdocs/modulebuilder/template/mymoduleindex.php @@ -41,6 +41,7 @@ if (! $res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule")); $action=GETPOST('action', 'alpha'); diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php index 38f462a93c7..5c7303ba6a9 100644 --- a/htdocs/modulebuilder/template/myobject_agenda.php +++ b/htdocs/modulebuilder/template/myobject_agenda.php @@ -44,7 +44,7 @@ dol_include_once('/mymodule/class/myobject.class.php'); dol_include_once('/mymodule/lib/myobject.lib.php'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule","other")); // Get parameters diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 5e7612053c6..9e2e48ce6cf 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -62,7 +62,7 @@ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); dol_include_once('/mymodule/class/myobject.class.php'); dol_include_once('/mymodule/lib/myobject.lib.php'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule","other")); // Get parameters diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index 124fa031487..c08a360835a 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; dol_include_once('/mymodule/class/myobject.class.php'); dol_include_once('/mymodule/lib/myobject.lib.php'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule","companies","other","mails")); diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index eeeda4e3021..b81fee8bbcb 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -60,7 +60,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; dol_include_once('/mymodule/class/myobject.class.php'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule","other")); $action = GETPOST('action','aZ09')?GETPOST('action','aZ09'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php index 4ee7e9fb861..5b438c32a7c 100644 --- a/htdocs/modulebuilder/template/myobject_note.php +++ b/htdocs/modulebuilder/template/myobject_note.php @@ -40,7 +40,7 @@ if (! $res) die("Include of main fails"); dol_include_once('/mymodule/class/myobject.class.php'); dol_include_once('/mymodule/lib/myobject.lib.php'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("mymodule@mymodule","companies")); // Get parameters diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index 93e913c1585..663d4ad704a 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -32,6 +32,7 @@ if (!$user->rights->opensurvey->read) accessforbidden(); * View */ + // Load translation files required by the page $langs->load("opensurvey"); llxHeader(); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 77934e68744..900168cafb5 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -58,6 +58,7 @@ $pagenext = $page + 1; if (! $sortfield) $sortfield="p.date_fin"; if (! $sortorder) $sortorder="DESC"; +// Load translation files required by the page $langs->load("opensurvey"); diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 1db6c1906a3..4c68abab520 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -29,10 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $servicename='PayBox'; -$langs->load("admin"); -$langs->load("other"); -$langs->load("paybox"); -$langs->load("paypal"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal')); if (!$user->admin) accessforbidden(); diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 23bf26d375f..381151cac93 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -32,10 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $servicename='PayPal'; -$langs->load("admin"); -$langs->load("other"); -$langs->load("paypal"); -$langs->load("paybox"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'paypal', 'paybox')); if (! $user->admin) accessforbidden(); diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index 66d1b0ac6f3..96b9cad3849 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -30,9 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php'; require_once DOL_DOCUMENT_ROOT.'/printing/lib/printing.lib.php'; use OAuth\Common\Storage\DoliStorage; -$langs->load("admin"); -$langs->load("printing"); -$langs->load("oauth"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'printing', 'oauth')); if (! $user->admin) accessforbidden(); diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php index 4fd21e6abc6..384d0834cc0 100644 --- a/htdocs/printing/index.php +++ b/htdocs/printing/index.php @@ -25,6 +25,7 @@ require '../main.inc.php'; include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php'; +// Load translation files required by the page $langs->load("printing"); diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index bd7fce52b77..348380e9b37 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable_updater.class.php'; +// Load translation files required by the page $langs->load("products"); $id = GETPOST('id', 'int'); diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 088c0126417..0049daeaa7d 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -23,8 +23,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; -$langs->load("admin"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'products')); // Security check if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 63f10296212..bb214ffc06a 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","products")); // Security check diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php index 856151a8238..849b346244d 100644 --- a/htdocs/product/admin/product_extrafields.php +++ b/htdocs/product/admin/product_extrafields.php @@ -29,9 +29,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("companies"); -$langs->load("admin"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'admin', 'products')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php index 20f3b9d30b9..be3651344ff 100644 --- a/htdocs/product/admin/product_lot_extrafields.php +++ b/htdocs/product/admin/product_lot_extrafields.php @@ -29,10 +29,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("companies"); -$langs->load("admin"); -$langs->load("products"); -$langs->load("productbatch"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'admin', 'products', 'productbatch')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index c9323f75823..291aba9bcf1 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; -$langs->load("admin"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'products')); // Security check if (! $user->admin) accessforbidden(); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 3dc10ec8f32..2167f15a7e5 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -$langs->load("bills"); -$langs->load("products"); -$langs->load("stocks"); +// Load translation files required by the page +$langs->loadLangs(array('bills', 'products', 'stocks')); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index bcf18750981..9187775f8e9 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.cl require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; -$langs->load("products"); -$langs->load("accountancy"); //"Back" translation is on this file +// Load translation files required by the page +$langs->loadLangs(array('products', 'accountancy')); //"Back" translation is on this accountancy file $id = GETPOST('id', 'int'); $eid = GETPOST('eid', 'int');