Merge from trunk

This commit is contained in:
Charles Haley 2012-02-18 14:09:17 +01:00
commit 3974ac02d1

View File

@ -251,13 +251,13 @@ class TagBrowserMixin(object): # {{{
''' '''
if not question_dialog(self.tags_view, if not question_dialog(self.tags_view,
title=_('Delete item'), title=_('Delete item'),
msg=_('%s will be permanently deleted. Do you really ' msg='<p>'+
'want to do this?')%orig_name, _('%s will be deleted from all books. Are you sure?')
%orig_name,
skip_dialog_name='tag_item_delete', skip_dialog_name='tag_item_delete',
skip_dialog_msg=_('Show this message again')): skip_dialog_msg=_('Show this confirmation again')):
return return
return db = self.current_db
db=self.library_view.model().db
if category == 'tags': if category == 'tags':
delete_func = db.delete_tag_using_id delete_func = db.delete_tag_using_id