Skip to content

Commit ad7baa3

Browse files
Chhandak.BaruaChhandak.Barua
authored andcommitted
ACP2E-362: Invalid date-time format in the admin order grid for French local
1 parent 8a71af4 commit ad7baa3

File tree

1 file changed

+3
-0
lines changed
  • app/code/Magento/Ui/Component/Listing/Columns

1 file changed

+3
-0
lines changed

app/code/Magento/Ui/Component/Listing/Columns/Date.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ public function prepare()
114114
];
115115
if (!isset($config['dateFormat'])) {
116116
$config['dateFormat'] = $this->timezone->getDateTimeFormat(\IntlDateFormatter::MEDIUM);
117+
if ($config['storeLocale'] == 'fr_CA' || $config['storeLocale'] == 'pt_BR') {
118+
$config['dateFormat'] = preg_replace("/([^']*)'([^']+)'([^']*)/", '$1[$2]$3', $config['dateFormat']);
119+
}
117120
}
118121
$this->setData('config', $config);
119122

0 commit comments

Comments
 (0)