diff --git a/application/controllers/Cron.php b/application/controllers/Cron.php index 305bc0491..2cd7534e0 100644 --- a/application/controllers/Cron.php +++ b/application/controllers/Cron.php @@ -37,6 +37,7 @@ class cron extends CI_Controller { $data['page_title'] = __("Cron Manager"); $data['crons'] = $this->cron_model->get_crons(); + $data['cron_allow_insecure'] = $this->config->item('cron_allow_insecure'); $mastercron = array(); $mastercron = $this->get_mastercron_status(); @@ -257,19 +258,19 @@ class cron extends CI_Controller { $diff = $now->getTimestamp() - $timestamp_last_run->getTimestamp(); if ($diff >= 0 && $diff <= $warning_timelimit_seconds) { - $result['status'] = 'OK'; + $result['status'] = __("OK"); $result['status_class'] = 'success'; } else { if ($diff <= $error_timelimit_seconds) { - $result['status'] = 'Last run occurred more than ' . $warning_timelimit_seconds . ' seconds ago.
Please check your master cron! It should run every minute (* * * * *).'; + $result['status'] = sprintf(__("Last run occurred more than %s seconds ago.
Please check your master cron! It should run every minute (* * * * *)."), $warning_timelimit_seconds); $result['status_class'] = 'warning'; } else { - $result['status'] = 'Last run occurred more than ' . ($error_timelimit_seconds / 60) . ' minutes ago.
Seems like your Mastercron isn\'t running!
It should run every minute (* * * * *).'; + $result['status'] = sprintf(__("Last run occurred more than %s minutes ago.
Seems like your Mastercron isn't running!
It should run every minute (* * * * *)."), ($error_timelimit_seconds / 60)); $result['status_class'] = 'danger'; } } } else { - $result['status'] = 'Not running'; + $result['status'] = _pgettext("Master Cron", "Not running"); $result['status_class'] = 'danger'; } diff --git a/application/views/cron/index.php b/application/views/cron/index.php index 2d7bf6535..b8865b360 100644 --- a/application/views/cron/index.php +++ b/application/views/cron/index.php @@ -14,17 +14,19 @@

-

- -

-
-
* * * * * curl --silent index.php/cron/run &>/dev/null" onclick='copyCron("main_cronjob")'>
-
+ +

+ +

+
+
* * * * * curl --silent index.php/cron/run &>/dev/null" onclick='copyCron("main_cronjob")'>
+
+
= 0) { ?>
- : + :