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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-03-03 18:06:46 +00:00
commit 9fe80ab4a6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -145,7 +145,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
{ {
'isbn': '{identifiers:select(isbn)}', 'isbn': '{identifiers:select(isbn)}',
'formats': '{formats}', 'formats': '{formats}',
'last_modified':'''{last_modified:'format_date($, "%d %m, %Y")'}''' 'last_modified':'''{last_modified:'format_date($, "dd MMM yy")'}'''
}[which]) }[which])
self.composite_sort_by.setCurrentIndex(2 if which == 'last_modified' else 0) self.composite_sort_by.setCurrentIndex(2 if which == 'last_modified' else 0)

1
src/calibre/utils/formatter_functions.py
View File

@ -469,7 +469,6 @@ class BuiltinFormat_date(BuiltinFormatterFunction):
'yyyy : the year as four digit number.') 'yyyy : the year as four digit number.')
def evaluate(self, formatter, kwargs, mi, locals, val, format_string): def evaluate(self, formatter, kwargs, mi, locals, val, format_string):
print val
if not val: if not val:
return '' return ''
try: try: