core: resort date formats and add DD.MM.YYYY format (fixes #4744)

streetwriters · Sep 13, 2024 · 3fe5352 · 3fe5352
1 parent a86d9a9
commit 3fe5352
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/packages/core/src/common.ts b/packages/core/src/common.ts
@@ -123,28 +123,21 @@ export const EVENTS = {
   systemTimeInvalid: "system:invalidTime"
 };
 
-const separators = ["-", "/"];
+const separators = ["-", "/", "."];
 const DD = "DD";
 const MM = "MM";
 const YYYY = "YYYY";
 export const DATE_FORMATS = [
-  ...separators
-    .map((sep) => [
-      [DD, MM, YYYY].join(sep),
-      [MM, DD, YYYY].join(sep),
-      [YYYY, MM, DD].join(sep)
-    ])
+  ...[
+    [DD, MM, YYYY],
+    [MM, DD, YYYY],
+    [YYYY, MM, DD]
+  ]
+    .map((item) => separators.map((sep) => item.join(sep)))
     .flat(),
   "MMM D, YYYY"
 ];
 
-export const DATE_FORMATS_WITHOUT_YEAR = [
-  ...separators
-    .map((sep) => [[DD, MM].join(sep), [MM, DD].join(sep), [MM, DD].join(sep)])
-    .flat(),
-  "MMM D"
-];
-
 export const TIME_FORMATS = ["12-hour", "24-hour"];
 
 export const CURRENT_DATABASE_VERSION = 6.1;
diff --git a/packages/core/src/utils/date.ts b/packages/core/src/utils/date.ts
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import dayjs from "dayjs";
-import { DATE_FORMATS, DATE_FORMATS_WITHOUT_YEAR } from "../common";
 
 export type TimeFormat = "12-hour" | "24-hour";
 
@@ -70,7 +69,7 @@ export type TimeOptions = {
   timeFormat: TimeFormat;
 };
 export type DateOptions = {
-  type: "date" | "date-without-year";
+  type: "date";
   dateFormat: string;
 };
 export type DateTimeOptions = {
@@ -97,12 +96,6 @@ export function formatDate(
       return dayjs(date).format(getTimeFormat(options.timeFormat));
     case "date":
       return dayjs(date).format(options.dateFormat);
-    case "date-without-year": {
-      const format =
-        DATE_FORMATS_WITHOUT_YEAR[DATE_FORMATS.indexOf(options.dateFormat)];
-      if (!format) return dayjs(date).format("MM-DD");
-      return dayjs(date).format(format);
-    }
   }
 }