From 9f53892fbe05bf111eb904255e84aa7040b59ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 6 Sep 2023 16:57:50 +0200 Subject: [PATCH 1/2] fix loadlangs --- htdocs/core/boxes/box_last_knowledgerecord.php | 2 +- htdocs/core/boxes/box_last_modified_knowledgerecord.php | 2 +- htdocs/core/lib/asset.lib.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/boxes/box_last_knowledgerecord.php b/htdocs/core/boxes/box_last_knowledgerecord.php index 2cb4818d6ac..f1bbb3438bf 100644 --- a/htdocs/core/boxes/box_last_knowledgerecord.php +++ b/htdocs/core/boxes/box_last_knowledgerecord.php @@ -78,7 +78,7 @@ class box_last_knowledgerecord extends ModeleBoxes public function __construct($db, $param = '') { global $langs; - $langs->load("boxes", "languages"); + $langs->loadLangs(array("boxes", "languages")); $this->db = $db; $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastKnowledgerecord"); diff --git a/htdocs/core/boxes/box_last_modified_knowledgerecord.php b/htdocs/core/boxes/box_last_modified_knowledgerecord.php index 2c5319151fa..f15ed3d4d5c 100644 --- a/htdocs/core/boxes/box_last_modified_knowledgerecord.php +++ b/htdocs/core/boxes/box_last_modified_knowledgerecord.php @@ -78,7 +78,7 @@ class box_last_modified_knowledgerecord extends ModeleBoxes public function __construct($db, $param = '') { global $langs; - $langs->load("boxes", "knowledgemanagement", "languages"); + $langs->loadLangs(array("boxes", "knowledgemanagement", "languages")); $this->db = $db; $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedKnowledgerecord"); diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php index be31f995657..bfa95ce9c0a 100644 --- a/htdocs/core/lib/asset.lib.php +++ b/htdocs/core/lib/asset.lib.php @@ -88,7 +88,7 @@ function assetPrepareHead(Asset $object) { global $db, $langs, $conf; - $langs->load("assets", "admin"); + $langs->loadLangs(array("assets", "admin")); $h = 0; $head = array(); @@ -184,7 +184,7 @@ function assetModelPrepareHead($object) { global $langs, $conf; - $langs->load("assets", "admin"); + $langs->loadLangs(array("assets", "admin")); $h = 0; $head = array(); From e6f249eaca143435ff5da2253f6245567c33ab76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 6 Sep 2023 17:00:19 +0200 Subject: [PATCH 2/2] fix loadlangs --- htdocs/asset/class/asset.class.php | 6 +++--- htdocs/asset/class/assetmodel.class.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index b3db4e087fb..05b1e4a2433 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -1433,7 +1433,7 @@ class Asset extends CommonObject // phpcs:enable if (empty($this->labelStatus) || empty($this->labelStatusShort)) { global $langs; - //$langs->load("asset@asset"); + //$langs->load("assets"); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress'); $this->labelStatus[self::STATUS_DISPOSED] = $langs->transnoentitiesnoconv('AssetDisposed'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress'); @@ -1516,7 +1516,7 @@ class Asset extends CommonObject public function getNextNumRef() { global $langs, $conf; - $langs->load("asset@asset"); + $langs->load("assets"); if (empty($conf->global->ASSET_ASSET_ADDON)) { $conf->global->ASSET_ASSET_ADDON = 'mod_asset_standard'; @@ -1581,7 +1581,7 @@ class Asset extends CommonObject // $result = 0; // $includedocgeneration = 1; // - // $langs->load("asset@asset"); + // $langs->load("assets"); // // if (!dol_strlen($modele)) { // $modele = 'standard_asset'; diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php index d31a68284fd..8f777144f6e 100644 --- a/htdocs/asset/class/assetmodel.class.php +++ b/htdocs/asset/class/assetmodel.class.php @@ -698,7 +698,7 @@ class AssetModel extends CommonObject // phpcs:enable if (empty($this->labelStatus) || empty($this->labelStatusShort)) { global $langs; - //$langs->load("asset@asset"); + //$langs->load("assets"); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');