self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

All: Add additional time format HH.mm (#6086)

Browse Source
This commit is contained in:
Vincent Jo
2022-02-03 10:52:24 -08:00
committed by GitHub
parent e3c9bcbec6
commit 288ae1b463
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,7 @@ class Setting extends BaseModel {
public static TIME_FORMAT_1 = 'HH:mm'; public static TIME_FORMAT_1 = 'HH:mm';
public static TIME_FORMAT_2 = 'h:mm A'; public static TIME_FORMAT_2 = 'h:mm A';
public static TIME_FORMAT_3 = 'HH.mm';
public static SHOULD_REENCRYPT_NO = 0; // Data doesn't need to be re-encrypted public static SHOULD_REENCRYPT_NO = 0; // Data doesn't need to be re-encrypted
public static SHOULD_REENCRYPT_YES = 1; // Data should be re-encrypted public static SHOULD_REENCRYPT_YES = 1; // Data should be re-encrypted
@ -741,6 +742,7 @@ class Setting extends BaseModel {
const now = new Date('2017-01-30T20:30:00').getTime(); const now = new Date('2017-01-30T20:30:00').getTime();
options[Setting.TIME_FORMAT_1] = time.formatMsToLocal(now, Setting.TIME_FORMAT_1); options[Setting.TIME_FORMAT_1] = time.formatMsToLocal(now, Setting.TIME_FORMAT_1);
options[Setting.TIME_FORMAT_2] = time.formatMsToLocal(now, Setting.TIME_FORMAT_2); options[Setting.TIME_FORMAT_2] = time.formatMsToLocal(now, Setting.TIME_FORMAT_2);
options[Setting.TIME_FORMAT_3] = time.formatMsToLocal(now, Setting.TIME_FORMAT_3);
return options; return options;
}, },
storage: SettingStorage.File, storage: SettingStorage.File,

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

@ -39,10 +39,11 @@ describe('dateFormats', function() {
// TIME_FORMAT_1 = 'HH:mm'; // TIME_FORMAT_1 = 'HH:mm';
// TIME_FORMAT_2 = 'h:mm A'; // TIME_FORMAT_2 = 'h:mm A';
// TIME_FORMAT_3 = 'HH.mm';
expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_1)).toBe('20:30'); expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_1)).toBe('20:30');
expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_2)).toBe('8:30 PM'); expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_2)).toBe('8:30 PM');
expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_3)).toBe('20.30');
})); }));
}); });