@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$action=GETPOST('action','aZ09');
$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'adminaccoutant'; // To manage different context of search
-$langs->load("admin");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'companies'));
if (! $user->admin) accessforbidden();
@@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
if (!$user->admin)
accessforbidden();
-$langs->load("other");
-$langs->load("agenda");
+$langs->loadLangs(array('admin', 'other', 'agenda'));
$action = GETPOST('action','alpha');
$cancel = GETPOST('cancel','alpha');
@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($db);
$form = new Form($db);
@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if (!$user->admin) accessforbidden();
+$langs->loadLangs(array('agenda', 'admin', 'other'));
$def = array();
$actiontest=GETPOST('test','alpha');
@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$value = GETPOST('value','alpha');
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$langs->loadLangs(array("admin","other","agenda"));
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-// Load traductions files requiredby by page
$langs->loadLangs(array("admin","companies","bills","other","banks"));
@@ -30,8 +30,8 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-$langs->load("banks");
+$langs->loadLangs(array('banks', 'admin'));
@@ -28,6 +28,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
$langs->load("admin");
@@ -28,8 +28,8 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-$langs->load("boxes");
+$langs->loadLangs(array('admin', 'boxes'));
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
@@ -26,6 +26,7 @@
require '../main.inc.php';
@@ -36,10 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-$langs->load("errors");
-$langs->load("orders");
-$langs->load('other');
+$langs->loadLangs(array('admin', 'errors', 'orders', 'other'));
@@ -40,8 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'admincompany'; // To manage different context of search
@@ -29,9 +29,8 @@
-$langs->load('admin');
-$langs->load('compta');
-$langs->load('accountancy');
+$langs->loadLangs(array('admin', 'compta', 'accountancy'));
@@ -29,9 +29,8 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
-$langs->load("sendings");
-$langs->load("deliveries");
+$langs->loadLangs(array('admin', 'sendings', 'deliveries'));
@@ -27,6 +27,7 @@
if (! $user->admin)
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
$langs->loadLangs(array("admin","errors","contracts"));
@@ -25,6 +25,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
@@ -26,12 +26,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.formadmin.class.php';
-$langs->load("products");
-$langs->load("sms");
+$langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'errors'));
@@ -41,6 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
$langs->loadLangs(array("errors","admin","main","companies","resource","holiday","accountancy","hrm","orders","contracts","projects","propal","bills","interventions"));
$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
@@ -25,6 +25,7 @@
@@ -109,4 +110,4 @@ print '</td></tr>';
print '</table>';
llxFooter();
-$db->close();
+$db->close();
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
$langs->loadLangs(array("users","admin","other"));
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
$langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
@@ -35,10 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+$langs->loadLangs(array('admin', 'other', 'sendings', 'deliveries'));
@@ -37,9 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+$langs->loadLangs(array('admin', 'other', 'sendings'));
@@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-$langs->load("trips");
+$langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
@@ -33,10 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
$langs->loadLangs(array("admin","trips","errors","other","dict"));
@@ -181,4 +181,4 @@ echo '</form>';
dol_fiche_end();
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
$langs->loadLangs(array("admin","other","trips","errors","dict"));
@@ -356,4 +356,4 @@ echo '<script type="text/javascript"> $(function() {
@@ -31,9 +31,8 @@
-
-$langs->load("exports");
+$langs->loadLangs(array('admin', 'exports'));
$langs->load('other');
@@ -100,4 +99,4 @@ print '</table>';
@@ -31,6 +31,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/rssparser.class.php';
// Security check
@@ -33,10 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-$langs->load('bills');
+$langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
@@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/doleditor.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$langs->load("fckeditor");
+$langs->loadLangs(array('admin', 'fckeditor'));
// Possible modes are:
require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-$langs->load("interventions");
+$langs->loadLangs(array('admin', 'errors', 'interventions', 'other'));
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
$langs->loadLangs(array("admin","errors"));
$action = GETPOST('action','aZ09');
@@ -32,16 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-$langs->load("languages");
-$langs->load("members");
-$langs->load("projects");
-$langs->load("hrm");
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'projects', 'hrm', 'agenda'));
@@ -24,8 +24,8 @@
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+$langs->loadLangs(array('admin', 'errors'));
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
@@ -26,9 +26,8 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+$langs->loadLangs(array('companies', 'products', 'admin'));
@@ -38,8 +37,8 @@ if ($action == 'update')
{
$error=0;
$MAXDEC=8;
- if ($_POST["MAIN_MAX_DECIMALS_UNIT"] > $MAXDEC
- || $_POST["MAIN_MAX_DECIMALS_TOT"] > $MAXDEC
+ if ($_POST["MAIN_MAX_DECIMALS_UNIT"] > $MAXDEC
+ || $_POST["MAIN_MAX_DECIMALS_TOT"] > $MAXDEC
|| $_POST["MAIN_MAX_DECIMALS_SHOWN"] > $MAXDEC)
$error++;
require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
@@ -28,8 +28,8 @@ require '../main.inc.php';
-$langs->load("loan");
+$langs->loadLangs(array('admin', 'loan'));
@@ -123,4 +123,4 @@ print "</table>\n";
print '<br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
@@ -27,7 +27,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$langs->loadLangs(array("admin", "mails"));
@@ -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';
$langs->loadLangs(array("admin", "members", "mailmanspip"));
$langs->loadLangs(array("companies", "products", "admin", "mails", "other", "errors"));
$action=GETPOST('action','alpha');
@@ -27,12 +27,8 @@ require '../main.inc.php';
-$langs->load("mails");
+$langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors'));
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/emailsenderprofile.class.php';
$langs->loadLangs(array("errors","admin","mails","languages"));
$action = GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
$action = GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$cancel=GETPOST('cancel','alpha');
$langs->loadLangs(array("companies","products","admin","users","other"));
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+$langs->loadLangs(array('errors', 'admin'));
$mode=GETPOST('mode', 'alpha');
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
$langs->loadLangs(array("errors","admin","modulebuilder"));
@@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
-// Translations
-$langs->load("multicurrency");
+$langs->loadLangs(array('admin', 'multicurrency'));
// Access control
if (! $user->admin) {
@@ -29,13 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php';
-$langs->load("propal");
-$langs->load("bills");
+$langs->loadLangs(array('admin', 'other', 'orders', 'propal', 'bills', 'errors', 'mails'));
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
+/* Copyright (C) 2015-2018 Frederic France <frederic.france@netlogic.fr>
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -33,9 +33,8 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
-$langs->load("oauth");
+$langs->loadLangs(array('admin', 'oauth'));
@@ -1,6 +1,6 @@
/* Copyright (C) 2013-2016 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Frederic France <frederic.france@free.fr>
+ * Copyright (C) 2014-2018 Frederic France <frederic.france@netlogic.fr>
* it under the terms of the GNU General Public License as published by
@@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
use OAuth\Common\Storage\DoliStorage;
-$langs->load("printing");
+$langs->loadLangs(array('admin', 'printing', 'oauth'));
+$langs->loadLangs(array('admin', 'other', 'orders'));
@@ -35,9 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+$langs->loadlangs(array('admin', 'other', 'orders'));
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
$langs->loadLangs(array("admin", "other", "errors", "bills"));
@@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+$langs->loadLangs(array('admin', 'languages', 'other'));
$langs->load("companies");
$langs->load("products");
@@ -28,9 +28,8 @@ require '../main.inc.php';
-$langs->load("users");
+$langs->loadLangs(array('admin', 'users', 'other'));
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php';
require_once DOL_DOCUMENT_ROOT.'/api/class/api_access.class.php';
@@ -29,6 +29,7 @@ require '../../main.inc.php';
@@ -26,6 +26,7 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
$langs->loadLangs(array("assets","admin","companies"));
@@ -26,8 +26,8 @@ require '../../main.inc.php';
-$langs->load("assets");
+$langs->loadLangs(array('assets', 'admin'));
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
global $langs, $user;
$langs->loadLangs(array("admin", "assets"));
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
$langs->loadLangs(array("asset"));
// Get parameters
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
$langs->loadLangs(array("assets","companies"));
@@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
$id = GETPOST('id','int');
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->loadLangs(array("assets"));
@@ -26,7 +26,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
$langs->loadLangs(array("asset","companies"));
@@ -30,6 +30,7 @@ if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/l
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
$langs->load("assets");
$rowid = GETPOST('rowid','int');
@@ -42,7 +42,7 @@ if ($user->societe_id > 0)
if (! $user->rights->facture->creer)
$langs->loadLangs(array("companies", "orders"));
$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -39,7 +39,7 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
$langs->loadLangs(array("orders", "deliveries", "companies"));
@@ -35,11 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php';
-$langs->load("resource");
-$langs->load("main");
+$langs->loadLangs(array('resource', 'companies', 'other', 'main'));
@@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+$langs->loadLangs(array('resource', 'sendings', 'companies'));
$ref = GETPOST('ref','alpha');
@@ -35,9 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+$langs->loadLangs(array('other', 'resource', 'companies'));
@@ -36,10 +36,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+$langs->loadLangs(array('resource', 'other', 'interventions'));
/*
$sortorder = GETPOST('sortorder','alpha');
@@ -25,7 +25,7 @@
require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-// Load translations files required by page
$langs->loadLangs(array("resource","companies","other"));
@@ -29,8 +29,8 @@ require '../main.inc.php';
-$langs->load('companies');
+$langs->loadLangs(array('companies', 'interventions'));
@@ -41,7 +41,7 @@ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
include_once(DOL_DOCUMENT_ROOT.'/website/class/websiteaccount.class.php');
include_once(DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php');
$langs->loadLangs(array("website","other"));