Merge remote-tracking branch 'origin/ACP2E-4338' into PR_2025_11_20_flowers

Author: thiaramus

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

@@ -43,7 +43,7 @@ define([
             var date;
 
             if (this.storeLocale !== undefined) {
-                moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
+                moment.updateLocale(this.storeLocale, utils.extend({}, this.calendarConfig));
             }
 
             date = moment.utc(this._super());

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/date.test.js

@@ -1,22 +1,23 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /*eslint max-nested-callbacks: 0*/
 define([
     'underscore',
+    'moment',
     'Magento_Ui/js/grid/columns/date'
-], function (_, Date) {
+], function (_, moment, Date) {
     'use strict';
 
     describe('Ui/js/grid/columns/date', function () {
         var date;
 
         beforeEach(function () {
             date = new Date({
-                    dataScope: 'abstract'
-                });
+                dataScope: 'abstract'
+            });
         });
 
         describe('initConfig method', function () {
@@ -28,5 +29,36 @@ define([
                 expect(date.dateFormat).toBeDefined();
             });
         });
+
+        describe('getLabel method', function () {
+            it('uses moment.updateLocale when storeLocale is defined', function () {
+                var value,
+                    label;
+
+                date.storeLocale = 'en_US';
+                date.calendarConfig = {
+                    week: { dow: 1 }
+                };
+                date.index = 'created_at';
+
+                date._super = function () {
+                    return '2025-11-18 15:30:00';
+                };
+
+                value = {
+                    created_at: '2025-11-18 15:30:00'
+                };
+
+                spyOn(moment, 'updateLocale').and.callThrough();
+
+                label = date.getLabel(value, 'YYYY-MM-DD');
+
+                expect(moment.updateLocale).toHaveBeenCalledWith(
+                    'en_US',
+                    jasmine.any(Object)
+                );
+                expect(label).toBe('2025-11-18');
+            });
+        });
     });
 });