Fixed code

Author: anzin

app/code/Magento/Config/Model/Config/Source/Date/Short.php

@@ -6,6 +6,8 @@
 namespace Magento\Config\Model\Config\Source\Date;
 
 use IntlDateFormatter;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\ResolverInterface;
 
 /**
  * @api
@@ -43,8 +45,12 @@ public function toOptionArray()
     private function getTimeFormat(int $datetime, string $format = 'Y/M/d'): string
     {
         if (!$this->dateFormatter) {
-            $locale = \Locale::getDefault();
-            $this->dateFormatter = new \IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $localeResolver = ObjectManager::getInstance()->get(ResolverInterface::class);
+            $this->dateFormatter = new \IntlDateFormatter(
+                $localeResolver->getLocale(),
+                IntlDateFormatter::SHORT,
+                IntlDateFormatter::SHORT
+            );
         }
         $this->dateFormatter->setPattern($format);
 

dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Cron\Model;
 
 use IntlDateFormatter;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use \Magento\TestFramework\Helper\Bootstrap;
 
@@ -76,8 +77,8 @@ public function testTryLockJobAlreadyLockedSucceeds()
             ->setJobCode("test_job")
             ->setStatus(Schedule::STATUS_RUNNING)
             ->setCreatedAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast))
-            ->setScheduledAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 60, 'Y-M-d H:m'))
-            ->setExecutedAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 61, 'Y-M-d H:m'));
+            ->setScheduledAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 60, 'Y-M-d HH:mm'))
+            ->setExecutedAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 61, 'Y-M-d HH:mm'));
         $oldSchedule->save();
 
         $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
@@ -124,7 +125,7 @@ private function createSchedule($jobCode, $status, $timeOffset = 0)
             ->setJobCode($jobCode)
             ->setStatus($status)
             ->setCreatedAt($this->getTimeFormat($gmtTimestamp))
-            ->setScheduledAt($this->getTimeFormat($gmtTimestamp + $timeOffset, 'Y-M-d H:m'));
+            ->setScheduledAt($this->getTimeFormat($gmtTimestamp + $timeOffset, 'Y-M-d HH:mm'));
         $schedule->save();
 
         return $schedule;
@@ -138,11 +139,15 @@ private function createSchedule($jobCode, $status, $timeOffset = 0)
      *
      * @return string
      */
-    private function getTimeFormat(int $datetime, string $format = 'Y-M-d H:m:s'): string
+    private function getTimeFormat(int $datetime, string $format = 'Y-M-d HH:mm:ss'): string
     {
         if (!$this->dateFormatter) {
-            $locale = \Locale::getDefault();
-            $this->dateFormatter = new IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $localeResolver = Bootstrap::getObjectManager()->create(ResolverInterface::class);
+            $this->dateFormatter = new IntlDateFormatter(
+                $localeResolver->getLocale(),
+                IntlDateFormatter::SHORT,
+                IntlDateFormatter::SHORT
+            );
         }
         $this->dateFormatter->setPattern($format);
 

lib/internal/Magento/Framework/View/Element/Html/Date.php

@@ -6,6 +6,8 @@
 namespace Magento\Framework\View\Element\Html;
 
 use IntlDateFormatter;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\ResolverInterface;
 
 /**
  * Date element block
@@ -78,8 +80,12 @@ protected function _toHtml()
     public function getEscapedValue()
     {
         if ($this->getFormat() && $this->getValue()) {
-            $locale = \Locale::getDefault();
-            $dateFormatter = new IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $localeResolver = ObjectManager::getInstance()->get(ResolverInterface::class);
+            $dateFormatter = new IntlDateFormatter(
+                $localeResolver->getLocale(),
+                IntlDateFormatter::SHORT,
+                IntlDateFormatter::SHORT
+            );
             $dateFormatter->setPattern($this->getFormat());
 
             return $dateFormatter->format(strtotime($this->getValue()));