From 30a3b95368b89c42f1e407577527cd6d4c1d3420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 20:32:23 +0200 Subject: [PATCH] loadlangs --- htdocs/comm/address.php | 4 ++-- htdocs/comm/contact.php | 1 + htdocs/comm/mailing/card.php | 1 + htdocs/comm/mailing/cibles.php | 1 + htdocs/comm/mailing/index.php | 4 ++-- htdocs/comm/mailing/info.php | 1 + htdocs/comm/mailing/list.php | 1 + htdocs/comm/propal/card.php | 10 ++-------- htdocs/comm/propal/contact.php | 6 ++---- htdocs/comm/propal/document.php | 5 ++--- htdocs/comm/propal/index.php | 4 ++-- htdocs/comm/propal/info.php | 4 ++-- htdocs/comm/propal/list.php | 1 + htdocs/comm/propal/note.php | 6 ++---- htdocs/comm/propal/stats/index.php | 7 ++----- htdocs/comm/propal/tpl/linkedobjectblock.tpl.php | 1 + htdocs/comm/prospect/index.php | 1 + htdocs/comm/prospect/recap-prospect.php | 4 ++-- htdocs/commande/card.php | 1 + htdocs/commande/contact.php | 5 ++--- htdocs/commande/document.php | 5 ++--- htdocs/commande/index.php | 4 ++-- htdocs/commande/info.php | 4 ++-- htdocs/commande/list.php | 1 + htdocs/commande/note.php | 6 ++---- htdocs/commande/stats/index.php | 6 ++---- htdocs/commande/tpl/linkedobjectblock.tpl.php | 3 ++- htdocs/contact/agenda.php | 6 ++---- htdocs/contact/card.php | 7 +++---- htdocs/contact/document.php | 5 ++--- htdocs/contact/info.php | 1 + htdocs/contact/ldap.php | 4 ++-- htdocs/contact/list.php | 1 + htdocs/contact/note.php | 1 + htdocs/contact/perso.php | 4 ++-- htdocs/contrat/admin/contract_extrafields.php | 2 +- htdocs/contrat/admin/contractdet_extrafields.php | 5 ++--- htdocs/contrat/card.php | 1 + htdocs/contrat/contact.php | 5 ++--- htdocs/contrat/document.php | 5 ++--- htdocs/contrat/index.php | 5 ++--- htdocs/contrat/info.php | 1 + htdocs/contrat/list.php | 6 ++---- htdocs/contrat/note.php | 4 ++-- htdocs/contrat/services_list.php | 5 ++--- htdocs/contrat/tpl/linkedobjectblock.tpl.php | 1 + 46 files changed, 76 insertions(+), 90 deletions(-) diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 6547f453b21..9c8b275d198 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php'; -$langs->load("companies"); -$langs->load("commercial"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'commercial')); $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index fe2e3027dcf..aa8dae43140 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -26,6 +26,7 @@ require '../main.inc.php'; +// Load translation files required by the page $langs->load("companies"); $sortfield=GETPOST('sortfield', 'alpha'); diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index bb68f85ea16..97746ad9d82 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +// Load translation files required by the page $langs->load("mails"); if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden(); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index ccbca0fd419..ef3fa3d81a9 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +// Load translation files required by the page $langs->load("mails"); // Security check diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 4175c4e4446..17693a1a73c 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -27,8 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -$langs->load("commercial"); -$langs->load("orders"); +// Load translation files required by the page +$langs->loadLangs(array('commercial', 'orders')); // Security check diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index ddb0d4a8fc6..b4f2eaeb6f3 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; $id=GETPOST('id'); +// Load translation files required by the page $langs->load("mails"); // Security check diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index a85e5e4c01e..a8432427ca8 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -25,6 +25,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php'; +// Load translation files required by the page $langs->load("mails"); // Security check diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 83e90677566..817115d93af 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -56,14 +56,8 @@ if (!empty($conf->variants->enabled)) { require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; } -$langs->load('companies'); -$langs->load('propal'); -$langs->load('compta'); -$langs->load('bills'); -$langs->load('orders'); -$langs->load('products'); -$langs->load("deliveries"); -$langs->load('sendings'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'sendings')); if (!empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (! empty($conf->margin->enabled)) $langs->load('margins'); diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index eff22ba4358..5e21f493c64 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -32,10 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; -$langs->load("facture"); -$langs->load("orders"); -$langs->load("sendings"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('facture', 'orders', 'sendings', 'companies')); $id=GETPOST('id','int'); $ref= GETPOST('ref','alpha'); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index aab9cfcb30a..1c8d494214d 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -36,9 +36,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load('compta'); -$langs->load('other'); -$langs->load('companies'); +// Load translation files required by the page +$langs->loadLangs(array('compta', 'other', 'companies')); $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index e9dce10ea0b..0dbe2fb855e 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -27,8 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php'; -$langs->load("propal"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('propal', 'companies')); // Security check $socid=GETPOST('socid','int'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index 67cc8210402..317c9902d52 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -32,8 +32,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load('propal'); -$langs->load('compta'); +// Load translation files required by the page +$langs->loadLangs(array('propal', 'compta')); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index bcceaff32f2..7dc5ad82263 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +// Load translation files required by the page $langs->loadLangs(array('companies','propal','compta','bills','orders','products','deliveries')); $socid=GETPOST('socid','int'); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 17e53b89948..607cff245d9 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -33,10 +33,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load('propal'); -$langs->load('compta'); -$langs->load('bills'); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('propal', 'compta', 'bills', 'companies')); $id = GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 50ec740ea4a..ac6b42c45d8 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -54,11 +54,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; -$langs->load('orders'); -$langs->load('companies'); -$langs->load('other'); -$langs->load('suppliers'); -$langs->load('supplier_proposal'); +// Load translation files required by the page +$langs->loadLangs(array('orders', 'companies', 'other', 'suppliers', 'supplier_proposal')); /* diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 100cabc6023..bb8f6f623bb 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -41,6 +41,7 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; +// Load translation files required by the page $langs->load("propal"); $total=0; $ilink=0; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 7bdb6220493..2273012696f 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -26,6 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +// Load translation files required by the page $langs->load("propal"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index fe0fdc55b58..50127d719c8 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -26,8 +26,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -$langs->load("companies"); -$langs->load('other'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'other')); if (! empty($conf->facture->enabled)) $langs->load("bills"); // Security check diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 6d4fafa51ac..80a4befb16c 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -56,6 +56,7 @@ if (!empty($conf->variants->enabled)) { require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; } +// Load translation files required by the page $langs->loadLangs(array('orders','sendings','companies','bills','propal','deliveries','products','other')); if (!empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (! empty($conf->margin->enabled)) $langs->load('margins'); diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 0eb4ed2cd63..7669239134a 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; -$langs->load("orders"); -$langs->load("sendings"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('orders', 'sendings', 'companies')); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 84cc9977e20..ffebbaa260a 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -36,9 +36,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } - -$langs->load('companies'); -$langs->load('other'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'other')); $action = GETPOST('action','aZ09'); $confirm = GETPOST('confirm'); diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index feacdd70b07..5cfb87c7a25 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; if (!$user->rights->commande->lire) accessforbidden(); -$langs->load("orders"); -$langs->load("bills"); +// Load translation files required by the page +$langs->loadLangs(array('orders', 'bills')); // Security check $socid=GETPOST('socid','int'); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 518ab856474..4bac4a3a447 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -33,8 +33,8 @@ if (! empty($conf->projet->enabled)) { if (!$user->rights->commande->lire) accessforbidden(); -$langs->load("orders"); -$langs->load("sendings"); +// Load translation files required by the page +$langs->loadLangs(array('orders', 'sendings')); $socid=0; $comid = GETPOST("id",'int'); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index da4734a3f80..157ceb3734d 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -44,6 +44,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.'/projet/class/project.class.php'; +// Load translation files required by the page $langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills')); $action=GETPOST('action','aZ09'); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 6598805490d..6cff3bfb3bc 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -32,10 +32,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } - -$langs->load("companies"); -$langs->load("bills"); -$langs->load("orders"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'bills', 'orders')); $id = GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 27d177cfbd3..8f259808357 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -55,10 +55,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; -$langs->load('orders'); -$langs->load('companies'); -$langs->load('other'); -$langs->load('suppliers'); +// Load translation files required by the page +$langs->loadLangs(array('orders', 'companies', 'other', 'suppliers')); /* diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index d481ac32d90..5381143d8ac 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -36,6 +36,7 @@ global $noMoreLinkedObjectBlockAfter; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; +// Load translation files required by the page $langs->load("orders"); $total=0; $ilink=0; @@ -89,4 +90,4 @@ if (count($linkedObjectBlock) > 1) } ?> - \ No newline at end of file + diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index d443956a9fe..183433b02f9 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -44,10 +44,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -$langs->load("companies"); -$langs->load("users"); -$langs->load("other"); -$langs->load("commercial"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'users', 'other', 'commercial')); $mesg=''; $error=0; $errors=array(); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index bb67f0f183d..52957d25343 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -42,10 +42,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; -$langs->load("companies"); -$langs->load("users"); -$langs->load("other"); -$langs->load("commercial"); + +// Load translation files required by the page +$langs->loadLangs(array('companies', 'users', 'other', 'commercial')); $mesg=''; $error=0; $errors=array(); diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 2d729d8ebb4..1a60ddaaccb 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -30,9 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -$langs->load("other"); -$langs->load("companies"); -$langs->load("contact"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'companies', 'contact')); $id = GETPOST('id','int'); $action = GETPOST('action','aZ09'); diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 287c27d8b10..7ddee3f7722 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; +// Load translation files required by the page $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 02a25d8005c..045cdfcd2c5 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; -$langs->load("companies"); -$langs->load("ldap"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'ldap')); $langs->load("admin"); $action=GETPOST('action','aZ09'); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 8719c77f1b4..d04fe23a224 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -34,6 +34,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +// Load translation files required by the page $langs->loadLangs(array("companies", "suppliers")); $action=GETPOST('action','alpha'); diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 1fa766e0913..731dadb6433 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $action = GETPOST('action','aZ09'); +// Load translation files required by the page $langs->load("companies"); // Security check diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 9e85ef98294..3e5ec085132 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -27,8 +27,8 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; -$langs->load("companies"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'other')); $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php index a33d020d74d..b9b0d51c162 100644 --- a/htdocs/contrat/admin/contract_extrafields.php +++ b/htdocs/contrat/admin/contract_extrafields.php @@ -31,7 +31,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.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("companies","admin","contracts")); $extrafields = new ExtraFields($db); diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php index e3047466e1b..42a8ed589d7 100644 --- a/htdocs/contrat/admin/contractdet_extrafields.php +++ b/htdocs/contrat/admin/contractdet_extrafields.php @@ -31,9 +31,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("companies"); -$langs->load("admin"); -$langs->load("contracts"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'admin', 'contracts')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d474da18a85..d1b53e58495 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -46,6 +46,7 @@ if (! empty($conf->projet->enabled)) { } require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; +// Load translation files required by the page $langs->loadLangs(array("contracts","orders","companies","bills","products",'compta')); $action=GETPOST('action','alpha'); diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 1b81d9d13f6..4d403198eb8 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -33,9 +33,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } - -$langs->load("contracts"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('contracts', 'companies')); $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 53125f3063b..0208d68f80d 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -37,9 +37,8 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } -$langs->load("other"); -$langs->load("products"); -$langs->load("contracts"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'products', 'contracts')); $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 5d3a3603b8f..b78bf52b6be 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -28,9 +28,8 @@ require ("../main.inc.php"); require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -$langs->load("products"); -$langs->load("companies"); -$langs->load("contracts"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'companies', 'contracts')); $sortfield=GETPOST('sortfield','alpha'); $sortorder=GETPOST('sortorder','alpha'); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index b6c92eac27e..8899351c284 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -30,6 +30,7 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } +// Load translation files required by the page $langs->load("contracts"); $action = GETPOST('action','alpha'); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 61d62896cf1..c992bc558e8 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -35,10 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -$langs->load("contracts"); -$langs->load("products"); -$langs->load("companies"); -$langs->load("compta"); +// Load translation files required by the page +$langs->loadLangs(array('contracts', 'products', 'companies', 'compta')); $action=GETPOST('action','alpha'); $massaction=GETPOST('massaction','alpha'); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index ab76d9aaec3..c160201191a 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/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("contracts"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'contracts')); $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 0fc475c19fb..c94be74b0b8 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -30,9 +30,8 @@ require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -$langs->load("products"); -$langs->load("contracts"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'contracts', 'companies')); $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit; $sortfield = GETPOST("sortfield",'alpha'); diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index ae4a56ef4a9..a4b18716039 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -35,6 +35,7 @@ global $noMoreLinkedObjectBlockAfter; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; +// Load translation files required by the page $langs->load("contracts"); $total=0; $ilink=0;