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

Fix translation of label of cron job.

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-22 20:24:17 +02:00
parent 156479cda3
commit 6c2a08a457
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/cron/list.php
View File

@ -491,7 +491,7 @@ if ($num > 0) {
$object->id = $obj->rowid; $object->id = $obj->rowid;
$object->ref = $obj->rowid; $object->ref = $obj->rowid;
$object->label = $obj->label; $object->label = preg_replace('/:.*$/', '', $obj->label);
$object->status = $obj->status; $object->status = $obj->status;
$object->priority = $obj->priority; $object->priority = $obj->priority;
$object->processing = $obj->processing; $object->processing = $obj->processing;
@ -499,6 +499,10 @@ if ($num > 0) {
$object->datestart = $db->jdate($obj->datestart); $object->datestart = $db->jdate($obj->datestart);
$object->dateend = $db->jdate($obj->dateend); $object->dateend = $db->jdate($obj->dateend);
$object->module_name = $obj->module_name; $object->module_name = $obj->module_name;
$reg = array();
if (preg_match('/:(.*)$/', $obj->label, $reg)) {
$langs->load($reg[1]);
}
$datelastrun = $db->jdate($obj->datelastrun); $datelastrun = $db->jdate($obj->datelastrun);
$datelastresult = $db->jdate($obj->datelastresult); $datelastresult = $db->jdate($obj->datelastresult);
@ -512,9 +516,9 @@ if ($num > 0) {
// Label // Label
print '<td class="tdoverflowmax300">'; print '<td class="tdoverflowmax300">';
if (!empty($obj->label)) { if (!empty($object->label)) {
$object->ref = $langs->trans($obj->label); $object->ref = $langs->trans($object->label);
print '<span title="'.dol_escape_htmltag($langs->trans($obj->label)).'">'.$object->getNomUrl(0, '', 1).'</span>'; print '<span title="'.dol_escape_htmltag($langs->trans($object->label)).'">'.$object->getNomUrl(0, '', 1).'</span>';
$object->ref = $obj->rowid; $object->ref = $obj->rowid;
} else { } else {
//print $langs->trans('CronNone'); //print $langs->trans('CronNone');

1
htdocs/langs/en_US/interventions.lang
View File

@ -68,3 +68,4 @@ ConfirmReopenIntervention=Are you sure you want to open back the intervention <b
GenerateInter=Generate intervention GenerateInter=Generate intervention
FichinterNoContractLinked=Intervention %s has been created without a linked contract. FichinterNoContractLinked=Intervention %s has been created without a linked contract.
ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created. ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
NextDateToIntervention=Date for next intervention generation