From 622c394283f00f52f78ea0a31b70ef1bae55524a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 26 May 2018 21:11:25 +0200 Subject: [PATCH] loadlangs --- htdocs/holiday/card.php | 1 + htdocs/holiday/common.inc.php | 5 ++--- htdocs/holiday/define_holiday.php | 4 ++-- htdocs/holiday/document.php | 5 ++--- htdocs/holiday/list.php | 1 + htdocs/holiday/month_report.php | 5 +++-- htdocs/holiday/view_log.php | 1 + htdocs/hrm/admin/admin_establishment.php | 4 ++-- htdocs/hrm/admin/admin_hrm.php | 4 ++-- htdocs/hrm/establishment/card.php | 4 ++-- htdocs/hrm/establishment/info.php | 4 ++-- htdocs/hrm/index.php | 5 ++--- htdocs/imports/emptyexample.php | 1 + htdocs/imports/import.php | 2 +- htdocs/imports/index.php | 1 + htdocs/livraison/card.php | 1 + htdocs/loan/card.php | 1 + htdocs/loan/createschedule.php | 1 + htdocs/loan/document.php | 1 + htdocs/loan/index.php | 1 + htdocs/loan/info.php | 1 + htdocs/loan/note.php | 1 + htdocs/loan/payment/card.php | 1 + htdocs/margin/agentMargins.php | 2 +- htdocs/margin/checkMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/activity/perday.php | 1 + htdocs/projet/activity/perweek.php | 1 + htdocs/projet/admin/project.php | 6 ++---- htdocs/projet/admin/project_task_extrafields.php | 4 ++-- htdocs/projet/ajax/projects.php | 1 + htdocs/projet/card.php | 4 ++-- htdocs/projet/comment.php | 4 ++-- htdocs/projet/contact.php | 4 ++-- htdocs/projet/document.php | 4 ++-- htdocs/projet/element.php | 6 ++---- htdocs/projet/ganttview.php | 4 ++-- htdocs/projet/index.php | 5 ++--- htdocs/projet/info.php | 1 + htdocs/projet/list.php | 1 + htdocs/projet/note.php | 1 + htdocs/projet/stats/index.php | 4 ++-- htdocs/projet/tasks.php | 1 + htdocs/projet/tasks/comment.php | 4 ++-- htdocs/projet/tasks/contact.php | 4 ++-- htdocs/projet/tasks/document.php | 5 ++--- htdocs/projet/tasks/list.php | 1 + htdocs/projet/tasks/note.php | 1 + htdocs/projet/tasks/stats/index.php | 4 ++-- htdocs/projet/tasks/task.php | 4 ++-- htdocs/projet/tasks/time.php | 1 + 53 files changed, 78 insertions(+), 63 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 18039a1d47e..5037e3a8656 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -47,6 +47,7 @@ if ($user->societe_id > 0) accessforbidden(); $now=dol_now(); +// Load translation files required by the page $langs->load("holiday"); $childids = $user->getAllChildIds(1); diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index 574c4394c81..1f8f797eab2 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -28,9 +28,8 @@ if (! class_exists('Holiday')) { require_once DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; } -$langs->load("user"); -$langs->load("other"); -$langs->load("holiday"); +// Load translation files required by the page +$langs->loadLangs(array('user', 'other', 'holiday')); if (empty($conf->holiday->enabled)) { diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 4dc1e92268e..55724549360 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -30,8 +30,8 @@ require('../main.inc.php'); require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; -$langs->load('users'); -$langs->load('hrm'); +// Load translation files required by the page +$langs->loadlangs(array('users', 'hrm')); $action=GETPOST('action','aZ09'); $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'defineholidaylist'; diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php index 52386acf93c..9d5618f3a2a 100644 --- a/htdocs/holiday/document.php +++ b/htdocs/holiday/document.php @@ -35,9 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -$langs->load("other"); -$langs->load("holidays"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'holidays', 'companies')); $id = GETPOST('id','int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 8521beac4f1..04fae6fbdab 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +// Load translation files required by the page $langs->loadLangs(array('users', 'holidays', 'hrm')); // Protection if external user diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index cc094046316..1e72122c2be 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -23,11 +23,12 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); +require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +// Load translation files required by the page $langs->loadLangs(array("holiday")); // Security check diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index d67db73d437..198b9a8854c 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -41,6 +41,7 @@ if (empty($year)) $year=$tmpdate['year']; } +// Load translation files required by the page $langs->load('users'); diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 8f3b6c6a838..415bcf8fcbd 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -24,8 +24,8 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; -$langs->load("admin"); -$langs->load('hrm'); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'hrm')); if (! $user->admin) accessforbidden(); diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php index 05fccafbda8..a7a8b8a9352 100644 --- a/htdocs/hrm/admin/admin_hrm.php +++ b/htdocs/hrm/admin/admin_hrm.php @@ -24,8 +24,8 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -$langs->load("admin"); -$langs->load("hrm"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'hrm')); if (! $user->admin) accessforbidden(); diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index 6180393e1df..db316098003 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -25,8 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -$langs->load("admin"); -$langs->load("hrm"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'hrm')); // Security check if (! $user->admin) accessforbidden(); diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 29b571e58ce..76eb236d1a1 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -25,8 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; -$langs->load("admin"); -$langs->load("hrm"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'hrm')); // Security check if (! $user->admin) accessforbidden(); diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 2f360dce5c5..9a71f35a41a 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -36,9 +36,8 @@ if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplace if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; -$langs->load('users'); -$langs->load('holidays'); -$langs->load('trips'); +// Load translation files required by the page +$langs->loadLangs(array('users', 'holidays', 'trips')); $socid=GETPOST("socid"); diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index b9c6f1874b2..ffb270a6306 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'; $datatoimport=GETPOST('datatoimport'); $format=GETPOST('format'); +// Load translation files required by the page $langs->load("exports"); // Check exportkey diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 596c4634da4..0aa5ee35aa2 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -32,7 +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 +// Load translation files required by the page $langs->loadLangs(array('exports', 'compta', 'errors')); // Security check diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 36811acc587..207055c6ce8 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -24,6 +24,7 @@ require_once '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/imports/class/import.class.php'; +// Load translation files required by the page $langs->load("exports"); if (! $user->societe_id == 0) diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index caee19a2c34..d6cefb24d83 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -45,6 +45,7 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } +// Load translation files required by the page $langs->loadLangs(array("sendings","bills",'deliveries','orders')); if (!empty($conf->incoterm->enabled)) $langs->load('incoterm'); diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 42c8cc57a4a..79569f62df3 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -32,6 +32,7 @@ if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accoun require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","loan")); $id=GETPOST('id','int'); diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php index 0983fb15a05..e895edeec62 100644 --- a/htdocs/loan/createschedule.php +++ b/htdocs/loan/createschedule.php @@ -34,6 +34,7 @@ $action = GETPOST('action','aZ09'); $object = new Loan($db); $object->fetch($loanid); +// Load translation files required by the page $langs->loadLangs(array("loan")); if ($action == 'createecheancier') { diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index b6504d0a776..f9d17c563fa 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -32,6 +32,7 @@ if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } +// Load translation files required by the page $langs->loadLangs(array("other","companies","compta","bills","loan")); $id = GETPOST('id','int'); diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index c48e9b50ac1..fd9dfdb6b9f 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -27,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; +// Load translation files required by the page $langs->loadLangs(array("loan","compta","banks","bills")); // Security check diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php index d94bedbf9fb..d5b6e673f7c 100644 --- a/htdocs/loan/info.php +++ b/htdocs/loan/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->loadLangs(array("compta","bills","loan")); $id=GETPOST('id','int'); diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index 9e5fedc423b..b4639f4b625 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -36,6 +36,7 @@ if (! empty($conf->projet->enabled)) { $action = GETPOST('action','aZ09'); +// Load translation files required by the page $langs->loadLangs(array("loan")); // Security check diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 2f6fbe8f202..e19e33bc31e 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php'; if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +// Load translation files required by the page $langs->loadLangs(array("bills","banks","companies","loan")); // Security check diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 7b47e8083dc..2e80fe5ced2 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -29,7 +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 +// Load translation files required by the page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $mesg = ''; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index 4775f8b5885..0612c143497 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -29,7 +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 +// Load translation files required by the 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 fa919da9716..45b604d1919 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -28,7 +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 +// Load translation files required by the page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); // Security check diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index f147f334166..d827f5d985e 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -28,7 +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 +// Load translation files required by the page $langs->loadLangs(array('companies', 'bills', 'products', 'margins')); $id = GETPOST('id', 'int'); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index fb23eed80b0..3340fca4a99 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -39,7 +39,7 @@ if ($user->societe_id > 0) $socid=$user->societe_id; //$result = restrictedArea($user, 'projet', $projectid); if (!$user->rights->projet->lire) accessforbidden(); - +// Load translation files required by the page $langs->load("projects"); diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index ec9a458634b..d46e05eb054 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; +// Load translation files required by the page $langs->loadLangs(array('projects','users','companies')); $action=GETPOST('action','aZ09'); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index e535b2fecf0..e30f3205cc0 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; +// Load translation files required by the page $langs->loadLangs(array('projects','users','companies')); $action=GETPOST('action','aZ09'); diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 4135d547be3..9f5437daacf 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -33,10 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; -$langs->load("admin"); -$langs->load("errors"); -$langs->load("other"); -$langs->load("projects"); +// Load translation files required by the page +$langs->loadLangs(array('admin', 'errors', 'other', 'projects')); if (!$user->admin) accessforbidden(); diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php index 01a001bb039..32e4af98f89 100644 --- a/htdocs/projet/admin/project_task_extrafields.php +++ b/htdocs/projet/admin/project_task_extrafields.php @@ -30,8 +30,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("project"); -$langs->load("admin"); +// Load translation files required by the page +$langs->loadLangs(array('project', 'admin')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php index 991cae22aa3..f2417df5353 100644 --- a/htdocs/projet/ajax/projects.php +++ b/htdocs/projet/ajax/projects.php @@ -48,6 +48,7 @@ dol_syslog(join(',',$_GET)); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +// Load translation files required by the page $langs->load("main"); top_httphead(); diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index e73db5a9155..56c04614a55 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -$langs->load("projects"); -$langs->load('companies'); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index a51d4872c80..f152d6b4608 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -34,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $id=GETPOST('id','int'); $idcomment=GETPOST('idcomment','int'); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index f162aa9db40..2f4c265f577 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $id = GETPOST('id','int'); $ref = GETPOST('ref','alpha'); diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 4677e409f35..8854f928b43 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -30,8 +30,8 @@ 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->load('projects'); -$langs->load('other'); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'other')); $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index dd19ceeb263..5070c0a58d4 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -53,10 +53,8 @@ if (! empty($conf->stock->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/s if (! empty($conf->tax->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php'; -$langs->load("projects"); -$langs->load("companies"); -$langs->load("suppliers"); -$langs->load("compta"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta')); if (! empty($conf->facture->enabled)) $langs->load("bills"); if (! empty($conf->commande->enabled)) $langs->load("orders"); if (! empty($conf->propal->enabled)) $langs->load("propal"); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 2f43701c73d..45a417a6dd2 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -48,8 +48,8 @@ $socid=0; //if ($user->societe_id > 0) $socid = $user->societe_id; // For external user, no check is done on company because readability is managed by public status of project and assignement. $result = restrictedArea($user, 'projet', $id, 'projet&project'); -$langs->load("users"); -$langs->load("projects"); +// Load translation files required by the page +$langs->loadlangs(array('users', 'projects')); /* diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 1ff9e22041d..25c60eaf7fd 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -30,9 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; - -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $search_project_user = GETPOST('search_project_user','int'); $mine = GETPOST('mode','aZ09')=='mine' ? 1 : 0; diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index 68f4b8b4cbb..4998d9f695f 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +// Load translation files required by the page $langs->load("projects"); $id = GETPOST('id','int'); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 94a3850fe33..58b473a8b20 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +// Load translation files required by the page $langs->loadLangs(array('projects', 'companies', 'commercial')); $action=GETPOST('action','alpha'); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 88217fbfb1c..8a16d3d5e42 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -26,6 +26,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +// Load translation files required by the page $langs->load('projects'); $action=GETPOST('action','aZ09'); diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index 5f6c526d1d5..c6ee1074b50 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -49,8 +49,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; -$langs->load('companies'); -$langs->load('projects'); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'projects')); /* diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 09c012787a8..4adcb95d207 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +// Load translation files required by the page $langs->loadLangs(array("users", "projects")); $id = GETPOST('id', 'int'); diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index fff98bc3c5f..ac527424721 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -34,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php'; -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $id=GETPOST('id','int'); $idcomment=GETPOST('idcomment','int'); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index fad5466cb7f..1ca25090876 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 1cb5acb73b5..74cbba539b3 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -32,9 +32,8 @@ 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->load('projects'); -$langs->load('other'); +// Load translation files required by the page +$langs->loadLangs(array('projects', 'other')); $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 4766f0687b7..4e7599c1592 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +// Load translation files required by the page $langs->loadLangs(array('projects', 'users', 'companies')); $action=GETPOST('action','alpha'); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index f915aaf836a..9e6018ab5c5 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +// Load translation files required by the page $langs->load('projects'); $action=GETPOST('action','alpha'); diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index d030f858f4e..3d3599de1b1 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -49,8 +49,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; -$langs->load('companies'); -$langs->load('projects'); +// Load translation files required by the page +$langs->loadlangs(array('companies', 'projects')); /* diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 9f1a486fcaa..4809cfe1276 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php'; -$langs->load("projects"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadlangs(array('projects', 'companies')); $id=GETPOST('id','int'); $ref=GETPOST("ref",'alpha',1); // task ref diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 0d2b960bee8..3844d8eeb50 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +// Load translation files required by the page $langs->load('projects'); $id=GETPOST('id','int');