lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trans labels status

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-16 19:37:57 +02:00
parent a28d01ca83
commit dd0809b528
53 changed files with 323 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/adherents/class/adherent.class.php
View File

@ -2338,12 +2338,12 @@ class Adherent extends CommonObject
} }
} elseif ($status == self::STATUS_RESILIATED) { } elseif ($status == self::STATUS_RESILIATED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans("MemberStatusResiliated"); $labelStatus = $langs->transnoentitiesnoconv("MemberStatusResiliated");
$labelStatusShort = $langs->trans("MemberStatusResiliatedShort"); $labelStatusShort = $langs->transnoentitiesnoconv("MemberStatusResiliatedShort");
} elseif ($status == self::STATUS_EXCLUDED) { } elseif ($status == self::STATUS_EXCLUDED) {
$statusType = 'status10'; $statusType = 'status10';
$labelStatus = $langs->trans("MemberStatusExcluded"); $labelStatus = $langs->transnoentitiesnoconv("MemberStatusExcluded");
$labelStatusShort = $langs->trans("MemberStatusExcludedShort"); $labelStatusShort = $langs->transnoentitiesnoconv("MemberStatusExcludedShort");
} }
return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode); return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);

8
htdocs/adherents/class/adherent_type.class.php
View File

@ -737,10 +737,10 @@ class AdherentType extends CommonObject
} }
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
$this->labelStatus[0] = $langs->trans("ActivityCeased"); $this->labelStatus[0] = $langs->transnoentitiesnoconv("ActivityCeased");
$this->labelStatus[1] = $langs->trans("InActivity"); $this->labelStatus[1] = $langs->transnoentitiesnoconv("InActivity");
$this->labelStatusShort[0] = $langs->trans("ActivityCeased"); $this->labelStatusShort[0] = $langs->transnoentitiesnoconv("ActivityCeased");
$this->labelStatusShort[1] = $langs->trans("InActivity"); $this->labelStatusShort[1] = $langs->transnoentitiesnoconv("InActivity");
} }
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);

8
htdocs/asset/class/asset.class.php
View File

