Skip to content

Commit 5c5b85f

Browse files
Chhandak.BaruaChhandak.Barua
authored andcommitted
ACP2E-362: Invalid date-time format in the admin order grid for French local
1 parent 9ac2f59 commit 5c5b85f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingDateAfterChangeFrenchCanadaInterfaceLocaleTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
<grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateInFrenchLocale"/>
8282

8383
<!--Checking Date after changing "Interface Locale"-->
84-
<assertStringNotContainsString stepKey="checkingDateAfterChangeInterfaceLocale">
85-
<expectedResult type="string">in</expectedResult>
84+
<assertStringContainsString stepKey="checkingDateAfterChangeInterfaceLocale">
85+
<expectedResult type="string">min</expectedResult>
8686
<actualResult type="variable">grabPurchaseDateInFrenchLocale</actualResult>
87-
</assertStringNotContainsString>
87+
</assertStringContainsString>
8888
</test>
8989
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ 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'){
117+
if ($config['storeLocale'] == 'fr_CA' || $config['storeLocale'] == 'pt_BR') {
118118
$config['dateFormat'] = preg_replace("/([^']*)'([^']+)'([^']*)/", '$1[$2]$3', $config['dateFormat']);
119119
}
120120
}

0 commit comments

Comments
 (0)