DateBox: Use localized day period names (T1327076)

Author: marker dao ®

packages/devextreme/js/__internal/ui/date_box/date_box.mask.ts

@@ -1,7 +1,6 @@
 /* eslint-disable class-methods-use-this */
 import eventsEngine from '@js/common/core/events/core/events_engine';
 import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index';
-import defaultDateNames from '@js/common/core/localization/default_date_names';
 import { getFormat } from '@js/common/core/localization/ldml/date.format';
 import { getRegExpInfo } from '@js/common/core/localization/ldml/date.parser';
 import numberLocalization from '@js/common/core/localization/number';
@@ -125,7 +124,6 @@ class DateBoxMask extends DateBoxBase {
     const delta = currentValue - originalValue;
 
     this._loadMaskValue(this._initialMaskValue);
-
     this._changePartValue(delta + step, true);
   }
 
@@ -142,12 +140,12 @@ class DateBoxMask extends DateBoxBase {
 
   _toggleAmPm(): void {
     const currentValue = this._getActivePartProp('text');
-    const indexOfCurrentValue = defaultDateNames
-    // @ts-expect-error getPeriodNames type should be fixed
-      .getPeriodNames(this._formatPattern)
-      .indexOf(currentValue);
+    const periodNames = dateLocalization.getPeriodNames(this._formatPattern);
+    const indexOfCurrentValue = periodNames.indexOf(currentValue);
+
     // eslint-disable-next-line no-bitwise
     const newValue = indexOfCurrentValue ^ 1;
+
     this._setActivePartValue(newValue);
   }
 
@@ -543,8 +541,11 @@ class DateBoxMask extends DateBoxBase {
   _getActivePartValue(dateValue?: Date | null): number {
     const date = dateValue ?? this._maskValue as Date;
     const getter = this._getActivePartProp('getter');
+    const isGetterFunction = isFunction(getter);
+
+    const activePartValue = isGetterFunction ? getter(date) : date[getter]() as number;
 
-    return isFunction(getter) ? getter(date) : date[getter]() as number;
+    return activePartValue;
   }
 
   _addLeadingZeroes(value: number): string {
@@ -557,6 +558,7 @@ class DateBoxMask extends DateBoxBase {
 
   _setActivePartValue(value: number | string, dateValue?: Date): void {
     let newValue: number | string = +value;
+
     const newDateValue = dateValue ?? this._maskValue as Date;
     const setter = this._getActivePartProp('setter');
     const limits = this._getActivePartLimits();
@@ -569,8 +571,8 @@ class DateBoxMask extends DateBoxBase {
     } else {
       newDateValue[setter](newValue);
     }
-    this._renderDisplayText(this._getDisplayedText(newDateValue));
 
+    this._renderDisplayText(this._getDisplayedText(newDateValue));
     this._renderDateParts();
   }
 

packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js

@@ -2,6 +2,7 @@ import $ from 'jquery';
 import { renderDateParts, getDatePartIndexByPosition } from '__internal/ui/date_box/date_box.mask.parts';
 import dateParser from '__internal/core/localization/ldml/dateParserModule';
 import dateLocalization from 'common/core/localization/date';
+import localization from 'localization';
 import { noop } from 'core/utils/common';
 import pointerMock from '../../helpers/pointerMock.js';
 import 'ui/date_box';
@@ -1290,6 +1291,31 @@ module('Date AM/PM Handling', setupModule, () => {
             assert.strictEqual(this.$input.val(), 'PM');
         });
     });
+
+    test('up/down arrows should continue to switch AM/PM on subsequent presses when locale has localized period names (T1327076)', function(assert) {
+        const defaultLocale = localization.locale();
+
+        try {
+            localization.locale('es-ES');
+
+            const [amName, pmName] = dateLocalization.getPeriodNames();
+
+            this.instance.option({
+                value: new Date('10/10/2012 22:00'),
+                displayFormat: 'a'
+            });
+
+            assert.strictEqual(this.$input.val(), pmName, 'initial value is localized PM');
+
+            this.keyboard.press('up');
+            assert.strictEqual(this.$input.val(), amName, 'value changed to localized AM after first press');
+
+            this.keyboard.press('up');
+            assert.strictEqual(this.$input.val(), pmName, 'value returned to localized PM after second press');
+        } finally {
+            localization.locale(defaultLocale);
+        }
+    });
 });
 
 module('TimeZone Handling', setupModule, () => {