From 035b2be2eb90bd7334ce256d5370cfeec55c63b4 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 7 Sep 2018 14:58:22 +0200 Subject: [PATCH] Standardize and update call to langs --- htdocs/admin/menus/edit.php | 5 ++--- htdocs/admin/menus/index.php | 4 ++-- htdocs/admin/menus/other.php | 5 ++--- htdocs/admin/system/about.php | 8 +++----- htdocs/admin/system/browser.php | 5 ++--- htdocs/admin/system/constall.php | 5 ++--- htdocs/admin/system/dolibarr.php | 5 ++--- htdocs/admin/system/modules.php | 5 ++--- htdocs/admin/system/perf.php | 5 ++--- 9 files changed, 19 insertions(+), 28 deletions(-) diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 2864fe79df0..0db2d3cd6d1 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -28,9 +28,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; - -$langs->load("admin"); -$langs->load('other'); +// Load translation files required by the page +$langs->loadLangs(array("other","admin")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 2e6d8a91008..9d0178c956d 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -27,8 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; -$langs->load("other"); -$langs->load("admin"); +// Load translation files required by the page +$langs->loadLangs(array("other","admin")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 0446c59af1d..7b1a73f2f09 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -24,9 +24,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -$langs->load("users"); -$langs->load("admin"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("user","other","admin")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index e9ea61ac944..ba61203191a 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -28,10 +28,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; -$langs->load("admin"); -$langs->load("help"); -$langs->load("members"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("help","members","other","admin")); $action=GETPOST('action','alpha'); @@ -196,7 +194,7 @@ if ($showpromotemessage) { print '
'; print '
'; - + if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0)) { print $langs->trans("TitleExampleForMajorRelease").':
'; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index c5aeff70b88..9df49489e34 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -26,9 +26,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -$langs->load("admin"); -$langs->load("install"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("install","other","admin")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index 9d4c4fc3cec..d510cc07773 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -24,9 +24,8 @@ require '../../main.inc.php'; -$langs->load("admin"); -$langs->load("user"); -$langs->load("install"); +// Load translation files required by the page +$langs->loadLangs(array("install","user","admin")); if (!$user->admin) diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 4dd4ef9dc9b..9c2ee62565d 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; -$langs->load("admin"); -$langs->load("install"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("install","other","admin")); $action=GETPOST('action','alpha'); diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 65e19fb9d83..c70ad1b7fba 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -25,9 +25,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -$langs->load("admin"); -$langs->load("install"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("install","other","admin")); if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index 85ac2aea006..d69723f1299 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -26,9 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -$langs->load("admin"); -$langs->load("install"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array("install","other","admin")); if (! $user->admin) accessforbidden();