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

Better label for status schedule of cron tasks.

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-13 11:52:20 +02:00
parent 64e20959f6
commit 969ed4acc1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
htdocs/cron/list.php
View File

@ -372,7 +372,7 @@ print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre" align="center">';
print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled")), $search_status, 1); print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1);
print '</td><td class="liste_titre right">'; print '</td><td class="liste_titre right">';
$searchpicto = $form->showFilterButtons(); $searchpicto = $form->showFilterButtons();
print $searchpicto; print $searchpicto;

3
htdocs/langs/en_US/cron.lang
View File

@ -47,6 +47,7 @@ CronNbRun=Number of launches
CronMaxRun=Maximum number of launches CronMaxRun=Maximum number of launches
CronEach=Every CronEach=Every
JobFinished=Job launched and finished JobFinished=Job launched and finished
Scheduled=Scheduled
#Page card #Page card
CronAdd= Add jobs CronAdd= Add jobs
CronEvery=Execute job each CronEvery=Execute job each
@ -57,7 +58,7 @@ CronNote=Comment
CronFieldMandatory=Fields %s is mandatory CronFieldMandatory=Fields %s is mandatory
CronErrEndDateStartDt=End date cannot be before start date CronErrEndDateStartDt=End date cannot be before start date
StatusAtInstall=Status at module installation StatusAtInstall=Status at module installation
CronStatusActiveBtn=Enable CronStatusActiveBtn=Schedule
CronStatusInactiveBtn=Disable CronStatusInactiveBtn=Disable
CronTaskInactive=This job is disabled CronTaskInactive=This job is disabled
CronId=Id CronId=Id