diff --git a/src/calibre/web/feeds/recipes/recipe_al_jazeera.py b/src/calibre/web/feeds/recipes/recipe_al_jazeera.py index 9923f00392..d8aada2356 100644 --- a/src/calibre/web/feeds/recipes/recipe_al_jazeera.py +++ b/src/calibre/web/feeds/recipes/recipe_al_jazeera.py @@ -12,26 +12,27 @@ class AlJazeera(BasicNewsRecipe): title = 'Al Jazeera in English' __author__ = 'Darko Miletic' description = 'News from Middle East' + language = _('English') publisher = 'Al Jazeera' category = 'news, politics, middle east' simultaneous_downloads = 1 - delay = 4 + delay = 4 oldest_article = 1 max_articles_per_feed = 100 no_stylesheets = True encoding = 'iso-8859-1' remove_javascript = True use_embedded_content = False - + html2lrf_options = [ '--comment', description , '--category', category , '--publisher', publisher , '--ignore-tables' ] - - html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_table=True' - + + html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_table=True' + keep_only_tags = [dict(name='div', attrs={'id':'ctl00_divContent'})] remove_tags = [ diff --git a/src/calibre/web/feeds/recipes/recipe_azstarnet.py b/src/calibre/web/feeds/recipes/recipe_azstarnet.py index 55cfcf78f1..c1652eb10e 100644 --- a/src/calibre/web/feeds/recipes/recipe_azstarnet.py +++ b/src/calibre/web/feeds/recipes/recipe_azstarnet.py @@ -12,9 +12,10 @@ class Azstarnet(BasicNewsRecipe): title = 'Arizona Daily Star' __author__ = 'Darko Miletic' description = 'news from Arizona' + language = _('English') publisher = 'azstarnet.com' category = 'news, politics, Arizona, USA' - delay = 1 + delay = 1 oldest_article = 1 max_articles_per_feed = 100 no_stylesheets = True @@ -28,8 +29,8 @@ class Azstarnet(BasicNewsRecipe): , '--category', category , '--publisher', publisher ] - - html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' + + html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' def get_browser(self): br = BasicNewsRecipe.get_browser() @@ -40,8 +41,8 @@ class Azstarnet(BasicNewsRecipe): br['pass' ] = self.password br.submit() return br - - + + keep_only_tags = [dict(name='div', attrs={'id':'storycontent'})] remove_tags = [ @@ -49,15 +50,15 @@ class Azstarnet(BasicNewsRecipe): ,dict(name='div',attrs={'class':'bannerinstory'}) ] - + feeds = [(u'Tucson Region', u'http://rss.azstarnet.com/index.php?site=metro')] def preprocess_html(self, soup): soup.html['dir' ] = 'ltr' soup.html['lang'] = 'en-US' mtag = '\n\n\n' - soup.head.insert(0,mtag) + soup.head.insert(0,mtag) for item in soup.findAll(style=True): - del item['style'] + del item['style'] return soup - \ No newline at end of file + diff --git a/src/calibre/web/feeds/recipes/recipe_coding_horror.py b/src/calibre/web/feeds/recipes/recipe_coding_horror.py index 2caa4f2280..edc671f6ef 100644 --- a/src/calibre/web/feeds/recipes/recipe_coding_horror.py +++ b/src/calibre/web/feeds/recipes/recipe_coding_horror.py @@ -14,6 +14,7 @@ class CodingHorror(BasicNewsRecipe): description = 'programming and human factors - Jeff Atwood' category = 'blog, programming' publisher = 'Jeff Atwood' + language = _('English') author = 'Jeff Atwood' oldest_article = 30 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py index f3006e427e..5f2ef3529b 100644 --- a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py +++ b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py @@ -16,6 +16,7 @@ class Sueddeutsche(BasicNewsRecipe): use_embedded_content = False timefmt = ' [%a %d %b %Y]' max_articles_per_feed = 50 + language = _('English') no_stylesheets = True html2epub_options = 'linearize_tables = True\nbase_font_size2=14' html2lrf_options = ['--ignore-tables'] diff --git a/src/calibre/web/feeds/recipes/recipe_moneynews.py b/src/calibre/web/feeds/recipes/recipe_moneynews.py index 96656e490d..46f494f27e 100644 --- a/src/calibre/web/feeds/recipes/recipe_moneynews.py +++ b/src/calibre/web/feeds/recipes/recipe_moneynews.py @@ -11,25 +11,26 @@ from calibre.web.feeds.news import BasicNewsRecipe class MoneyNews(BasicNewsRecipe): title = 'Moneynews.com' __author__ = 'Darko Miletic' - description = 'Financial news worldwide' + description = 'Financial news worldwide' publisher = 'moneynews.com' - category = 'news, finances, USA, business' + language = _('English') + category = 'news, finances, USA, business' oldest_article = 2 max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False encoding = 'cp1252' - + html2lrf_options = [ '--comment', description , '--category', category , '--publisher', publisher , '--ignore-tables' ] - - html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True' - - feeds = [ + + html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True' + + feeds = [ (u'Street Talk' , u'http://moneynews.newsmax.com/xml/streettalk.xml' ) ,(u'Finance News' , u'http://moneynews.newsmax.com/xml/FinanceNews.xml' ) ,(u'Economy' , u'http://moneynews.newsmax.com/xml/economy.xml' ) @@ -38,12 +39,12 @@ class MoneyNews(BasicNewsRecipe): ,(u'Investing & Analysis' , u'http://moneynews.newsmax.com/xml/investing.xml' ) ] - + keep_only_tags = [dict(name='table', attrs={'class':'copy'})] - + remove_tags = [ dict(name='td' , attrs={'id':'article_fontsize'}) ,dict(name='table', attrs={'id':'toolbox' }) ,dict(name='tr' , attrs={'id':'noprint3' }) ] - \ No newline at end of file + diff --git a/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py b/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py index a97946a018..968868cf8a 100644 --- a/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py +++ b/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py @@ -15,6 +15,7 @@ class ScottHanselman(BasicNewsRecipe): category = "Scott, Computer, Zen, .NET, C#, Hanselman, Scott, Weblog, Diabetes, Portland, Zimbabwe, ComputerZen.com - Scott Hanselman's Musings" publisher = 'Scott Hanselman' author = 'Scott Hanselman' + language = _('English') oldest_article = 30 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_slate.py b/src/calibre/web/feeds/recipes/recipe_slate.py index 570cf54542..dae94573b0 100644 --- a/src/calibre/web/feeds/recipes/recipe_slate.py +++ b/src/calibre/web/feeds/recipes/recipe_slate.py @@ -15,6 +15,7 @@ class Slate(BasicNewsRecipe): title = 'Slate' description = 'A daily magazine on the Web, offering analysis and commentary about politics, news and culture.' __author__ = 'GRiker@hotmail.com' + language = _('English') max_articles_per_feed = 40 oldest_article = 7.0 recursions = 0 diff --git a/src/calibre/web/feeds/recipes/recipe_stackoverflow.py b/src/calibre/web/feeds/recipes/recipe_stackoverflow.py index 53f4642f9e..bec58e0e20 100644 --- a/src/calibre/web/feeds/recipes/recipe_stackoverflow.py +++ b/src/calibre/web/feeds/recipes/recipe_stackoverflow.py @@ -15,6 +15,7 @@ class StackOverflowBlog(BasicNewsRecipe): category = 'blog, programming' publisher = 'StackOverflow team' oldest_article = 30 + language = _('English') max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = True