Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

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

Abdullah Atta3fe5352b56de
diff --git a/packages/core/src/common.ts b/packages/core/src/common.ts
index 54f68bbaa..1f480a17b 100644
--- 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
index c1446c529..57c6afbd4 100644
--- 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);
- }
}
}