Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-11-04 03:27:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rest of fix

Browse Source
This commit is contained in:
Charles Haley 2019-01-21 11:34:30 +00:00
parent aa1bdda900
commit c8e97f6f50
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/custom_column_widgets.py
View File

@ -1026,12 +1026,12 @@ class BulkDateTime(BulkBase):
l.addStretch(2) l.addStretch(2)
w = self.main_widget w = self.main_widget
format = cm['display'].get('date_format','') format_ = cm['display'].get('date_format','')
if not format: if not format_:
format = 'dd MMM yyyy' format_ = 'dd MMM yyyy'
elif format == 'iso': elif format_ == 'iso':
format = 'yyyy-MM-ddTHH:mm:ss' format_ = 'yyyy-MM-ddTHH:mm:ss'
w.setDisplayFormat(format) w.setDisplayFormat(format_)
w.setCalendarPopup(True) w.setCalendarPopup(True)
w.setMinimumDateTime(UNDEFINED_QDATETIME) w.setMinimumDateTime(UNDEFINED_QDATETIME)
w.setSpecialValueText(_('Undefined')) w.setSpecialValueText(_('Undefined'))

2
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -515,6 +515,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.adddate_cw = CalendarWidget(self.adddate) self.adddate_cw = CalendarWidget(self.adddate)
self.adddate.setCalendarWidget(self.adddate_cw) self.adddate.setCalendarWidget(self.adddate_cw)
adddate_format = tweaks['gui_timestamp_display_format'] adddate_format = tweaks['gui_timestamp_display_format']
if adddate_format == 'iso':
adddate_format = 'yyyy-MM-ddTHH:mm:ss'
if adddate_format is not None: if adddate_format is not None:
self.adddate.setDisplayFormat(adddate_format) self.adddate.setDisplayFormat(adddate_format)
self.adddate.setSpecialValueText(_('Undefined')) self.adddate.setSpecialValueText(_('Undefined'))