From 67e0abdd664b0598e392e1e6703944a072750e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 18:52:14 +0200 Subject: [PATCH] loadlangs --- htdocs/admin/prelevement.php | 2 +- htdocs/admin/propal.php | 2 +- htdocs/admin/proxy.php | 2 +- htdocs/admin/receiptprinter.php | 2 +- htdocs/admin/resource.php | 2 +- htdocs/admin/resource_extrafields.php | 5 ++--- htdocs/admin/salaries.php | 4 ++-- htdocs/admin/security.php | 2 +- htdocs/admin/security_file.php | 5 ++--- htdocs/admin/security_other.php | 2 +- htdocs/admin/sms.php | 2 +- htdocs/admin/spip.php | 2 +- htdocs/admin/stock.php | 2 +- htdocs/admin/supplier_invoice.php | 2 +- htdocs/admin/supplier_order.php | 2 +- htdocs/admin/supplier_payment.php | 2 +- htdocs/admin/supplier_proposal.php | 2 +- htdocs/admin/supplierinvoice_extrafields.php | 1 + htdocs/admin/supplierinvoicedet_extrafields.php | 7 ++----- htdocs/admin/supplierorder_extrafields.php | 5 ++--- htdocs/admin/supplierorderdet_extrafields.php | 5 ++--- htdocs/admin/syslog.php | 2 +- htdocs/admin/taxes.php | 6 ++---- htdocs/admin/ticketsup.php | 2 +- htdocs/admin/ticketsup_extrafields.php | 4 ++-- htdocs/admin/translation.php | 1 + htdocs/admin/triggers.php | 1 + htdocs/admin/user.php | 5 ++--- htdocs/admin/usergroup.php | 2 +- htdocs/admin/website.php | 6 ++---- htdocs/admin/website_options.php | 6 ++---- htdocs/admin/workflow.php | 1 + 32 files changed, 43 insertions(+), 53 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 203b4ed9bc5..6fd40cf2825 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin","withdrawals")); // Security check diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 7ee44a93b52..94b1d1dac67 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "other", "errors", "propal")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index a9028635991..87a89f5d99b 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -26,7 +26,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("other", "users", "admin")); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 52141900517..4465017bdc6 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/receiptprinter.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin","receiptprinter")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index ec656c8319a..e8f8bdba204 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php'; if (! empty($conf->resouce->enabled)) require_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin","resource")); // Security check diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php index e77ebc19902..8193d146aaa 100644 --- a/htdocs/admin/resource_extrafields.php +++ b/htdocs/admin/resource_extrafields.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (!$user->admin) accessforbidden(); -$langs->load("admin"); -$langs->load("other"); -$langs->load("resource"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'resource')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index 7d3c0eaad77..6c5281173c3 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -28,8 +28,8 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; -$langs->load("admin"); -$langs->load("salaries"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'salaries')); // Security check if (!$user->admin) diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 7a216c35423..129853837a4 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $action=GETPOST('action','aZ09'); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("users","admin","other")); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index 7ce087ead6f..4a4637185ca 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -$langs->load("users"); -$langs->load("admin"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array('users', 'admin', 'other')); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 6cea0e6927a..6503ab10f77 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("users","admin","other")); if (! $user->admin) diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 9d18d443775..db1cb20b5e3 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -25,7 +25,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("companies","admin","products","sms","other","errors")); if (!$user->admin) diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index 850625859b6..b9892fdf2a9 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "members", "mailmanspip")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 2e6cd133942..e1098ef262d 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -28,7 +28,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "stocks")); // Securit check diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 485e8fc06b2..75a917dd185 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "other", "orders")); if (!$user->admin) diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index dd0b136ef4f..e3493f432c2 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "other", "orders")); if (!$user->admin) diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index 81ac029e244..c1f3a7cb25d 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "errors", "other", "bills", "orders")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 6c9e01b621b..99069447e81 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "errors", "other", "supplier_proposal")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php index 8ed25fbd036..7e913772e2c 100644 --- a/htdocs/admin/supplierinvoice_extrafields.php +++ b/htdocs/admin/supplierinvoice_extrafields.php @@ -31,6 +31,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +// Load translation files required by the page $langs->load("orders"); if (!$user->admin) diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php index 8fd202076d1..d8156d54779 100644 --- a/htdocs/admin/supplierinvoicedet_extrafields.php +++ b/htdocs/admin/supplierinvoicedet_extrafields.php @@ -36,11 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (!$user->admin) accessforbidden(); -$langs->load("admin"); -$langs->load("other"); -$langs->load("bills"); -$langs->load("orders"); -$langs->load("suppliers"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'bills', 'orders', 'suppliers')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php index a95650c7524..30cf4d983e4 100644 --- a/htdocs/admin/supplierorder_extrafields.php +++ b/htdocs/admin/supplierorder_extrafields.php @@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (!$user->admin) accessforbidden(); -$langs->load("admin"); -$langs->load("other"); -$langs->load("orders"); + // Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'orders')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php index a6f2a75952a..85106bf84f0 100644 --- a/htdocs/admin/supplierorderdet_extrafields.php +++ b/htdocs/admin/supplierorderdet_extrafields.php @@ -35,9 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (!$user->admin) accessforbidden(); -$langs->load("admin"); -$langs->load("other"); -$langs->load("orders"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'other', 'orders')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 10299015b8b..45dc91a8b95 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -31,7 +31,7 @@ global $conf; if (!$user->admin) accessforbidden(); -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin","other")); $error=0; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 0374e3c8e42..7c4bf64909f 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -29,10 +29,8 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; -$langs->load('admin'); -$langs->load('objects'); -$langs->load("companies"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'objects', 'companies', 'products')); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php index 9b0cc0e2684..2ad8f631566 100644 --- a/htdocs/admin/ticketsup.php +++ b/htdocs/admin/ticketsup.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; require_once DOL_DOCUMENT_ROOT."/ticketsup/class/ticketsup.class.php"; require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php"; -// Translations +// Load translation files required by the page $langs->load("ticketsup"); // Access control diff --git a/htdocs/admin/ticketsup_extrafields.php b/htdocs/admin/ticketsup_extrafields.php index 5709472e858..26bf231e0e8 100644 --- a/htdocs/admin/ticketsup_extrafields.php +++ b/htdocs/admin/ticketsup_extrafields.php @@ -26,8 +26,8 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php"; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; -$langs->load("ticketsup"); -$langs->load("admin"); +// Load translation files required by the page +$langs->loadLangs(array('ticketsup', 'admin')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 74494ee09ea..55a407c3e61 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +// Load translation files required by the page $langs->loadLangs(array("companies","products","admin","sms","other","errors")); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index ca14869cb2e..1a1893e2eb0 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -23,6 +23,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; +// Load translation files required by the page $langs->load("admin"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index a7b1c5b9373..f888c8410bb 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("admin"); -$langs->load("members"); -$langs->load("users"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'members', 'users')); if (! $user->admin) accessforbidden(); $extrafields = new ExtraFields($db); diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index 7ee7d050b4b..28f1ad6af2f 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("admin", "members", "users")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 73063c2b036..80144f93c1f 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -31,10 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; -$langs->load("errors"); -$langs->load("admin"); -$langs->load("companies"); -$langs->load("website"); +// Load translation files required by the page +$langs->loadlangs(array('errors', 'admin', 'companies', 'website')); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; $confirm=GETPOST('confirm','alpha'); diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index e54f19dc8c9..c688da0e550 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -31,10 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; -$langs->load("errors"); -$langs->load("admin"); -$langs->load("companies"); -$langs->load("website"); +// Load translation files required by the page +$langs->loadLangs(array('errors', 'admin', 'companies', 'website')); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; $confirm=GETPOST('confirm','alpha'); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 79dacc3276e..da87cfd32c9 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -27,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","workflow","propal","workflow","orders","supplier_proposals")); if (! $user->admin) accessforbidden();