rebase

Eonasdan · Jan 17, 2023 · 2c49fc3 · 2c49fc3
1 parent fa541cd
commit 2c49fc3
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 34 deletions.
diff --git a/dist/js/jQuery-provider.js b/dist/js/jQuery-provider.js
@@ -2,7 +2,7 @@
 /*global $, tempusDominus */
 
 /*!
- * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+ * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
  * Copyright 2013-2021 Jonathan Peterson
  * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
  */

diff --git a/dist/js/jQuery-provider.min.js b/dist/js/jQuery-provider.min.js
diff --git a/dist/js/tempus-dominus.esm.js b/dist/js/tempus-dominus.esm.js
diff --git a/dist/js/tempus-dominus.esm.js.map b/dist/js/tempus-dominus.esm.js.map
diff --git a/dist/js/tempus-dominus.esm.min.js b/dist/js/tempus-dominus.esm.min.js
diff --git a/dist/js/tempus-dominus.js b/dist/js/tempus-dominus.js
diff --git a/dist/js/tempus-dominus.js.map b/dist/js/tempus-dominus.js.map
diff --git a/dist/js/tempus-dominus.min.js b/dist/js/tempus-dominus.min.js
diff --git a/dist/locales/ar-SA.js b/dist/locales/ar-SA.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/ar.js b/dist/locales/ar.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/de.js b/dist/locales/de.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/es.js b/dist/locales/es.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/fi.js b/dist/locales/fi.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/fr.js b/dist/locales/fr.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/it.js b/dist/locales/it.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/nl.js b/dist/locales/nl.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/pl.js b/dist/locales/pl.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/ro.js b/dist/locales/ro.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/ru.js b/dist/locales/ru.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/sl.js b/dist/locales/sl.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/locales/tr.js b/dist/locales/tr.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/plugins/customDateFormat.js b/dist/plugins/customDateFormat.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */
@@ -259,6 +259,13 @@
         const format = this.replaceTokens(this.localization.format ||
             `${this.englishFormats.L}, ${this.englishFormats.LT}`, this.localization.dateFormats);
         const formatter = (template) => new Intl.DateTimeFormat(this.localization.locale, template).format(dateTime);
+        //if the format asks for a twenty-four-hour string but the hour cycle is not, then make a base guess
+        const HHCycle = this.localization.hourCycle.startsWith('h1')
+            ? 'h24'
+            : this.localization.hourCycle;
+        const hhCycle = this.localization.hourCycle.startsWith('h2')
+            ? 'h12'
+            : this.localization.hourCycle;
         const matches = {
             yy: formatter({ year: '2-digit' }),
             yyyy: dateTime.year,
@@ -271,9 +278,9 @@
             ddd: formatter({ weekday: 'short' }),
             dddd: formatter({ weekday: 'long' }),
             H: dateTime.getHours(),
-            HH: dateTime.getHoursFormatted('h24'),
+            HH: dateTime.getHoursFormatted(HHCycle),
             h: dateTime.hours > 12 ? dateTime.hours - 12 : dateTime.hours,
-            hh: dateTime.getHoursFormatted('h12'),
+            hh: dateTime.getHoursFormatted(hhCycle),
             t: dateTime.meridiem(),
             T: dateTime.meridiem().toUpperCase(),
             m: dateTime.minutes,

diff --git a/dist/plugins/fa-five.js b/dist/plugins/fa-five.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */

diff --git a/dist/plugins/moment-parse.js b/dist/plugins/moment-parse.js
@@ -1,5 +1,5 @@
 /*!
-  * Tempus Dominus v6.2.9 (https://getdatepicker.com/)
+  * Tempus Dominus v6.2.10 (https://getdatepicker.com/)
   * Copyright 2013-2022 Jonathan Peterson
   * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
   */