@ -390,11 +390,11 @@ class Asset extends CommonObject
$langs->load("contracts"); $langs->load("contracts");
$labelStatus = array(); $labelStatus = array();
$labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled'); $labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$labelStatusShort = array(); $labelStatusShort = array();
$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled'); $labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$statusType = 'status0'; $statusType = 'status0';
if ($status == self::STATUS_VALIDATED) { if ($status == self::STATUS_VALIDATED) {

12
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1465,18 +1465,18 @@ class ActionComm extends CommonObject
// phpcs:enable // phpcs:enable
global $langs; global $langs;
$labelStatus = $langs->trans('StatusNotApplicable'); $labelStatus = $langs->transnoentitiesnoconv('StatusNotApplicable');
if ($percent == -1 && !$hidenastatus) { if ($percent == -1 && !$hidenastatus) {
$labelStatus = $langs->trans('StatusNotApplicable'); $labelStatus = $langs->transnoentitiesnoconv('StatusNotApplicable');
} elseif ($percent == 0) { } elseif ($percent == 0) {
$labelStatus = $langs->trans('StatusActionToDo').' (0%)'; $labelStatus = $langs->transnoentitiesnoconv('StatusActionToDo').' (0%)';
} elseif ($percent > 0 && $percent < 100) { } elseif ($percent > 0 && $percent < 100) {
$labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)'; $labelStatus = $langs->transnoentitiesnoconv('StatusActionInProcess').' ('.$percent.'%)';
} elseif ($percent >= 100) { } elseif ($percent >= 100) {
$labelStatus = $langs->trans('StatusActionDone').' (100%)'; $labelStatus = $langs->transnoentitiesnoconv('StatusActionDone').' (100%)';
} }
$labelStatusShort = $langs->trans('StatusNotApplicable'); $labelStatusShort = $langs->transnoentitiesnoconv('StatusNotApplicable');
if ($percent == -1 && !$hidenastatus) { if ($percent == -1 && !$hidenastatus) {
$labelStatusShort = $langs->trans('NA'); $labelStatusShort = $langs->trans('NA');
} elseif ($percent == 0) { } elseif ($percent == 0) {

12
htdocs/comm/action/class/actioncommreminder.class.php
View File

@ -228,18 +228,18 @@ class ActionCommReminder extends CommonObject
// phpcs:enable // phpcs:enable
global $langs; global $langs;
$labelStatus = $langs->trans('ToDo'); $labelStatus = $langs->transnoentitiesnoconv('ToDo');
if ($status == 1) { if ($status == 1) {
$labelStatus = $langs->trans('Done'); $labelStatus = $langs->transnoentitiesnoconv('Done');
} elseif ($status == -1) { } elseif ($status == -1) {
$labelStatus = $langs->trans('Error'); $labelStatus = $langs->transnoentitiesnoconv('Error');
} }
$labelStatusShort = $langs->trans('ToDo'); $labelStatusShort = $langs->transnoentitiesnoconv('ToDo');
if ($status == 1) { if ($status == 1) {
$labelStatus = $langs->trans('Done'); $labelStatus = $langs->transnoentitiesnoconv('Done');
} elseif ($status == -1) { } elseif ($status == -1) {
$labelStatus = $langs->trans('Error'); $labelStatus = $langs->transnoentitiesnoconv('Error');
} }
$statusType = 'status5'; $statusType = 'status5';

24
htdocs/comm/mailing/class/mailing.class.php
View File

@ -776,8 +776,8 @@ class Mailing extends CommonObject
global $langs; global $langs;
$langs->load("mailing"); $langs->load("mailing");
$labelStatus = $langs->trans($this->statuts[$status]); $labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
$labelStatusShort = $langs->trans($this->statuts[$status]); $labelStatusShort = $langs->transnoentitiesnoconv($this->statuts[$status]);
$statusType = 'status'.$status; $statusType = 'status'.$status;
if ($status == 2) { if ($status == 2) {
@ -808,16 +808,16 @@ class Mailing extends CommonObject
$labelStatus = array(); $labelStatus = array();
$labelStatusShort = array(); $labelStatusShort = array();
$labelStatus[-1] = $langs->trans('MailingStatusError'); $labelStatus[-1] = $langs->transnoentitiesnoconv('MailingStatusError');
$labelStatus[0] = $langs->trans('MailingStatusNotSent'); $labelStatus[0] = $langs->transnoentitiesnoconv('MailingStatusNotSent');
$labelStatus[1] = $langs->trans('MailingStatusSent'); $labelStatus[1] = $langs->transnoentitiesnoconv('MailingStatusSent');
$labelStatus[2] = $langs->trans('MailingStatusRead'); $labelStatus[2] = $langs->transnoentitiesnoconv('MailingStatusRead');
$labelStatus[3] = $langs->trans('MailingStatusNotContact'); $labelStatus[3] = $langs->transnoentitiesnoconv('MailingStatusNotContact');
$labelStatusShort[-1] = $langs->trans('MailingStatusError'); $labelStatusShort[-1] = $langs->transnoentitiesnoconv('MailingStatusError');
$labelStatusShort[0] = $langs->trans('MailingStatusNotSent'); $labelStatusShort[0] = $langs->transnoentitiesnoconv('MailingStatusNotSent');
$labelStatusShort[1] = $langs->trans('MailingStatusSent'); $labelStatusShort[1] = $langs->transnoentitiesnoconv('MailingStatusSent');
$labelStatusShort[2] = $langs->trans('MailingStatusRead'); $labelStatusShort[2] = $langs->transnoentitiesnoconv('MailingStatusRead');
$labelStatusShort[3] = $langs->trans('MailingStatusNotContact'); $labelStatusShort[3] = $langs->transnoentitiesnoconv('MailingStatusNotContact');
$statusType = 'status'.$status; $statusType = 'status'.$status;
if ($status == -1) { if ($status == -1) {

8
htdocs/compta/bank/class/account.class.php
View File

@ -1125,12 +1125,12 @@ class Account extends CommonObject
$langs->load('banks'); $langs->load('banks');
if ($status == self::STATUS_OPEN) { if ($status == self::STATUS_OPEN) {
$label = $langs->trans("StatusAccountOpened"); $label = $langs->transnoentitiesnoconv("StatusAccountOpened");
$labelshort = $langs->trans("StatusAccountOpened"); $labelshort = $langs->transnoentitiesnoconv("StatusAccountOpened");
$statusType = 'status4'; $statusType = 'status4';
} else { } else {
$label = $langs->trans("StatusAccountClosed"); $label = $langs->transnoentitiesnoconv("StatusAccountClosed");
$labelshort = $langs->trans("StatusAccountClosed"); $labelshort = $langs->transnoentitiesnoconv("StatusAccountClosed");
$statusType = 'status5'; $statusType = 'status5';
} }

8
htdocs/compta/cashcontrol/class/cashcontrol.class.php
View File

@ -378,10 +378,10 @@ class CashControl extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[0] = $langs->trans('Draft'); $this->labelStatus[0] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[1] = $langs->trans('Closed'); $this->labelStatus[1] = $langs->transnoentitiesnoconv('Closed');
$this->labelStatusShort[0] = $langs->trans('Draft'); $this->labelStatusShort[0] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[1] = $langs->trans('Closed'); $this->labelStatusShort[1] = $langs->transnoentitiesnoconv('Closed');
} }
$statusType = 'status0'; $statusType = 'status0';

55
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -1461,56 +1461,55 @@ class FactureRec extends CommonInvoice
global $langs; global $langs;
$langs->load('bills'); $langs->load('bills');
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
$statusType = 'status0'; $statusType = 'status0';
//print "$recur,$status,$mode,$alreadypaid,$type"; //print "$recur,$status,$mode,$alreadypaid,$type";
if ($mode == 0) { if ($mode == 0) {
$prefix = '';
if ($recur) { if ($recur) {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$labelStatus = $langs->trans("Draft"); $labelStatus = $langs->transnoentitiesnoconv("Draft");
} }
} }
} elseif ($mode == 1) { } elseif ($mode == 1) {
$prefix = 'Short'; $prefix = 'Short';
if ($recur) { if ($recur) {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$labelStatus = $langs->trans("Draft"); $labelStatus = $langs->transnoentitiesnoconv("Draft");
} }
} }
} elseif ($mode == 2) { } elseif ($mode == 2) {
if ($recur) { if ($recur) {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status4'; $statusType = 'status4';
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status0'; $statusType = 'status0';
$labelStatus = $langs->trans('Draft'); $labelStatus = $langs->transnoentitiesnoconv('Draft');
} }
} }
} elseif ($mode == 3) { } elseif ($mode == 3) {
@ -1518,18 +1517,18 @@ class FactureRec extends CommonInvoice
$prefix = 'Short'; $prefix = 'Short';
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status4'; $statusType = 'status4';
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status0'; $statusType = 'status0';
$labelStatus = $langs->trans('Draft'); $labelStatus = $langs->transnoentitiesnoconv('Draft');
} }
} }
} elseif ($mode == 4) { } elseif ($mode == 4) {
@ -1537,18 +1536,18 @@ class FactureRec extends CommonInvoice
if ($recur) { if ($recur) {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status4'; $statusType = 'status4';
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status0'; $statusType = 'status0';
$labelStatus = $langs->trans('Draft'); $labelStatus = $langs->transnoentitiesnoconv('Draft');
} }
} }
} elseif ($mode == 5 || $mode == 6) { } elseif ($mode == 5 || $mode == 6) {
@ -1559,25 +1558,23 @@ class FactureRec extends CommonInvoice
if ($recur) { if ($recur) {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status4'; $statusType = 'status4';
$labelStatus = $langs->trans('Active'); $labelStatus = $langs->transnoentitiesnoconv('Active');
} }
} else { } else {
if ($status == self::STATUS_SUSPENDED) { if ($status == self::STATUS_SUSPENDED) {
$statusType = 'status6'; $statusType = 'status6';
$labelStatus = $langs->trans('Disabled'); $labelStatus = $langs->transnoentitiesnoconv('Disabled');
} else { } else {
$statusType = 'status0'; $statusType = 'status0';
$labelStatus = $langs->trans('Draft'); $labelStatus = $langs->transnoentitiesnoconv('Draft');
} }
} }
} }
if (empty($labelStatusShort)) { $labelStatusShort = $labelStatus;
$labelStatusShort = $labelStatus;
}
return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode); return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
} }

8
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -1005,10 +1005,10 @@ class RemiseCheque extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
$langs->load('compta'); $langs->load('compta');
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ToValidate');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ToValidate');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

16
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -2346,16 +2346,16 @@ class BonPrelevement extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('StatusWaiting'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('StatusWaiting');
$this->labelStatus[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans'); $this->labelStatus[self::STATUS_TRANSFERED] = $langs->transnoentitiesnoconv('StatusTrans');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('StatusWaiting'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('StatusWaiting');
$this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans'); $this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->transnoentitiesnoconv('StatusTrans');
if ($this->type == 'bank-transfer') { if ($this->type == 'bank-transfer') {
$this->labelStatus[self::STATUS_DEBITED] = $langs->trans('StatusDebited'); $this->labelStatus[self::STATUS_DEBITED] = $langs->transnoentitiesnoconv('StatusDebited');
$this->labelStatusShort[self::STATUS_DEBITED] = $langs->trans('StatusDebited'); $this->labelStatusShort[self::STATUS_DEBITED] = $langs->transnoentitiesnoconv('StatusDebited');
} else { } else {
$this->labelStatus[self::STATUS_CREDITED] = $langs->trans('StatusCredited'); $this->labelStatus[self::STATUS_CREDITED] = $langs->transnoentitiesnoconv('StatusCredited');
$this->labelStatusShort[self::STATUS_CREDITED] = $langs->trans('StatusCredited'); $this->labelStatusShort[self::STATUS_CREDITED] = $langs->transnoentitiesnoconv('StatusCredited');
} }
} }

