Merge pull request #153 from appwrite/fix-datetime-hour-cycle

fix: datetime hourcycle formatting
appwrite · Nov 17, 2022 · f89584b · f89584b · vercel · Nov 17, 2022
2 parents 2ba5825 + e8ff05c
commit f89584b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
@@ -17,7 +17,7 @@ export const toLocaleDateTime = (datetime: string | number) => {
         day: 'numeric',
         hour: 'numeric',
         minute: 'numeric',
-        hour12: false
+        hourCycle: 'h23'
     };
 
     return date.toLocaleDateString('en', options);

diff --git a/tests/unit/helpers/date.test.ts b/tests/unit/helpers/date.test.ts
@@ -0,0 +1,24 @@
+import '@testing-library/jest-dom';
+import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
+
+describe('local date', () => {
+    [
+        ['2022-11-15 08:26:28', 'Nov 15, 2022'],
+        ['2022-11-15 00:26:28', 'Nov 15, 2022']
+    ].forEach(([value, expected]) => {
+        it(value, () => {
+            expect(toLocaleDate(value)).toBe(expected);
+        });
+    });
+});
+
+describe('local date time', () => {
+    [
+        ['2022-11-15 08:26:28', 'Nov 15, 2022, 08:26'],
+        ['2022-11-15 00:26:28', 'Nov 15, 2022, 00:26']
+    ].forEach(([value, expected]) => {
+        it(value, () => {
+            expect(toLocaleDateTime(value)).toBe(expected);
+        });
+    });
+});