From 89f882e737dce44564a41e36c15447f8d3deacab Mon Sep 17 00:00:00 2001 From: Litiano Date: Wed, 25 Nov 2020 16:02:08 -0300 Subject: [PATCH] Fix Wrong Date Format in admin Fix #31020. Quoted values must not be replaced. Quotation marks must be replaced with square brackets. Locale pt_BR date formate is: d 'de' MMM 'de' y HH:mm:ss The current formatting returns: D 'dd' MMM 'de' YYYY HH:mm:ss Correct Moment.js format is: D [de] MMM [de] YYYY HH:mm:ss --- lib/web/mage/utils/misc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js index b1c0c33324c28..7d66334a82b23 100644 --- a/lib/web/mage/utils/misc.js +++ b/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; },