MC-37369: Datepicker issue with arabic locale on orders grid

Author: serhii-balko

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml

@@ -27,7 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Generate the datetime default value -->
-        <generateDate date="now" format="n/j/Y g:i A" stepKey="generateDefaultValue"/>
+        <generateDate date="now" format="n/j/y g:i A" stepKey="generateDefaultValue"/>
         <!-- Create new datetime product attribute -->
         <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <actionGroup ref="CreateProductAttributeWithDatetimeFieldActionGroup" stepKey="createAttribute">

lib/internal/Magento/Framework/Stdlib/DateTime/Intl/DateFormatterFactory.php

@@ -32,27 +32,29 @@ class DateFormatterFactory
      * @param int $dateStyle
      * @param int $timeStyle
      * @param string|null $timeZone
+     * @param bool $useFourDigitsForYear
      * @return \IntlDateFormatter
      */
     public function create(
         string $locale,
         int $dateStyle,
         int $timeStyle,
-        ?string $timeZone = null
+        ?string $timeZone = null,
+        bool $useFourDigitsForYear = true
     ): \IntlDateFormatter {
         $formatter = new \IntlDateFormatter(
             $locale,
             $dateStyle,
             $timeStyle,
-            $timeZone ? new \DateTimeZone($timeZone): null
+            $timeZone
         );
         /**
          * Process custom date formats
          */
         $customDateFormat = $this->getCustomDateFormat($locale, $dateStyle, $timeStyle);
         if ($customDateFormat !== null) {
             $formatter->setPattern($customDateFormat);
-        } elseif ($dateStyle === \IntlDateFormatter::SHORT) {
+        } elseif ($dateStyle === \IntlDateFormatter::SHORT && $useFourDigitsForYear) {
             /**
              * Gives 4 places for year value in short style
              */

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -129,7 +129,9 @@ public function getDateFormat($type = \IntlDateFormatter::SHORT)
         $formatter = $this->dateFormatterFactory->create(
             (string)$this->_localeResolver->getLocale(),
             (int)$type,
-            \IntlDateFormatter::NONE
+            \IntlDateFormatter::NONE,
+            null,
+            false
         );
 
         return $formatter->getPattern();
@@ -140,7 +142,13 @@ public function getDateFormat($type = \IntlDateFormatter::SHORT)
      */
     public function getDateFormatWithLongYear()
     {
-        return $this->getDateFormat();
+        $formatter = $this->dateFormatterFactory->create(
+            (string)$this->_localeResolver->getLocale(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE
+        );
+
+        return $formatter->getPattern();
     }
 
     /**

lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php

@@ -180,17 +180,23 @@ public function dateIncludeTimeDataProvider(): array
                 null
             ],
             'Parse date in short style with long year 1999' => [
-                '9/11/1999',
+                '8/11/1999',
                 'en_US',
                 false,
-                '1999-09-11'
+                '1999-08-11'
             ],
             'Parse date in short style with long year 2099' => [
                 '9/2/2099',
                 'en_US',
                 false,
                 '2099-09-02'
             ],
+            'Parse date in short style with short year 1999' => [
+                '8/11/99',
+                'en_US',
+                false,
+                '1999-08-11'
+            ],
         ];
     }
 
@@ -207,14 +213,40 @@ public function testGetDatetimeFormat(string $locale, int $style, string $expect
         $this->assertEquals($expectedFormat, $this->getTimezone()->getDateTimeFormat($style));
     }
 
+    /**
+     * @return array
+     */
     public function getDatetimeFormatDataProvider(): array
     {
         return [
-            ['en_US', \IntlDateFormatter::SHORT, 'M/d/y h:mm a'],
+            ['en_US', \IntlDateFormatter::SHORT, 'M/d/yy h:mm a'],
             ['ar_SA', \IntlDateFormatter::SHORT, 'd/MM/y h:mm a']
         ];
     }
 
+    /**
+     * @param string $locale
+     * @param int $style
+     * @param string $expectedFormat
+     * @dataProvider getDateFormatWithLongYearDataProvider
+     */
+    public function testGetDateFormatWithLongYear(string $locale, string $expectedFormat): void
+    {
+        /** @var Timezone $timezone */
+        $this->localeResolver->method('getLocale')->willReturn($locale);
+        $this->assertEquals($expectedFormat, $this->getTimezone()->getDateFormatWithLongYear());
+    }
+
+    /**
+     * @return array
+     */
+    public function getDateFormatWithLongYearDataProvider(): array
+    {
+        return [
+            ['en_US', 'M/d/y'],
+        ];
+    }
+
     /**
      * @param string $date
      * @param string $configuredTimezone