Merge branch 'master' of https://github.com/t3d/calibre

recipes/gosc_niedzielny.recipe

@@ -13,7 +13,7 @@ class GN(BasicNewsRecipe):
 
         __author__ = 'Piotr Kontek, Tomasz Długosz'
         title = u'Gość Niedzielny'
-        description = 'Ogólnopolski tygodnik katolicki - fragmenty artykułów z poprzedniego numeru'
+        description = 'Ogólnopolski tygodnik katolicki - fragmenty artykułów z aktualnego numeru'
         encoding = 'utf-8'
         no_stylesheets = True
         language = 'pl'
@@ -24,7 +24,7 @@ class GN(BasicNewsRecipe):
             doc = html.fromstring(raw)
             page = doc.xpath('//div[@class="c"]//div[@class="search-result"]/div[1]/div[2]/h1//a/@href')
 
-            return page[1]
+            return page[0]
 
         def parse_index(self):
                 soup = self.index_to_soup('http://gosc.pl' + self.find_last_issue())

recipes/kdefamily_pl.recipe

@@ -1,20 +0,0 @@
-import re
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class KDEFamilyPl(BasicNewsRecipe):
-    title = u'KDEFamily.pl'
-    __author__ = 'fenuks'
-    description = u'KDE w Polsce'
-    category = 'open source, KDE'
-    language = 'pl'
-    cover_url = 'http://www.mykde.home.pl/kdefamily/wp-content/uploads/2012/07/logotype-e1341585198616.jpg'
-    oldest_article = 7
-    max_articles_per_feed = 100
-    preprocess_regexps = [(re.compile(r"Podobne wpisy.*", re.IGNORECASE|re.DOTALL), lambda m: '')]
-    no_stylesheets = True
-    remove_empty_feeds = True
-    use_embedded_content = False
-    keep_only_tags = [dict(attrs={'class':'blog-post'})]
-    remove_tags = [dict(attrs={'class':['blog-bottom', 'ratings hreview-aggregate']})]
-
-    feeds = [(u'Wszystko', u'http://kdefamily.pl/feed/')]

recipes/les_echos.recipe

@@ -2,7 +2,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class HindustanTimes(BasicNewsRecipe):
     title          = u'Les Echos'
-    language       = 'en'
+    language       = 'fr'
     __author__     = 'Krittika Goyal'
     oldest_article = 1  # days
     max_articles_per_feed = 25