12
htdocs/compta/prelevement/class/ligneprelevement.class.php
View File

@ -137,11 +137,11 @@ class LignePrelevement
return $langs->trans($this->statuts[$status]); return $langs->trans($this->statuts[$status]);
} elseif ($mode == 1) { } elseif ($mode == 1) {
if ($status == 0) { if ($status == 0) {
return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Waiting return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Waiting
} elseif ($status == 2) { } elseif ($status == 2) {
return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Credited return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Credited
} elseif ($status == 3) { } elseif ($status == 3) {
return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->trans($this->statuts[$status]); // Refused return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Refused
} }
} elseif ($mode == 2) { } elseif ($mode == 2) {
if ($status == 0) { if ($status == 0) {
@ -153,11 +153,11 @@ class LignePrelevement
} }
} elseif ($mode == 3) { } elseif ($mode == 3) {
if ($status == 0) { if ($status == 0) {
return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"'); return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
} elseif ($status == 2) { } elseif ($status == 2) {
return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"'); return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
} elseif ($status == 3) { } elseif ($status == 3) {
return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"'); return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
} }
} }

12
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -525,15 +525,15 @@ class ChargeSociales extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid'); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid'); $this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
if ($status == self::STATUS_UNPAID && $alreadypaid > 0) { if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid'); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid'); $this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
if ($status == self::STATUS_UNPAID && $alreadypaid > 0) { if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
} }

12
htdocs/compta/tva/class/tva.class.php
View File

@ -866,15 +866,15 @@ class Tva extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid'); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$this->labelStatus[self::STATUS_PAID] = $langs->trans('BillStatusPaid'); $this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) { if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid'); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('BillStatusPaid'); $this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) { if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
} }

4
htdocs/contact/class/contact.class.php
View File

@ -1558,8 +1558,8 @@ class Contact extends CommonObject
$statusType = 'status5'; $statusType = 'status5';
} }
$label = $langs->trans($labelStatus[$status]); $label = $langs->transnoentitiesnoconv($labelStatus[$status]);
$labelshort = $langs->trans($labelStatusShort[$status]); $labelshort = $langs->transnoentitiesnoconv($labelStatusShort[$status]);
return dolGetStatus($label, $labelshort, '', $statusType, $mode); return dolGetStatus($label, $labelshort, '', $statusType, $mode);
} }

4
htdocs/core/class/emailsenderprofile.class.php
View File

@ -326,9 +326,9 @@ class EmailSenderProfile extends CommonObject
global $langs; global $langs;
if ($status == 1) { if ($status == 1) {
$label = $labelshort = $langs->trans('Enabled'); $label = $labelshort = $langs->transnoentitiesnoconv('Enabled');
} else { } else {
$label = $labelshort = $langs->trans('Disabled'); $label = $labelshort = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

8
htdocs/cron/class/cronjob.class.php
View File

@ -1432,10 +1432,10 @@ class Cronjob extends CommonObject
$moretext .= ' ('.$langs->trans("Error").')'; $moretext .= ' ('.$langs->trans("Error").')';
} }
$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext; $this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled').$moretext;
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Scheduled').$moretext; $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Scheduled').$moretext;
$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Scheduled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Scheduled');
} }
$statusType = 'status4'; $statusType = 'status4';

12
htdocs/delivery/class/delivery.class.php
View File

@ -846,12 +846,12 @@ class Delivery extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[-1] = $langs->trans('StatusDeliveryCanceled'); $this->labelStatus[-1] = $langs->transnoentitiesnoconv('StatusDeliveryCanceled');
$this->labelStatus[0] = $langs->trans('StatusDeliveryDraft'); $this->labelStatus[0] = $langs->transnoentitiesnoconv('StatusDeliveryDraft');
$this->labelStatus[1] = $langs->trans('StatusDeliveryValidated'); $this->labelStatus[1] = $langs->transnoentitiesnoconv('StatusDeliveryValidated');
$this->labelStatusShort[-1] = $langs->trans('StatusDeliveryCanceled'); $this->labelStatusShort[-1] = $langs->transnoentitiesnoconv('StatusDeliveryCanceled');
$this->labelStatusShort[0] = $langs->trans('StatusDeliveryDraft'); $this->labelStatusShort[0] = $langs->transnoentitiesnoconv('StatusDeliveryDraft');
$this->labelStatusShort[1] = $langs->trans('StatusDeliveryValidated'); $this->labelStatusShort[1] = $langs->transnoentitiesnoconv('StatusDeliveryValidated');
} }
$statusType = 'status0'; $statusType = 'status0';

