From a2690284b436bc2856bf645ee0d5b2060bf2e85d Mon Sep 17 00:00:00 2001
From: hissy <hishikawa@macareux.co.jp>
Date: Tue, 7 Jan 2025 23:23:40 +0900
Subject: [PATCH] Show scheduled times of automated tasks in system timezone
 instead of server timezone

---
 concrete/src/Entity/Command/ScheduledTask.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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;