Merge branch 'main' into feature/bump-versions

Author: Chris53897

Entity/BaseScheduledCommand.php

@@ -326,10 +326,10 @@ public function getNextRunDate(bool $checkExecuteImmediately = true): ?DateTime
         return (new CronExpressionLib($this->getCronExpression()))->getNextRunDate();
     }
 
-    public function getCronExpressionTranslated(): string
+    public function getCronExpressionTranslated(string $locale = 'en', bool $timeFormat24hours = false): string
     {
         try {
-            return CronTranslator::translate($this->getCronExpression());
+            return CronTranslator::translate($this->getCronExpression(), $locale, $timeFormat24hours);
         } catch (\Exception $e) {
             return 'error: could not translate cron expression';
         }

Entity/ScheduledCommandInterface.php

@@ -86,7 +86,7 @@ public function setNotes(string $notes): static;
 
     public function getNextRunDate(bool $checkExecuteImmediately = true): ?DateTime;
 
-    public function getCronExpressionTranslated(): string;
+    public function getCronExpressionTranslated(string $locale = 'en', bool $timeFormat24hours = false): string;
 
     public function __toString(): string;
 }

Resources/views/List/index.html.twig

@@ -55,7 +55,7 @@
                     {{ command.command }} {{ command.arguments }}
                 </td>
                 <td>
-                    <span title="{{ command.getCronExpressionTranslated() }}">{{ command.cronExpression }}</span>
+                    <span title="{{ command.getCronExpressionTranslated(app.request.locale) }}">{{ command.cronExpression }}</span>
                 </td>
                 <td>
                     {{ command.logFile }}