From d24b84efdf86b19f2389c32f62666b47f31cb391 Mon Sep 17 00:00:00 2001 From: jeroen Date: Wed, 7 Sep 2022 17:21:39 +0200 Subject: [PATCH] BUGFIX: relocating runnow translations --- src/Controller/JobController.php | 8 ++++---- templates/job/index.html.twig | 12 ++++++------ translations/messages.en-l33t.yaml | 26 +++++++++++++------------- translations/messages.en.yaml | 26 +++++++++++++------------- translations/messages.nl.yaml | 26 +++++++++++++------------- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Controller/JobController.php b/src/Controller/JobController.php index 49bdde4..56c7522 100644 --- a/src/Controller/JobController.php +++ b/src/Controller/JobController.php @@ -91,15 +91,15 @@ class JobController extends AbstractController $return = [ 'status' => 'deferred', 'success' => NULL, - 'title' => $translator->trans('job.view.runnow.deferred.title'), - 'message' => $translator->trans('job.view.runnow.deferred.message') + 'title' => $translator->trans('job.index.runnow.deferred.title'), + 'message' => $translator->trans('job.index.runnow.deferred.message') ]; } else { $return = [ 'status' => 'ran', 'success' => $runnowResult['success'], - 'title' => $runnowResult['success'] ? $translator->trans('job.view.runnow.ran.title.success') : $translator->trans('job.view.runnow.ran.title.failed'), - 'message' => $translator->trans('job.view.runnow.ran.message', [ + 'title' => $runnowResult['success'] ? $translator->trans('job.index.runnow.ran.title.success') : $translator->trans('job.index.runnow.ran.title.failed'), + 'message' => $translator->trans('job.index.runnow.ran.message', [ '_runtime_' => number_format($runnowResult['runtime'], 3), '_exitcode_' => $runnowResult['exitcode'] ]), diff --git a/templates/job/index.html.twig b/templates/job/index.html.twig index 5362327..b1f3d6d 100644 --- a/templates/job/index.html.twig +++ b/templates/job/index.html.twig @@ -1,16 +1,16 @@ {% extends "base.html.twig" %} -{% block title %}{{ 'index.title' | trans }}{% endblock %} +{% block title %}{{ 'job.index.title' | trans }}{% endblock %} {% block content %} -

{{ 'index.header' | trans }}

+

{{ 'job.index.header' | trans }}

- - - - + + + + diff --git a/translations/messages.en-l33t.yaml b/translations/messages.en-l33t.yaml index 40c8779..55022a3 100644 --- a/translations/messages.en-l33t.yaml +++ b/translations/messages.en-l33t.yaml @@ -22,20 +22,16 @@ security: label: "D0 n0t f0rg3t" submit-btn: label: "3nt3r" -index: - title: "0v3rv13w" - header: "0v3rv13w 0f t3h cr0nj0bz" - table: - headers: - name: "N4m3" - host: "H0st" - interval: "1nt3rv4L" - nextrun: "N3xtrun" job: - view: - title: "0v3rv13w 0f runz 4 _jobname_" - header: "0v3rv13w 0f runz 4 _jobname_" - edit: "3d1t j0b" + index: + title: "0v3rv13w" + header: "0v3rv13w 0f t3h cr0nj0bz" + table: + headers: + name: "N4m3" + host: "H0st" + interval: "1nt3rv4L" + nextrun: "N3xtrun" runnow: deferred: title: "Cr0nj0b h4z b33n sch3duL3d" @@ -45,6 +41,10 @@ job: success: "Cr0nj0b succ3sfuLLy r4n" failed: "Cr0nj0b f41L3d. PL34s3 ch3ck 0utput b3L0w" message: "Cr0nj0b r4n 1n _runtime_ s3c0ndz w1th 3x1t c0d3 _exitcode_" + view: + title: "0v3rv13w 0f runz 4 _jobname_" + header: "0v3rv13w 0f runz 4 _jobname_" + edit: "3d1t j0b" show: onlyfailed: "0nLy sh0w f41L3d runz" all: "Sh0w 4LL runz" diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index ec1dfa0..902980f 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -22,20 +22,16 @@ security: label: "Remember, remember" submit-btn: label: "Login" -index: - title: "Overview" - header: "Overview of the cronjobs" - table: - headers: - name: "Name" - host: "Host" - interval: "Interval" - nextrun: "Nextrun" job: - view: - title: "Overview of runs for _jobname_" - header: "Overview of runs for _jobname_" - edit: "Edit job" + index: + title: "Overview" + header: "Overview of the cronjobs" + table: + headers: + name: "Name" + host: "Host" + interval: "Interval" + nextrun: "Nextrun" runnow: deferred: title: "Cronjob has been scheduled" @@ -45,6 +41,10 @@ job: success: "Cronjob succesfully ran" failed: "Cronjob failed. Please check output below" message: "Cronjob ran in _runtime_ seconds with exit code _exitcode_" + view: + title: "Overview of runs for _jobname_" + header: "Overview of runs for _jobname_" + edit: "Edit job" show: onlyfailed: "Only show failed runs" all: "Show all runs" diff --git a/translations/messages.nl.yaml b/translations/messages.nl.yaml index d668022..e44751f 100644 --- a/translations/messages.nl.yaml +++ b/translations/messages.nl.yaml @@ -23,20 +23,16 @@ security: label: "Onthoud mij!" submit-btn: label: "Aanmelden" -index: - title: "Overzicht" - header: "Overzicht van de geplande taken" - table: - headers: - name: "Naam" - host: "Host" - interval: "Interval" - nextrun: "Volgende uitvoering" job: - view: - title: "Overzicht van uitvoeringen van _jobname_" - header: "Overzicht van uitvoeringen van _jobname_" - edit: "Bewerk taak" + index: + title: "Overzicht" + header: "Overzicht van de geplande taken" + table: + headers: + name: "Naam" + host: "Host" + interval: "Interval" + nextrun: "Volgende uitvoering" runnow: deferred: title: "Taak werd doorgestuurd naar de daemon" @@ -46,6 +42,10 @@ job: success: "Taak werd succesvol uitgevoerd" failed: "Taak faalde. Hieronder vind u de output ter controle" message: "Taak werd in _runtime_ seconden uitgevoerd met resultaat _exitcode_" + view: + title: "Overzicht van uitvoeringen van _jobname_" + header: "Overzicht van uitvoeringen van _jobname_" + edit: "Bewerk taak" show: onlyfailed: "Toon alleen gefaalde uitvoeringen" all: "Toon alle uitvoeringen"
 {{ 'index.table.headers.name' | trans }}{{ 'index.table.headers.host' | trans }}{{ 'index.table.headers.interval' | trans }}{{ 'index.table.headers.nextrun' | trans }}{{ 'job.index.table.headers.name' | trans }}{{ 'job.index.table.headers.host' | trans }}{{ 'job.index.table.headers.interval' | trans }}{{ 'job.index.table.headers.nextrun' | trans }}