diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index a359f73be1..972552ad09 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -230,7 +230,8 @@ per_language_title_sort_articles = { 'ron' : (r'Un\s+', r'O\s+', r'Nişte\s+', ), # German 'deu' : (r'Der\s+', r'Die\s+', r'Das\s+', r'Den\s+', r'Ein\s+', - r'Eine\s+', r'Einen\s+', r'Dem\s+', ), + r'Eine\s+', r'Einen\s+', r'Dem\s+', r'Des\s+', r'Einem\s+', + r'Eines\s+'), # Dutch 'nld' : (r'De\s+', r'Het\s+', r'Een\s+', r"'n\s+", r"'s\s+", r'Ene\s+', r'Ener\s+', r'Enes\s+', r'Den\s+', r'Der\s+', r'Des\s+', diff --git a/src/calibre/gui2/duplicates.py b/src/calibre/gui2/duplicates.py index cc6da1e995..6e45b0e9e6 100644 --- a/src/calibre/gui2/duplicates.py +++ b/src/calibre/gui2/duplicates.py @@ -8,4 +8,3 @@ __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' - diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index 912f4d3988..1c0f3c8042 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -28,7 +28,8 @@ from calibre.ebooks.metadata.sources.identify import (identify, urls_from_identifiers) from calibre.ebooks.metadata.book.base import Metadata from calibre.gui2 import error_dialog, NONE -from calibre.utils.date import utcnow, fromordinal, format_date, UNDEFINED_DATE +from calibre.utils.date import (utcnow, fromordinal, format_date, + UNDEFINED_DATE, as_utc) from calibre.library.comments import comments_to_html from calibre import force_unicode # }}} @@ -201,7 +202,12 @@ class ResultsModel(QAbstractTableModel): # {{{ elif col == 1: key = attrgetter('title') elif col == 2: - key = lambda x: x.pubdate if x.pubdate else UNDEFINED_DATE + def dategetter(x): + x = getattr(x, 'pubdate', None) + if x is None: + x = UNDEFINED_DATE + return as_utc(x) + key = dategetter elif col == 3: key = attrgetter('has_cached_cover_url') elif key == 4: