diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 88f4272deef..73b3ede941f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -45,6 +45,7 @@ if (! empty($conf->tax->enabled)) //if (!$user->rights->compta->general->lire) // accessforbidden(); +// Load translation files required by page $langs->loadLangs(array('compta', 'bills')); if (! empty($conf->commande->enabled)) $langs->load("orders"); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 1e992eab959..7bec5e79491 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +// Load translation files required by page $langs->loadLangs(array('companies', 'bills', 'banks', 'multicurrency')); $action = GETPOST('action','alpha'); diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index f47d21174b1..982fa045d32 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; -// Load traductions files +// Load translation files required by page $langs->loadLangs(array('ecm', 'companies', 'other')); $action = GETPOST('action','alpha'); diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index b7b7e800a74..b1b45141f4f 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; -// Load traductions files +// Load translation files required by page $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal', 'bills', 'contracts', 'categories')); $action = GETPOST('action', 'aZ09'); diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 6dff84c5742..906dbda4f6e 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -37,12 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; -$langs->load('companies'); -$langs->load('suppliers'); -$langs->load('products'); -$langs->load('bills'); -$langs->load('orders'); -$langs->load('commercial'); +// Load translation files required by page +$langs->loadLangs(array( + 'companies', + 'suppliers', + 'products', + 'bills', + 'orders', + 'commercial', +)); $action = GETPOST('action','aZ09'); $cancelbutton = GETPOST('cancel','alpha'); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 300c62a71bd..596c4634da4 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -32,6 +32,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/lib/import.lib.php'; +// Load translation files required by page $langs->loadLangs(array('exports', 'compta', 'errors')); // Security check diff --git a/htdocs/index.php b/htdocs/index.php index d9277be12f0..b7e8aed91d3 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -110,6 +110,7 @@ print '
'; */ $boxstat=''; +// Load translation files required by page $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts')); if (empty($user->societe_id)) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6187eefbd8f..ffa3d59c373 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -474,6 +474,7 @@ if (! defined('NOLOGIN')) if (! $ok) { dol_syslog('Bad value for code, connexion refused'); + // Load translation files required by page $langs->loadLangs(array('main', 'errors')); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode"); @@ -551,6 +552,7 @@ if (! defined('NOLOGIN')) if (! $login) { dol_syslog('Bad password, connexion refused',LOG_DEBUG); + // Load translation files required by page $langs->loadLangs(array('main', 'errors')); // Bad password. No authmode has found a good password. @@ -600,6 +602,7 @@ if (! defined('NOLOGIN')) if ($resultFetchUser == 0) { + // Load translation files required by page $langs->loadLangs(array('main', 'errors')); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login); @@ -658,6 +661,7 @@ if (! defined('NOLOGIN')) if ($resultFetchUser == 0) { + // Load translation files required by page $langs->loadLangs(array('main', 'errors')); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login); @@ -931,6 +935,7 @@ dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action',' // Load main languages files if (! defined('NOREQUIRETRAN')) { + // Load translation files required by page $langs->loadLangs(array('main', 'dict')); } diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 33b693cb3db..7b47e8083dc 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; +// Load translation files required by page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $mesg = ''; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index fced36e8945..4775f8b5885 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php'; +// Load translation files required by page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $action = GETPOST('action','alpha'); diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 90b0b9d11ca..fa919da9716 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; +// Load translation files required by page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); // Security check diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 160be439b7c..f147f334166 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; +// Load translation files required by page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $id = GETPOST('id', 'int');