Fix formatting when day period goes first in the time format #1189

infor-design · Apr 19, 2023 · 415897a · 415897a
1 parent c4d5d62
commit 415897a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/ids-locale/ids-locale.ts b/src/components/ids-locale/ids-locale.ts
@@ -487,7 +487,7 @@ class IdsLocale {
       if (showDayPeriods && calendar) {
         result = result.replace(' a', ` ${hours >= 12 ? calendar.dayPeriods[1] : calendar.dayPeriods[0]}`);
         if (pattern.indexOf('a') === 0) {
-          result = result.replace(' a', ` ${hours >= 12 ? calendar.dayPeriods[1] : calendar.dayPeriods[0]}`);
+          result = result.replace('a', ` ${hours >= 12 ? calendar.dayPeriods[1] : calendar.dayPeriods[0]}`);
         }
       }
 
@@ -760,7 +760,7 @@ class IdsLocale {
     dateString = dateString.replace(' de ', ' ');
 
     // Fix ah
-    dateFormat = dateFormat.replace('/ah/', '/a/h/');
+    dateFormat = dateFormat.replace('ah', 'a/h');
     dateString = dateString.replace('午', '午/');
 
     // Remove commas

diff --git a/src/components/ids-time-picker/ids-time-picker-popup.ts b/src/components/ids-time-picker/ids-time-picker-popup.ts
@@ -240,10 +240,10 @@ class IdsTimePickerPopup extends Base {
   }
 
   /**
-   * @returns {boolean} returns true if the timepicker format includes the am/pm period (" a")
+   * @returns {boolean} returns true if the timepicker format includes a day period ("a")
    */
   #hasPeriod(): boolean {
-    return this.#is12Hours() && this.format.toLowerCase().includes(' a');
+    return this.#is12Hours() && (this.format.toLowerCase().indexOf(' a') > -1 || this.format.toLowerCase().indexOf('a') === 0);
   }
 
   /**

diff --git a/src/components/ids-time-picker/ids-time-picker.ts b/src/components/ids-time-picker/ids-time-picker.ts
@@ -395,10 +395,10 @@ export default class IdsTimePicker extends Base {
   }
 
   /**
-   * @returns {boolean} returns true if the timepicker format includes the am/pm period (" a")
+   * @returns {boolean} returns true if the timepicker format includes a day period ("a")
    */
   #hasPeriod(): boolean {
-    return this.#is12Hours() && this.format.toLowerCase().includes(' a');
+    return this.#is12Hours() && (this.format.toLowerCase().indexOf(' a') > -1 || this.format.toLowerCase().indexOf('a') === 0);
   }
 
   /**