mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 10:14:46 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
e73aba98d2
@ -267,7 +267,7 @@ def mi_to_html(
|
|||||||
else:
|
else:
|
||||||
links = ', '.join(mi.identifiers)
|
links = ', '.join(mi.identifiers)
|
||||||
if links:
|
if links:
|
||||||
ans.append((field, row % (_('Ids')+':', links)))
|
ans.append((field, row % (_('Ids')+title_sep, links)))
|
||||||
elif field == 'authors':
|
elif field == 'authors':
|
||||||
authors = []
|
authors = []
|
||||||
formatter = EvalFormatter()
|
formatter = EvalFormatter()
|
||||||
|
@ -519,7 +519,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
|
|||||||
'''
|
'''
|
||||||
self.fm = fm
|
self.fm = fm
|
||||||
if mi:
|
if mi:
|
||||||
if not isinstance(mi, list):
|
if not isinstance(mi, (tuple, list)):
|
||||||
mi = (mi, )
|
mi = (mi, )
|
||||||
else:
|
else:
|
||||||
mi = Metadata(_('Title'), [_('Author')])
|
mi = Metadata(_('Title'), [_('Author')])
|
||||||
|
@ -53,7 +53,7 @@ class SaveTemplate(QWidget, Ui_Form):
|
|||||||
from calibre.gui2.ui import get_gui
|
from calibre.gui2.ui import get_gui
|
||||||
db = get_gui().current_db
|
db = get_gui().current_db
|
||||||
view = get_gui().library_view
|
view = get_gui().library_view
|
||||||
mi = list(map(db.new_api.get_proxy_metadata, view.get_selected_ids()[:10]))
|
mi = tuple(map(db.new_api.get_proxy_metadata, view.get_selected_ids()[:10]))
|
||||||
if not mi:
|
if not mi:
|
||||||
error_dialog(self, _('Must select books'),
|
error_dialog(self, _('Must select books'),
|
||||||
_('One or more books must be selected so the template '
|
_('One or more books must be selected so the template '
|
||||||
|
Loading…
x
Reference in New Issue
Block a user