8
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -599,10 +599,10 @@ class EmailCollector extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status5'; $statusType = 'status5';

24
htdocs/eventorganization/class/conferenceorbooth.class.php
View File

@ -672,18 +672,18 @@ class ConferenceOrBooth extends ActionComm
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("eventorganization@eventorganization"); //$langs->load("eventorganization@eventorganization");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_SUGGESTED] = $langs->trans('Suggested'); $this->labelStatus[self::STATUS_SUGGESTED] = $langs->transnoentitiesnoconv('Suggested');
$this->labelStatus[self::STATUS_CONFIRMED] = $langs->trans('Confirmed'); $this->labelStatus[self::STATUS_CONFIRMED] = $langs->transnoentitiesnoconv('Confirmed');
$this->labelStatus[self::STATUS_NOT_QUALIFIED] = $langs->trans('NotSelected'); $this->labelStatus[self::STATUS_NOT_QUALIFIED] = $langs->transnoentitiesnoconv('NotSelected');
$this->labelStatus[self::STATUS_DONE] = $langs->trans('Done'); $this->labelStatus[self::STATUS_DONE] = $langs->transnoentitiesnoconv('Done');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_SUGGESTED] = $langs->trans('Suggested'); $this->labelStatusShort[self::STATUS_SUGGESTED] = $langs->transnoentitiesnoconv('Suggested');
$this->labelStatusShort[self::STATUS_CONFIRMED] = $langs->trans('Confirmed'); $this->labelStatusShort[self::STATUS_CONFIRMED] = $langs->transnoentitiesnoconv('Confirmed');
$this->labelStatusShort[self::STATUS_NOT_QUALIFIED] = $langs->trans('NotSelected'); $this->labelStatusShort[self::STATUS_NOT_QUALIFIED] = $langs->transnoentitiesnoconv('NotSelected');
$this->labelStatusShort[self::STATUS_DONE] = $langs->trans('Done'); $this->labelStatusShort[self::STATUS_DONE] = $langs->transnoentitiesnoconv('Done');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

4
htdocs/expedition/class/expedition.class.php
View File

