pkp/pkp-lib#9303 Use Carbon for translating dates instead of date()

pkp · Sep 6, 2024 · bc1a6f4 · bc1a6f4
1 parent 6aba5f0
commit bc1a6f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/classes/components/forms/publication/PublishForm.php b/classes/components/forms/publication/PublishForm.php
@@ -22,6 +22,7 @@
 use PKP\components\forms\FormComponent;
 use PKP\core\Core;
 use PKP\core\PKPString;
+use PKP\facades\Locale;
 
 define('FORM_PUBLISH', 'publish');
 
@@ -72,12 +73,13 @@ public function __construct($action, $publication, $submissionContext, $requirem
             // If a publication date has already been set and the date has passed this will
             // be published immediately regardless of the issue assignment
             if ($publication->getData('datePublished') && $publication->getData('datePublished') <= Core::getCurrentDate()) {
-                $timestamp = strtotime($publication->getData('datePublished'));
                 $dateFormatLong = PKPString::convertStrftimeFormat($submissionContext->getLocalizedDateFormatLong());
                 $msg = __(
                     'publication.publish.confirmation.datePublishedInPast',
                     [
-                        'datePublished' => date($dateFormatLong, $timestamp),
+                        'datePublished' => (new \Carbon\Carbon($publication->getData('datePublished')))
+                            ->locale(Locale::getLocale())
+                            ->translatedFormat($dateFormatLong),
                     ]
                 );
                 $submitLabel = __('publication.publish');

diff --git a/controllers/grid/issues/IssueGridCellProvider.php b/controllers/grid/issues/IssueGridCellProvider.php
@@ -22,6 +22,7 @@
 use PKP\controllers\grid\GridColumn;
 use PKP\controllers\grid\GridHandler;
 use PKP\core\PKPString;
+use PKP\facades\Locale;
 use PKP\linkAction\LinkAction;
 use PKP\linkAction\request\AjaxModal;
 
@@ -92,7 +93,7 @@ public function getTemplateVarsFromRowColumn($row, $column)
                 if ($datePublished) {
                     $datePublished = strtotime($datePublished);
                 }
-                return ['label' => $datePublished ? date($this->dateFormatShort, $datePublished) : ''];
+                return ['label' => $datePublished ? (new \Carbon\Carbon($datePublished))->locale(Locale::getLocale())->translatedFormat($this->dateFormatShort) : ''];
             case 'numArticles':
                 return ['label' => $issue->getNumArticles()];
             default: assert(false);