diff --git a/concrete/src/Entity/Command/ScheduledTask.php b/concrete/src/Entity/Command/ScheduledTask.php index b63cca6b57e..15cd05a1816 100644 --- a/concrete/src/Entity/Command/ScheduledTask.php +++ b/concrete/src/Entity/Command/ScheduledTask.php @@ -145,11 +145,9 @@ public function getCronExpressionObject(): CronExpression #[\ReturnTypeWillChange] public function jsonSerialize() { - $timezone = date_default_timezone_get(); - $dateScheduledString = (new \DateTime('@' . $this->getDateScheduled())) - ->setTimezone(new \DateTimeZone($timezone)) - ->format('F d, Y g:i a'); - + /** @var \Concrete\Core\Localization\Service\Date $date */ + $date = app('helper/date'); + $dateScheduledString = $date->formatPrettyDateTime($this->getDateScheduled()); $cronExpression = $this->getCronExpressionObject(); $data = [ @@ -159,7 +157,7 @@ public function jsonSerialize() 'dateScheduled' => $this->getDateScheduled(), 'dateScheduledString' => $dateScheduledString, 'cronExpression' => $this->getCronExpression(), - 'nextRunDate' => $cronExpression->getNextRunDate()->format('Y-m-d H:i:s'), + 'nextRunDate' => $date->formatPrettyDateTime($cronExpression->getNextRunDate()), 'user' => $this->getUser(), ]; return $data;