@ -1853,8 +1853,8 @@ class Expedition extends CommonObject
// phpcs:enable // phpcs:enable
global $langs; global $langs;
$labelStatus = $langs->trans($this->statuts[$status]); $labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
$labelStatusShort = $langs->trans($this->statutshorts[$status]); $labelStatusShort = $langs->transnoentitiesnoconv($this->statutshorts[$status]);
$statusType = 'status'.$status; $statusType = 'status'.$status;
if ($status == self::STATUS_VALIDATED) { if ($status == self::STATUS_VALIDATED) {

20
htdocs/holiday/class/holiday.class.php
View File

@ -1266,16 +1266,16 @@ class Holiday extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('DraftCP'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('DraftCP');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ToReviewCP');
$this->labelStatus[self::STATUS_APPROVED] = $langs->trans('ApprovedCP'); $this->labelStatus[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('ApprovedCP');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('CancelCP'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('CancelCP');
$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('RefuseCP'); $this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('RefuseCP');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('DraftCP'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('DraftCP');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ToReviewCP');
$this->labelStatusShort[self::STATUS_APPROVED] = $langs->trans('ApprovedCP'); $this->labelStatusShort[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('ApprovedCP');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('CancelCP'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('CancelCP');
$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('RefuseCP'); $this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('RefuseCP');
} }
$params = array(); $params = array();

8
htdocs/hrm/class/establishment.class.php
View File

@ -369,10 +369,10 @@ class Establishment extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_OPEN] = $langs->trans('Open'); $this->labelStatus[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Open');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
$this->labelStatusShort[self::STATUS_OPEN] = $langs->trans('Open'); $this->labelStatusShort[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Open');
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/evaluation.class.php
View File

@ -844,12 +844,12 @@ class Evaluation extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/evaluationdet.class.php
View File

@ -816,12 +816,12 @@ class Evaluationline extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/job.class.php
View File

@ -850,12 +850,12 @@ class Job extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/position.class.php
View File

@ -825,12 +825,12 @@ class Position extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status' . $status; $statusType = 'status' . $status;

12
htdocs/hrm/class/skill.class.php
View File

@ -867,12 +867,12 @@ class Skill extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/skilldet.class.php
View File

@ -804,12 +804,12 @@ class Skilldet extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/hrm/class/skillrank.class.php
View File

@ -843,12 +843,12 @@ class SkillRank extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("hrm"); //$langs->load("hrm");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/knowledgemanagement/class/knowledgerecord.class.php
View File

@ -827,12 +827,12 @@ class KnowledgeRecord extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("knowledgemanagement"); //$langs->load("knowledgemanagement");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

16
htdocs/loan/class/loan.class.php
View File

@ -517,17 +517,17 @@ class Loan extends CommonObject
unset($this->labelStatus); // Force to reset the array of status label, because label can change depending on parameters unset($this->labelStatus); // Force to reset the array of status label, because label can change depending on parameters
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid'); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid'); $this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
$this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted"); $this->labelStatus[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
if ($status == 0 && $alreadypaid > 0) { if ($status == 0 && $alreadypaid > 0) {
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid'); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted"); $this->labelStatusShort[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
if ($status == 0 && $alreadypaid > 0) { if ($status == 0 && $alreadypaid > 0) {
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
} }

12
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -883,12 +883,12 @@ class MyObject extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule@mymodule"); //$langs->load("mymodule@mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/opensurvey/class/opensurveysondage.class.php
View File

@ -652,12 +652,12 @@ class Opensurveysondage extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Opened'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Opened');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Opened'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Opened');
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed'); $this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

20
htdocs/partnership/class/partnership.class.php
View File

@ -1065,16 +1065,16 @@ class Partnership extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("partnership"); //$langs->load("partnership");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatus[self::STATUS_ACCEPTED] = $langs->trans('Accepted'); $this->labelStatus[self::STATUS_ACCEPTED] = $langs->transnoentitiesnoconv('Accepted');
$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused'); $this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatusShort[self::STATUS_ACCEPTED] = $langs->trans('Accepted'); $this->labelStatusShort[self::STATUS_ACCEPTED] = $langs->transnoentitiesnoconv('Accepted');
$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused'); $this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

38
htdocs/product/class/product.class.php
View File

@ -5019,21 +5019,21 @@ class Product extends CommonObject
if ($type == 2) { if ($type == 2) {
switch ($mode) { switch ($mode) {
case 0: case 0:
$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : ($status == 1 ? $langs->trans('ProductStatusOnBatch') : $langs->trans('ProductStatusOnSerial'))); $label = ($status == 0 ? $langs->transnoentitiesnoconv('ProductStatusNotOnBatch') : ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial')));
return dolGetStatus($label); return dolGetStatus($label);
case 1: case 1:
$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : ($status == 1 ? $langs->trans('ProductStatusOnBatchShort') : $langs->trans('ProductStatusOnSerialShort'))); $label = ($status == 0 ? $langs->transnoentitiesnoconv('ProductStatusNotOnBatchShort') : ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort')));
return dolGetStatus($label); return dolGetStatus($label);
case 2: case 2:
return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2); return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
case 3: case 3:
return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot'); return dolGetStatus($langs->transnoentitiesnoconv('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot');
case 4: case 4:
return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2); return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
case 5: case 5:
return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2); return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
default: default:
return dolGetStatus($langs->trans('Unknown')); return dolGetStatus($langs->transnoentitiesnoconv('Unknown'));
} }
} }
@ -5042,34 +5042,34 @@ class Product extends CommonObject
if ($status == 0) { if ($status == 0) {
// $type 0=Status "to sell", 1=Status "to buy", 2=Status "to Batch" // $type 0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
if ($type == 0) { if ($type == 0) {
$labelStatus = $langs->trans('ProductStatusNotOnSellShort'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnSellShort');
$labelStatusShort = $langs->trans('ProductStatusNotOnSell'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnSell');
} elseif ($type == 1) { } elseif ($type == 1) {
$labelStatus = $langs->trans('ProductStatusNotOnBuyShort'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnBuyShort');
$labelStatusShort = $langs->trans('ProductStatusNotOnBuy'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnBuy');
} elseif ($type == 2) { } elseif ($type == 2) {
$labelStatus = $langs->trans('ProductStatusNotOnBatch'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnBatch');
$labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnBatchShort');
} }
} elseif ($status == 1) { } elseif ($status == 1) {
// $type 0=Status "to sell", 1=Status "to buy", 2=Status "to Batch" // $type 0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
if ($type == 0) { if ($type == 0) {
$labelStatus = $langs->trans('ProductStatusOnSellShort'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSellShort');
$labelStatusShort = $langs->trans('ProductStatusOnSell'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSell');
} elseif ($type == 1) { } elseif ($type == 1) {
$labelStatus = $langs->trans('ProductStatusOnBuyShort'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnBuyShort');
$labelStatusShort = $langs->trans('ProductStatusOnBuy'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnBuy');
} elseif ($type == 2) { } elseif ($type == 2) {
$labelStatus = ($status == 1 ? $langs->trans('ProductStatusOnBatch') : $langs->trans('ProductStatusOnSerial')); $labelStatus = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial'));
$labelStatusShort = ($status == 1 ? $langs->trans('ProductStatusOnBatchShort') : $langs->trans('ProductStatusOnSerialShort')); $labelStatusShort = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort'));
} }
} elseif ( $type == 2 && $status == 2 ) { } elseif ( $type == 2 && $status == 2 ) {
$labelStatus = $langs->trans('ProductStatusOnSerial'); $labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSerial');
$labelStatusShort = $langs->trans('ProductStatusOnSerialShort'); $labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSerialShort');
} }
if ($mode > 6) { if ($mode > 6) {
return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0); return dolGetStatus($langs->transnoentitiesnoconv('Unknown'), '', '', 'status0', 0);
} else { } else {
return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode); return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode);
} }

12
htdocs/product/class/productfournisseurprice.class.php
View File

@ -675,12 +675,12 @@ class ProductFournisseurPrice extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("buypricehistory@buypricehistory"); //$langs->load("buypricehistory@buypricehistory");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

16
htdocs/product/inventory/class/inventory.class.php
View File

@ -615,14 +615,14 @@ class Inventory extends CommonObject
global $langs; global $langs;
$labelStatus = array(); $labelStatus = array();
$labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated').' ('.$langs->trans('Started').')'; $labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated').' ('.$langs->transnoentitiesnoconv('Started').')';
$labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled'); $labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$labelStatus[self::STATUS_RECORDED] = $langs->trans('Closed'); $labelStatus[self::STATUS_RECORDED] = $langs->transnoentitiesnoconv('Closed');
$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Started'); $labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Started');
$labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled'); $labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$labelStatusShort[self::STATUS_RECORDED] = $langs->trans('Closed'); $labelStatusShort[self::STATUS_RECORDED] = $langs->transnoentitiesnoconv('Closed');
$statusType = 'status'.$status; $statusType = 'status'.$status;
if ($status == self::STATUS_RECORDED) { if ($status == self::STATUS_RECORDED) {

4
htdocs/product/stock/class/entrepot.class.php
View File

@ -680,8 +680,8 @@ class Entrepot extends CommonObject
} }
$langs->load('stocks'); $langs->load('stocks');
$label = $langs->trans($this->statuts[$status]); $label = $langs->transnoentitiesnoconv($this->statuts[$status]);
$labelshort = $langs->trans($this->statuts[$status]); $labelshort = $langs->transnoentitiesnoconv($this->statuts[$status]);
return dolGetStatus($label, $labelshort, '', $statusType, $mode); return dolGetStatus($label, $labelshort, '', $statusType, $mode);
} }

2
htdocs/projet/class/project.class.php
View File

@ -1152,7 +1152,7 @@ class Project extends CommonObject
$statusClass = $statustrans[$status]; $statusClass = $statustrans[$status];
} }
return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode); return dolGetStatus($langs->transnoentitiesnoconv($this->statuts_long[$status]), $langs->transnoentitiesnoconv($this->statuts_short[$status]), '', $statusClass, $mode);
} }
/** /**

4
htdocs/reception/class/reception.class.php
View File

@ -1167,8 +1167,8 @@ class Reception extends CommonObject
// phpcs:enable // phpcs:enable
global $langs; global $langs;
$labelStatus = $langs->trans($this->statuts[$status]); $labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
$labelStatusShort = $langs->trans($this->statutshorts[$status]); $labelStatusShort = $langs->transnoentitiesnoconv($this->statutshorts[$status]);
$statusType = 'status'.$status; $statusType = 'status'.$status;
if ($status == self::STATUS_VALIDATED) { if ($status == self::STATUS_VALIDATED) {

28
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@ -798,20 +798,20 @@ class RecruitmentCandidature extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("recruitment@recruitment"); //$langs->load("recruitment@recruitment");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Received').' ('.$langs->trans("InterviewToDo").')'; $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Received').' ('.$langs->transnoentitiesnoconv("InterviewToDo").')';
$this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed'); $this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->transnoentitiesnoconv('ContractProposed');
$this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned'); $this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->transnoentitiesnoconv('ContractSigned');
$this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused'); $this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->transnoentitiesnoconv('ContractRefused');
$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused'); $this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Received'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Received');
$this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed'); $this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->transnoentitiesnoconv('ContractProposed');
$this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned'); $this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->transnoentitiesnoconv('ContractSigned');
$this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused'); $this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->transnoentitiesnoconv('ContractRefused');
$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused'); $this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

16
htdocs/recruitment/class/recruitmentjobposition.class.php
View File

@ -893,14 +893,14 @@ class RecruitmentJobPosition extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("recruitment"); //$langs->load("recruitment");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatus[self::STATUS_RECRUITED] = $langs->trans('Recruited'); $this->labelStatus[self::STATUS_RECRUITED] = $langs->transnoentitiesnoconv('Recruited');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatusShort[self::STATUS_RECRUITED] = $langs->trans('Recruited'); $this->labelStatusShort[self::STATUS_RECRUITED] = $langs->transnoentitiesnoconv('Recruited');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

12
htdocs/salaries/class/salary.class.php
View File

@ -700,12 +700,12 @@ class Salary extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid'); $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$this->labelStatus[self::STATUS_PAID] = $langs->trans('BillStatusPaid'); $this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid'); $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('BillStatusPaid'); $this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted"); if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
} }
$statusType = 'status1'; $statusType = 'status1';

8
htdocs/societe/class/companypaymentmode.class.php
View File

@ -519,10 +519,10 @@ class CompanyPaymentMode extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status5'; $statusType = 'status5';

8
htdocs/societe/class/societe.class.php
View File

@ -2801,10 +2801,10 @@ class Societe extends CommonObject
} }
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
$this->labelStatus[0] = $langs->trans("ActivityCeased"); $this->labelStatus[0] = $langs->transnoentitiesnoconv("ActivityCeased");
$this->labelStatus[1] = $langs->trans("InActivity"); $this->labelStatus[1] = $langs->transnoentitiesnoconv("InActivity");
$this->labelStatusShort[0] = $langs->trans("ActivityCeased"); $this->labelStatusShort[0] = $langs->transnoentitiesnoconv("ActivityCeased");
$this->labelStatusShort[1] = $langs->trans("InActivity"); $this->labelStatusShort[1] = $langs->transnoentitiesnoconv("InActivity");
} }
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);

8
htdocs/ticket/class/cticketcategory.class.php
View File

@ -745,10 +745,10 @@ class CTicketCategory extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule@mymodule"); //$langs->load("mymodule@mymodule");
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

6
htdocs/ticket/class/ticket.class.php
View File

@ -1300,8 +1300,8 @@ class Ticket extends CommonObject
} elseif ($status == self::STATUS_CLOSED) { } elseif ($status == self::STATUS_CLOSED) {
$statusType = 'status6'; $statusType = 'status6';
} else { } else {
$labelStatus = $langs->trans('Unknown'); $labelStatus = 'Unknown';
$labelStatusShort = $langs->trans('Unknown'); $labelStatusShort = 'Unknown';
$statusType = 'status0'; $statusType = 'status0';
$mode = 0; $mode = 0;
} }
@ -1311,7 +1311,7 @@ class Ticket extends CommonObject
$params = array('tooltip' => 'no'); $params = array('tooltip' => 'no');
} }
return dolGetStatus($langs->trans($labelStatus), $langs->trans($labelStatusShort), '', $statusType, $mode, '', $params); return dolGetStatus($langs->transnoentitiesnoconv($labelStatus), $langs->transnoentitiesnoconv($labelStatusShort), '', $statusType, $mode, '', $params);
} }

8
htdocs/user/class/user.class.php
View File

@ -2806,10 +2806,10 @@ class User extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
} }
$statusType = 'status5'; $statusType = 'status5';

8
htdocs/website/class/website.class.php
View File

@ -867,10 +867,10 @@ class Website extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
} }
$statusType = 'status5'; $statusType = 'status5';

8
htdocs/website/class/websitepage.class.php
View File

@ -835,10 +835,10 @@ class WebsitePage extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
} }
$statusType = 'status5'; $statusType = 'status5';

4
htdocs/workstation/class/workstation.class.php
View File

@ -850,8 +850,8 @@ class Workstation extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("workstation"); //$langs->load("workstation");
$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
} }
$statusType = 'status'.$status; $statusType = 'status'.$status;

8
htdocs/zapier/class/hook.class.php
View File

@ -611,10 +611,10 @@ class Hook extends CommonObject
if (empty($this->labelStatus) || empty($this->labelStatusShort)) { if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs; global $langs;
//$langs->load("mymodule"); //$langs->load("mymodule");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
} }
$statusType = 'status5'; $statusType = 'status5';