From 6c2a08a4578508200411c66c91f451fc92d5824a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Aug 2022 20:24:17 +0200 Subject: [PATCH] Fix translation of label of cron job. --- htdocs/cron/list.php | 12 ++++++++---- htdocs/langs/en_US/interventions.lang | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 40fe27d3404..d50ff41c1f0 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -491,7 +491,7 @@ if ($num > 0) { $object->id = $obj->rowid; $object->ref = $obj->rowid; - $object->label = $obj->label; + $object->label = preg_replace('/:.*$/', '', $obj->label); $object->status = $obj->status; $object->priority = $obj->priority; $object->processing = $obj->processing; @@ -499,6 +499,10 @@ if ($num > 0) { $object->datestart = $db->jdate($obj->datestart); $object->dateend = $db->jdate($obj->dateend); $object->module_name = $obj->module_name; + $reg = array(); + if (preg_match('/:(.*)$/', $obj->label, $reg)) { + $langs->load($reg[1]); + } $datelastrun = $db->jdate($obj->datelastrun); $datelastresult = $db->jdate($obj->datelastresult); @@ -512,9 +516,9 @@ if ($num > 0) { // Label print ''; - if (!empty($obj->label)) { - $object->ref = $langs->trans($obj->label); - print ''.$object->getNomUrl(0, '', 1).''; + if (!empty($object->label)) { + $object->ref = $langs->trans($object->label); + print ''.$object->getNomUrl(0, '', 1).''; $object->ref = $obj->rowid; } else { //print $langs->trans('CronNone'); diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index a57a84fc4c8..767688a4ce8 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -68,3 +68,4 @@ ConfirmReopenIntervention=Are you sure you want to open back the intervention