1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00

Merge branch 'master' into clipper_html_mode

This commit is contained in:
Laurent Cozic
2019-07-21 00:24:25 +01:00
29 changed files with 651 additions and 69 deletions

View File

@@ -613,8 +613,8 @@ class NoteScreenComponent extends BaseScreenComponent {
const output = [];
const createdDateString = time.unixMsToLocalDateTime(note.user_created_time);
const updatedDateString = time.unixMsToLocalDateTime(note.user_updated_time);
const createdDateString = time.formatMsToLocal(note.user_created_time);
const updatedDateString = time.formatMsToLocal(note.user_updated_time);
output.push({ title: _('Created: %s', createdDateString) });
output.push({ title: _('Updated: %s', updatedDateString) });