ACP2E-362: Invalid date-time format in the admin order grid for French local

Author: Chhandak.Barua

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

@@ -114,9 +114,6 @@ public function prepare()
         ];
         if (!isset($config['dateFormat'])) {
             $config['dateFormat'] = $this->timezone->getDateTimeFormat(\IntlDateFormatter::MEDIUM);
-            if ($config['storeLocale'] == 'fr_CA' || $config['storeLocale'] == 'pt_BR') {
-                $config['dateFormat'] = preg_replace("/([^']*)'([^']+)'([^']*)/", '$1[$2]$3', $config['dateFormat']);
-            }
         }
         $this->setData('config', $config);
 

lib/web/mage/utils/misc.js

@@ -93,8 +93,12 @@ define([
             var result = mageFormat;
 
             _.each(map, function (moment, mage) {
-                result = result.replace(mage, moment);
+                result = result.replace(
+                    new RegExp(`${mage}(?=([^']*'[^']*')*[^']*$)`),
+                    moment
+                );
             });
+            result = result.replace(/'(.*?)'/g, '[$1]');
 
             return result;
         },