Skip to content

[MAINTENANCE] Use TYPO3 DateFormatter for date formatting in SolrCoreStatus #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fschoelzel wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+4 −11
Draft

[MAINTENANCE] Use TYPO3 DateFormatter for date formatting in SolrCoreStatus #1392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d8839
[MAINTENANCE] Use TYPO3 DateFormatter for date formatting in SolrCore…
fschoelzel Dec 3, 2024
d0c79a1
Merge branch 'main' into fix-strftime-solrcorestatus
sebastian-meyer Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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'];
Expand All @@ -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),
Expand Down