From 991b28589f5a03034321b280fca51f568928c668 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 Jul 2011 09:51:03 -0600 Subject: [PATCH 1/3] Fix #807519 (Computer Act!ve Recipe broken) --- recipes/computer_active.recipe | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/computer_active.recipe b/recipes/computer_active.recipe index 93d8b5bbb5..b35e42ab01 100644 --- a/recipes/computer_active.recipe +++ b/recipes/computer_active.recipe @@ -1,10 +1,10 @@ #!/usr/bin/env python __license__ = 'GPL v3' -__author__ = 'Lorenzo Vigentini' -__copyright__ = '2009, Lorenzo Vigentini ' -__version__ = 'v1.01' -__date__ = '14, January 2010' -__description__ = 'Computeractive publishes new downloads, reviews, news stories, step-by-step guides and answers to PC problems every day.' +__author__ = 'DrMerry Based on v1.01 by Lorenzo Vigentini' +__copyright__ = 'For version 1.02: DrMerry' +__version__ = 'v1.02' +__date__ = '08, July 2011' +__description__ = 'Computeractive publishes new downloads, reviews, news stories, step-by-step guides and answers to PC problems every day. Original version (c): 2009, Lorenzo Vigentini ' ''' http://www.computeractive.co.uk/ @@ -33,12 +33,12 @@ class computeractive(BasicNewsRecipe): no_stylesheets = True keep_only_tags = [ - dict(name='div', attrs={'id':'main'}) + dict(name='div', attrs={'id':'container_left'}) ] remove_tags = [ - dict(name='div', attrs={'id':['seeAlsoTags','commentsModule','relatedArticles','mainLeft','mainRight']}), - dict(name='div', attrs={'class':['buyIt','detailMpu']}), + dict(name='div', attrs={'id':['seeAlsoTags','commentsModule','relatedArticles','mainLeft','mainRight','recent_comment_block_parent','reviewDetails']}), + dict(name='div', attrs={'class':['buyIt','detailMpu','small_section','recent_comment_block_parent','title_right_button_fix','section_title.title_right_button_fix','common_button']}), dict(name='a', attrs={'class':'largerImage'}) ] From 207f2df46391de79231da7068e5f5ef0a80f1324 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 Jul 2011 09:55:07 -0600 Subject: [PATCH 2/3] Fix #807527 (Space missing in string) --- src/calibre/gui2/preferences/template_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py index 7f310dace0..e2c880bcc9 100644 --- a/src/calibre/gui2/preferences/template_functions.py +++ b/src/calibre/gui2/preferences/template_functions.py @@ -155,7 +155,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): return if self.argument_count.value() == 0: box = warning_dialog(self.gui, _('Template functions'), - _('Argument count should be -1 or greater than zero.' + _('Argument count should be -1 or greater than zero. ' 'Setting it to zero means that this function cannot ' 'be used in single function mode.'), det_msg = '', show=False) From 2ab20f0d2a695504f591c1baccf96c10fc03d9e8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 Jul 2011 09:56:04 -0600 Subject: [PATCH 3/3] Fix #807535 (String missing Space) --- src/calibre/gui2/actions/edit_metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 718ece46d2..945c272718 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -284,7 +284,7 @@ class EditMetadataAction(InterfaceAction): if not confirm('

'+_( 'Book formats from the selected books will be merged ' 'into the first selected book (%s). ' - 'Metadata in the first selected book will not be changed.' + 'Metadata in the first selected book will not be changed. ' 'Author, Title, ISBN and all other metadata will not be merged.

' 'After merger the second and subsequently ' 'selected books, with any metadata they have will be deleted.

'