From c8e97f6f507d4be1ae942b98f7158d18783c6d77 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Mon, 21 Jan 2019 11:34:30 +0000 Subject: [PATCH] Rest of fix --- src/calibre/gui2/custom_column_widgets.py | 12 ++++++------ src/calibre/gui2/dialogs/metadata_bulk.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index 155d5964ab..b955c7ee4a 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -1026,12 +1026,12 @@ class BulkDateTime(BulkBase): l.addStretch(2) w = self.main_widget - format = cm['display'].get('date_format','') - if not format: - format = 'dd MMM yyyy' - elif format == 'iso': - format = 'yyyy-MM-ddTHH:mm:ss' - w.setDisplayFormat(format) + format_ = cm['display'].get('date_format','') + if not format_: + format_ = 'dd MMM yyyy' + elif format_ == 'iso': + format_ = 'yyyy-MM-ddTHH:mm:ss' + w.setDisplayFormat(format_) w.setCalendarPopup(True) w.setMinimumDateTime(UNDEFINED_QDATETIME) w.setSpecialValueText(_('Undefined')) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 7146e00a9e..581f34be75 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -515,6 +515,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.adddate_cw = CalendarWidget(self.adddate) self.adddate.setCalendarWidget(self.adddate_cw) adddate_format = tweaks['gui_timestamp_display_format'] + if adddate_format == 'iso': + adddate_format = 'yyyy-MM-ddTHH:mm:ss' if adddate_format is not None: self.adddate.setDisplayFormat(adddate_format) self.adddate.setSpecialValueText(_('Undefined'))