Merge branch 'MC-41756' of https://github.com/magento-l3/magento2ce into PR-20210423

chittima · chittima · commit 47042679f3b9 · 2021-05-06T17:55:21.000-05:00
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -201,7 +201,7 @@ protected function _prepareForm()
             ]
         );
 
-        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
         $fieldset->addField(
             'default_value_date',
             'date',

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ protected function _prepareForm()`
`201`	`201`	`]`
`202`	`202`	`);`
`203`	`203`
`204`		`- $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);`
	`204`	`+ $dateFormat = $this->_localeDate->getDateFormatWithLongYear();`
`205`	`205`	`$fieldset->addField(`
`206`	`206`	`'default_value_date',`
`207`	`207`	`'date',`