From 2e8d2f564f51a147e6afcd0cf265179e0cdd2d35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Nov 2010 16:43:42 -0600
Subject: [PATCH] Fix #7431 ("elektrolese" recipe not working)

---
 resources/recipes/elektrolese.recipe   | 38 --------------------------
 resources/recipes/taggeschau_de.recipe |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 resources/recipes/elektrolese.recipe

diff --git a/resources/recipes/elektrolese.recipe b/resources/recipes/elektrolese.recipe
deleted file mode 100644
index 070cb9a82c..0000000000
--- a/resources/recipes/elektrolese.recipe
+++ /dev/null
@@ -1,38 +0,0 @@
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-
-'''
-Fetch elektrolese.
-'''
-
-from calibre.web.feeds.news import BasicNewsRecipe
-
-
-class elektrolese(BasicNewsRecipe):
-
-    title = u'elektrolese'
-    description = 'News about electronic publishing'
-    __author__ = 'Oliver Niesner'
-    use_embedded_content   = False
-    timefmt = ' [%a %d %b %Y]'
-    language = 'de'
-
-    oldest_article = 14
-    max_articles_per_feed = 50
-    no_stylesheets = True
-    conversion_options = {'linearize_tables':True}
-    encoding = 'utf-8'
-
-
-    remove_tags_after = [dict(id='comments')]
-    filter_regexps = [r'ad\.doubleclick\.net']
-
-    remove_tags = [dict(name='div', attrs={'class':'bannerSuperBanner'}),
-                   dict(id='comments'),
-                   dict(id='Navbar1')]
-
-
-
-    feeds =  [ (u'elektrolese', u'http://elektrolese.blogspot.com/feeds/posts/default?alt=rss') ]
-
-
diff --git a/resources/recipes/taggeschau_de.recipe b/resources/recipes/taggeschau_de.recipe
index 72677e3bc1..9c0c60efca 100644
--- a/resources/recipes/taggeschau_de.recipe
+++ b/resources/recipes/taggeschau_de.recipe
@@ -4,7 +4,7 @@ class Tagesschau(BasicNewsRecipe):
      title          = 'Tagesschau'
      description    = 'Nachrichten der ARD'
      publisher      = 'ARD'
-     language       = 'de_DE'
+     language       = 'de'
 
      __author__     = 'Florian Andreas Pfaff'
      oldest_article = 7