diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 6fd71669d9c..ed95546cd67 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -337,7 +337,7 @@ if (($action == "create") || ($action == "edit")) { print ''; print $langs->trans('CronLabel').""; - print "label."\" /> "; + print ' '; print ""; print ""; print ""; @@ -353,7 +353,7 @@ if (($action == "create") || ($action == "edit")) { print ''; print $langs->trans('CronModule').""; - print "module_name."\" /> "; + print ' '; print ""; print ""; print $form->textwithpicto('', $langs->trans("CronModuleHelp"), 1, 'help'); @@ -362,7 +362,7 @@ if (($action == "create") || ($action == "edit")) { print ''; print $langs->trans('CronClassFile').""; - print ' '; + print ' '; print ""; print ""; print $form->textwithpicto('', $langs->trans("CronClassFileHelp"), 1, 'help'); @@ -371,7 +371,7 @@ if (($action == "create") || ($action == "edit")) { print ''; print $langs->trans('CronObject').""; - print "objectname."\" /> "; + print ' '; print ""; print ""; print $form->textwithpicto('', $langs->trans("CronObjectHelp"), 1, 'help'); @@ -380,7 +380,7 @@ if (($action == "create") || ($action == "edit")) { print ''; print $langs->trans('CronMethod').""; - print ' '; + print ' '; print ""; print ""; print $form->textwithpicto('', $langs->trans("CronMethodHelp"), 1, 'help'); @@ -545,8 +545,15 @@ if (($action == "create") || ($action == "edit")) { $linkback = ''.$langs->trans("BackToList").''; + $reg = array(); + if (preg_match('/:(.*)$/', $object->label, $reg)) { + $langs->load($reg[1]); + } + + $labeltoshow = preg_replace('/:.*$/', '', $object->label); + $morehtmlref = '
'; - $morehtmlref .= $langs->trans($object->label); + $morehtmlref .= $langs->trans($labeltoshow); $morehtmlref .= '
'; dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index d50ff41c1f0..2732e41dc14 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -489,6 +489,11 @@ if ($num > 0) { } } + $reg = array(); + if (preg_match('/:(.*)$/', $obj->label, $reg)) { + $langs->load($reg[1]); + } + $object->id = $obj->rowid; $object->ref = $obj->rowid; $object->label = preg_replace('/:.*$/', '', $obj->label); @@ -499,10 +504,6 @@ 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);