self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

All: Add date format YYYY/MM/DD (#5759)

Browse Source
This commit is contained in:
Helmut K. C. Tessarek 2021-11-19 12:29:27 -05:00 committed by GitHub
parent 42c32c13e7
commit 8bebf99950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/models/Setting.ts
View File

@ -213,6 +213,7 @@ class Setting extends BaseModel {
public static DATE_FORMAT_6 = 'DD.MM.YYYY';
public static DATE_FORMAT_7 = 'YYYY.MM.DD';
public static DATE_FORMAT_8 = 'YYMMDD';
public static DATE_FORMAT_9 = 'YYYY/MM/DD';
public static TIME_FORMAT_1 = 'HH:mm';
public static TIME_FORMAT_2 = 'h:mm A';
@ -697,6 +698,7 @@ class Setting extends BaseModel {
options[Setting.DATE_FORMAT_6] = time.formatMsToLocal(now, Setting.DATE_FORMAT_6);
options[Setting.DATE_FORMAT_7] = time.formatMsToLocal(now, Setting.DATE_FORMAT_7);
options[Setting.DATE_FORMAT_8] = time.formatMsToLocal(now, Setting.DATE_FORMAT_8);
options[Setting.DATE_FORMAT_9] = time.formatMsToLocal(now, Setting.DATE_FORMAT_9);
return options;
},
storage: SettingStorage.File,

2
packages/lib/models/dateTimeFormats.test.ts
View File

@ -19,6 +19,7 @@ describe('dateFormats', function() {
// DATE_FORMAT_6 = 'DD.MM.YYYY';
// DATE_FORMAT_7 = 'YYYY.MM.DD';
// DATE_FORMAT_8 = 'YYMMDD';
// DATE_FORMAT_9 = 'YYYY/MM/DD';
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_1)).toBe('30/01/2017');
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_2)).toBe('30/01/17');
@ -28,6 +29,7 @@ describe('dateFormats', function() {
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_6)).toBe('30.01.2017');
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_7)).toBe('2017.01.30');
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_8)).toBe('170130');
expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_9)).toBe('2017/01/30');
}));