From ec673c6c84e100f6e80a3adbbccf554b149e9b50 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 4 Nov 2024 21:25:10 +0100 Subject: [PATCH 1/2] fix reload button --- application/controllers/Cron.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/application/controllers/Cron.php b/application/controllers/Cron.php index 3cb7c464f..6e2bbe883 100644 --- a/application/controllers/Cron.php +++ b/application/controllers/Cron.php @@ -215,8 +215,8 @@ class cron extends CI_Controller { $single->cron_description = $cron->description; $single->cron_status = $this->cronStatus2html($cron->enabled, $cron->status); $single->cron_expression = $this->cronExpression2html($cron->expression); - $single->cron_last_run = $cron->last_run ?? 'never'; - $single->cron_next_run = ($cron->enabled == '1') ? ($cron->next_run ?? 'calculating..') : 'never'; + $single->cron_last_run = $cron->last_run ?? __("never"); + $single->cron_next_run = ($cron->enabled == '1') ? ($cron->next_run ?? __("calculating...")) : __("never"); $single->cron_edit = $this->cronEdit2html($cron->id); $single->cron_enabled = $this->cronEnabled2html($cron->id, $cron->enabled); array_push($hres, $single); @@ -227,12 +227,16 @@ class cron extends CI_Controller { private function cronStatus2html($enabled, $status) { if ($enabled == '1') { if ($status == 'healthy') { - $htmlret = 'healthy'; + $htmlret = '' . __("healthy") . ''; + } else if ($status == 'failed') { + $htmlret = '' . __("failed") . ''; + } else if ($status == 'pending') { + $htmlret = '' . __("pending") . ''; } else { $htmlret = '' . $status . ''; } } else { - $htmlret = 'disabled'; + $htmlret = '' . __("disabled") . ''; } return $htmlret; } From 3b7fcb8502e7ea91f611201655d1b72406727ec2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 5 Nov 2024 08:16:36 +0000 Subject: [PATCH 2/2] po/mo updates --- .../locale/bg_BG/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/bs/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/cnr/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/cs_CZ/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/de_DE/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/el_GR/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/es_ES/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/et/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/fi_FI/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/fr_FR/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/hr/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/it_IT/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/lt/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/lv/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/nl_NL/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/pl_PL/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/pt_PT/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/ru_RU/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/sq/LC_MESSAGES/messages.po | 65 ++++++++++--------- application/locale/sr/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/sv_SE/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/tr_TR/LC_MESSAGES/messages.po | 65 ++++++++++--------- .../locale/zh_CN/LC_MESSAGES/messages.po | 65 ++++++++++--------- assets/lang_src/messages.pot | 65 ++++++++++--------- 24 files changed, 840 insertions(+), 720 deletions(-) diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 0e6df60b7..b1530d0ef 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-11-04 13:50+0000\n" +"POT-Creation-Date: 2024-11-05 08:16+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: LANGUAGE \n" @@ -588,26 +588,56 @@ msgstr "" msgid "Edit Cronjob" msgstr "" -#: application/controllers/Cron.php:274 +#: application/controllers/Cron.php:218 application/controllers/Cron.php:219 +#: application/views/cron/index.php:83 application/views/cron/index.php:85 +#: application/views/cron/index.php:87 application/views/debug/index.php:519 +#: application/views/debug/index.php:525 application/views/debug/index.php:530 +#: application/views/debug/index.php:535 application/views/debug/index.php:540 +#: application/views/debug/index.php:545 application/views/debug/index.php:550 +#: application/views/user/index.php:136 +msgid "never" +msgstr "" + +#: application/controllers/Cron.php:219 +msgid "calculating..." +msgstr "" + +#: application/controllers/Cron.php:230 application/views/cron/index.php:70 +msgid "healthy" +msgstr "" + +#: application/controllers/Cron.php:232 application/views/cron/index.php:72 +msgid "failed" +msgstr "" + +#: application/controllers/Cron.php:234 application/views/cron/index.php:74 +msgid "pending" +msgstr "" + +#: application/controllers/Cron.php:239 application/views/cron/index.php:79 +msgid "disabled" +msgstr "" + +#: application/controllers/Cron.php:278 #: application/views/interface_assets/footer.php:37 msgid "OK" msgstr "" -#: application/controllers/Cron.php:278 +#: application/controllers/Cron.php:282 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " "It should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:281 +#: application/controllers/Cron.php:285 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " "isn't running!%sIt should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:286 application/views/cron/index.php:29 +#: application/controllers/Cron.php:290 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "" @@ -5815,31 +5845,6 @@ msgstr "" msgid "Next Run" msgstr "" -#: application/views/cron/index.php:70 -msgid "healthy" -msgstr "" - -#: application/views/cron/index.php:72 -msgid "failed" -msgstr "" - -#: application/views/cron/index.php:74 -msgid "pending" -msgstr "" - -#: application/views/cron/index.php:79 -msgid "disabled" -msgstr "" - -#: application/views/cron/index.php:83 application/views/cron/index.php:85 -#: application/views/cron/index.php:87 application/views/debug/index.php:519 -#: application/views/debug/index.php:525 application/views/debug/index.php:530 -#: application/views/debug/index.php:535 application/views/debug/index.php:540 -#: application/views/debug/index.php:545 application/views/debug/index.php:550 -#: application/views/user/index.php:136 -msgid "never" -msgstr "" - #: application/views/cron/index.php:102 msgid "Your Mastercron isn't running." msgstr "" diff --git a/application/locale/lv/LC_MESSAGES/messages.po b/application/locale/lv/LC_MESSAGES/messages.po index 2f802bf07..9c42bb588 100644 --- a/application/locale/lv/LC_MESSAGES/messages.po +++ b/application/locale/lv/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-11-04 13:50+0000\n" +"POT-Creation-Date: 2024-11-05 08:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -588,26 +588,56 @@ msgstr "" msgid "Edit Cronjob" msgstr "" -#: application/controllers/Cron.php:274 +#: application/controllers/Cron.php:218 application/controllers/Cron.php:219 +#: application/views/cron/index.php:83 application/views/cron/index.php:85 +#: application/views/cron/index.php:87 application/views/debug/index.php:519 +#: application/views/debug/index.php:525 application/views/debug/index.php:530 +#: application/views/debug/index.php:535 application/views/debug/index.php:540 +#: application/views/debug/index.php:545 application/views/debug/index.php:550 +#: application/views/user/index.php:136 +msgid "never" +msgstr "" + +#: application/controllers/Cron.php:219 +msgid "calculating..." +msgstr "" + +#: application/controllers/Cron.php:230 application/views/cron/index.php:70 +msgid "healthy" +msgstr "" + +#: application/controllers/Cron.php:232 application/views/cron/index.php:72 +msgid "failed" +msgstr "" + +#: application/controllers/Cron.php:234 application/views/cron/index.php:74 +msgid "pending" +msgstr "" + +#: application/controllers/Cron.php:239 application/views/cron/index.php:79 +msgid "disabled" +msgstr "" + +#: application/controllers/Cron.php:278 #: application/views/interface_assets/footer.php:37 msgid "OK" msgstr "" -#: application/controllers/Cron.php:278 +#: application/controllers/Cron.php:282 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " "It should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:281 +#: application/controllers/Cron.php:285 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " "isn't running!%sIt should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:286 application/views/cron/index.php:29 +#: application/controllers/Cron.php:290 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "" @@ -5815,31 +5845,6 @@ msgstr "" msgid "Next Run" msgstr "" -#: application/views/cron/index.php:70 -msgid "healthy" -msgstr "" - -#: application/views/cron/index.php:72 -msgid "failed" -msgstr "" - -#: application/views/cron/index.php:74 -msgid "pending" -msgstr "" - -#: application/views/cron/index.php:79 -msgid "disabled" -msgstr "" - -#: application/views/cron/index.php:83 application/views/cron/index.php:85 -#: application/views/cron/index.php:87 application/views/debug/index.php:519 -#: application/views/debug/index.php:525 application/views/debug/index.php:530 -#: application/views/debug/index.php:535 application/views/debug/index.php:540 -#: application/views/debug/index.php:545 application/views/debug/index.php:550 -#: application/views/user/index.php:136 -msgid "never" -msgstr "" - #: application/views/cron/index.php:102 msgid "Your Mastercron isn't running." msgstr "" diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.po b/application/locale/nl_NL/LC_MESSAGES/messages.po index 98f4a2633..7b011d57a 100644 --- a/application/locale/nl_NL/LC_MESSAGES/messages.po +++ b/application/locale/nl_NL/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-11-04 13:50+0000\n" +"POT-Creation-Date: 2024-11-05 08:16+0000\n" "PO-Revision-Date: 2024-08-17 10:47+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) \n" "Language-Team: LANGUAGE \n" @@ -589,26 +589,56 @@ msgstr "" msgid "Edit Cronjob" msgstr "" -#: application/controllers/Cron.php:274 +#: application/controllers/Cron.php:218 application/controllers/Cron.php:219 +#: application/views/cron/index.php:83 application/views/cron/index.php:85 +#: application/views/cron/index.php:87 application/views/debug/index.php:519 +#: application/views/debug/index.php:525 application/views/debug/index.php:530 +#: application/views/debug/index.php:535 application/views/debug/index.php:540 +#: application/views/debug/index.php:545 application/views/debug/index.php:550 +#: application/views/user/index.php:136 +msgid "never" +msgstr "" + +#: application/controllers/Cron.php:219 +msgid "calculating..." +msgstr "" + +#: application/controllers/Cron.php:230 application/views/cron/index.php:70 +msgid "healthy" +msgstr "" + +#: application/controllers/Cron.php:232 application/views/cron/index.php:72 +msgid "failed" +msgstr "" + +#: application/controllers/Cron.php:234 application/views/cron/index.php:74 +msgid "pending" +msgstr "" + +#: application/controllers/Cron.php:239 application/views/cron/index.php:79 +msgid "disabled" +msgstr "" + +#: application/controllers/Cron.php:278 #: application/views/interface_assets/footer.php:37 msgid "OK" msgstr "" -#: application/controllers/Cron.php:278 +#: application/controllers/Cron.php:282 #, php-format msgid "" "Last run occurred more than %s seconds ago.%sPlease check your master cron! " "It should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:281 +#: application/controllers/Cron.php:285 #, php-format msgid "" "Last run occurred more than %s minutes ago.%sSeems like your Mastercron " "isn't running!%sIt should run every minute (* * * * *)." msgstr "" -#: application/controllers/Cron.php:286 application/views/cron/index.php:29 +#: application/controllers/Cron.php:290 application/views/cron/index.php:29 msgctxt "Master Cron" msgid "Not running" msgstr "" @@ -5816,31 +5846,6 @@ msgstr "" msgid "Next Run" msgstr "" -#: application/views/cron/index.php:70 -msgid "healthy" -msgstr "" - -#: application/views/cron/index.php:72 -msgid "failed" -msgstr "" - -#: application/views/cron/index.php:74 -msgid "pending" -msgstr "" - -#: application/views/cron/index.php:79 -msgid "disabled" -msgstr "" - -#: application/views/cron/index.php:83 application/views/cron/index.php:85 -#: application/views/cron/index.php:87 application/views/debug/index.php:519 -#: application/views/debug/index.php:525 application/views/debug/index.php:530 -#: application/views/debug/index.php:535 application/views/debug/index.php:540 -#: application/views/debug/index.php:545 application/views/debug/index.php:550 -#: application/views/user/index.php:136 -msgid "never" -msgstr "" - #: application/views/cron/index.php:102 msgid "Your Mastercron isn't running." msgstr ""