From 35d8839eef05fe233193650dfb4737f249a5fd66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Sch=C3=B6lzel?= Date: Tue, 3 Dec 2024 14:25:12 +0100 Subject: [PATCH] [MAINTENANCE] Use TYPO3 DateFormatter for date formatting in SolrCoreStatus --- .../Form/FieldInformation/SolrCoreStatus.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php b/Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php index f45f4e82ee..2df25c2cbd 100644 --- a/Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php +++ b/Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php @@ -16,6 +16,7 @@ use Kitodo\Dlf\Common\Helper; use Kitodo\Dlf\Common\Solr\Solr; use TYPO3\CMS\Backend\Form\AbstractNode; +use TYPO3\CMS\Core\Localization\DateFormatter; use TYPO3\CMS\Core\Messaging\FlashMessage; /** @@ -38,14 +39,7 @@ class SolrCoreStatus extends AbstractNode public function render(): array { $result = $this->initializeResultArray(); - - // Get date formatter - $dateFormatter = new IntlDateFormatter( - Helper::getLanguageService()->lang, // locale - IntlDateFormatter::MEDIUM, // dateType - IntlDateFormatter::MEDIUM // timeType - ); - + $dateFormatter = new DateFormatter(); // Show only when editing existing records. if ($this->data['command'] !== 'new') { $core = $this->data['databaseRow']['index_name']; @@ -66,9 +60,8 @@ public function render(): array $dateTimeTo = new \DateTime("@$uptimeInSeconds"); $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a ' . Helper::getLanguageService()->getLL('flash.days') . ', %H:%I:%S'); $numDocuments = $response->getNumberOfDocuments(); - $startTime = $response->getStartTime() ? $dateFormatter->format($response->getStartTime()) : 'N/A'; - $lastModified = $response->getLastModified() ? $dateFormatter->format($response->getLastModified()) : 'N/A'; - + $startTime = $response->getStartTime() ? $dateFormatter->strftime('%c', $response->getStartTime()->getTimestamp(), Helper::getLanguageService()->lang) : 'N/A'; + $lastModified = $response->getLastModified() ? $dateFormatter->strftime('%c', $response->getLastModified()->getTimestamp(), Helper::getLanguageService()->lang) : 'N/A'; // Create flash message. Helper::addMessage( sprintf(Helper::getLanguageService()->getLL('flash.coreStatus'), $startTime, $uptime, $lastModified, $numDocuments),