Merge pull request #25823 from frederic34/loadlangs

fix loadlangs
This commit is contained in:
Laurent Destailleur 2023-09-08 11:25:35 +02:00 committed by GitHub
commit eef311dee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View file

@ -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';

View file

@ -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');

View file

@ -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");

View file

@ -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");

View file

@ -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();