1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

All: Added new date format YYYY.MM.DD (#2318)

* Added new date format YYYY.MM.DD.

* revert change as this file is autogenerated

Co-authored-by: Akos Keresztes <60130238+keresztesa@users.noreply.github.com>
This commit is contained in:
XSAkos 2020-01-26 18:26:50 +01:00 committed by Laurent Cozic
parent 101935e594
commit 5881cee167
2 changed files with 3 additions and 1 deletions

View File

@ -212,6 +212,7 @@ class Setting extends BaseModel {
options[Setting.DATE_FORMAT_4] = time.formatMsToLocal(now, Setting.DATE_FORMAT_4);
options[Setting.DATE_FORMAT_5] = time.formatMsToLocal(now, Setting.DATE_FORMAT_5);
options[Setting.DATE_FORMAT_6] = time.formatMsToLocal(now, Setting.DATE_FORMAT_6);
options[Setting.DATE_FORMAT_7] = time.formatMsToLocal(now, Setting.DATE_FORMAT_7);
return options;
},
},
@ -1021,6 +1022,7 @@ Setting.DATE_FORMAT_3 = 'MM/DD/YYYY';
Setting.DATE_FORMAT_4 = 'MM/DD/YY';
Setting.DATE_FORMAT_5 = 'YYYY-MM-DD';
Setting.DATE_FORMAT_6 = 'DD.MM.YYYY';
Setting.DATE_FORMAT_7 = 'YYYY.MM.DD';
Setting.TIME_FORMAT_1 = 'HH:mm';
Setting.TIME_FORMAT_2 = 'h:mm A';

View File

@ -279,7 +279,7 @@ The following commands are available in [command-line mode](#command-line-mode):
Possible values: DD/MM/YYYY (30/01/2017),
DD/MM/YY (30/01/17), MM/DD/YYYY (01/30/2017),
MM/DD/YY (01/30/17), YYYY-MM-DD (2017-01-30),
DD.MM.YYYY (30.01.2017).
DD.MM.YYYY (30.01.2017), YYYY.MM.DD (2017.01.30).
Default: "DD/MM/YYYY"
timeFormat Time format.