Split up English recipes by country

src/calibre/translations/calibre.pot

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.6.11\n"
-"POT-Creation-Date: 2009-09-09 17:15+MDT\n"
+"POT-Creation-Date: 2009-09-09 19:27+MDT\n"
-"PO-Revision-Date: 2009-09-09 17:15+MDT\n"
+"PO-Revision-Date: 2009-09-09 19:27+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1534
 #: /home/kovid/work/calibre/src/calibre/library/server.py:419
 #: /home/kovid/work/calibre/src/calibre/library/server.py:517
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
@@ -6254,7 +6254,19 @@ msgid "Traditional Chinese"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
-msgid "English (US)"
+msgid "English"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
+msgid "English (AU)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
+msgid "English (CA)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
+msgid "English (IND)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
@@ -6388,12 +6400,12 @@ msgid "sr-Latn-RS"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:81
 msgid "Skipping duplicated article: %s"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:89
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:86
 msgid "Skipping filtered article: %s"
 msgstr ""
 

src/calibre/utils/localization.py

@@ -96,7 +96,10 @@ _extra_lang_codes = {
         'zh_CN' : _('Simplified Chinese'),
         'zh_HK' : _('Chinese (HK)'),
         'zh_TW' : _('Traditional Chinese'),
-        'en'    : _('English (US)'),
+        'en'    : _('English'),
+        'en_AU' : _('English (AU)'),
+        'en_CA' : _('English (CA)'),
+        'en_IN' : _('English (IND)'),
         'und'   : _('Unknown')
         }
 

src/calibre/web/feeds/recipes/recipe_daily_mail.py

@@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TheDailyMail(BasicNewsRecipe):
     title          = u'The Daily Mail'
     oldest_article = 2
-    language = 'en'
+    language = 'en_GB'
 
     author = 'RufusA'
     simultaneous_downloads= 1

src/calibre/web/feeds/recipes/recipe_dna.py

@@ -9,7 +9,7 @@ class DNAIndia(BasicNewsRecipe):
     title       = 'DNA India'
     description = 'Mumbai news, India news, World news, breaking news'
     __author__  = 'Kovid Goyal'
-    language = 'en'
+    language = 'en_IN'
 
     encoding    = 'cp1252'
 

src/calibre/web/feeds/recipes/recipe_glasgow_herald.py

@@ -7,7 +7,7 @@ class GlasgowHerald(BasicNewsRecipe):
     oldest_article = 1
     max_articles_per_feed = 100
     no_stylesheets = True
-    language = 'en'
+    language = 'en_GB'
 
     __author__     = 'McCande'
 

src/calibre/web/feeds/recipes/recipe_globe_and_mail.py

@@ -12,7 +12,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class GlobeAndMail(BasicNewsRecipe):
     title = u'Globe and Mail'
-    language = 'en'
+    language = 'en_CA'
 
     __author__ = 'Kovid Goyal'
     oldest_article = 2

src/calibre/web/feeds/recipes/recipe_guardian.py

@@ -13,7 +13,7 @@ class Guardian(BasicNewsRecipe):
 
     title = u'The Guardian'
     __author__ = 'Seabound and Sujata Raman'
-    language = 'en'
+    language = 'en_GB'
 
     oldest_article = 7
     max_articles_per_feed = 20

src/calibre/web/feeds/recipes/recipe_hindu.py

@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class TheHindu(BasicNewsRecipe):
     title                 = u'The Hindu'
-    language = 'en'
+    language = 'en_IN'
 
     oldest_article        = 7
     __author__            = _('Kovid Goyal')

src/calibre/web/feeds/recipes/recipe_le_monde.py

@@ -22,9 +22,6 @@ class LeMonde(BasicNewsRecipe):
     no_stylesheets = True
     cover_url='http://abonnes.lemonde.fr/titresdumonde/'+date.today().strftime("%y%m%d")+'/1.jpg'
 
-
-    html2lrf_options = ['--base-font-size', '10']
-    
     feeds =  [
              ('A la Une', 'http://www.lemonde.fr/rss/une.xml'),
              ('International', 'http://www.lemonde.fr/rss/sequence/0,2-3210,1-0,0.xml'),

src/calibre/web/feeds/recipes/recipe_lrb.py

@@ -14,7 +14,7 @@ class LondonReviewOfBooks(BasicNewsRecipe):
     description           = u'Literary review publishing essay-length book reviews and topical articles on politics, literature, history, philosophy, science and the arts by leading writers and thinkers'
     oldest_article        = 7
     max_articles_per_feed = 100
-    language = 'en'
+    language = 'en_GB'
 
     no_stylesheets        = True
     use_embedded_content  = False

src/calibre/web/feeds/recipes/recipe_outlook_india.py

@@ -12,7 +12,7 @@ class OutlookIndia(BasicNewsRecipe):
     description    = 'Weekly news and current affairs in India'
     no_stylesheets = True
     encoding       = 'utf-8'
-    language = 'en'
+    language = 'en_IN'
 
     recursions = 1
     extra_css = '''

src/calibre/web/feeds/recipes/recipe_smh.py

@@ -16,7 +16,7 @@ class SMH(BasicNewsRecipe):
     title = 'Sydney Morning Herald'
     description = 'Business News, World News and Breaking News in Australia'
     __author__ = 'Kovid Goyal'
-    language = 'en'
+    language = 'en_AU'
 
 
     def get_browser(self):

src/calibre/web/feeds/recipes/recipe_the_age.py

@@ -16,7 +16,7 @@ class TheAge(BasicNewsRecipe):
     title = 'The Age'
     description = 'Business News, World News and Breaking News in Melbourne, Australia'
     __author__ = 'Matthew Briggs'
-    language = 'en'
+    language = 'en_AU'
 
 
     def get_browser(self):

src/calibre/web/feeds/recipes/recipe_the_oz.py

@@ -13,7 +13,7 @@ class DailyTelegraph(BasicNewsRecipe):
     title          = u'The Australian'
     __author__     = u'Matthew Briggs'
     description    = u'National broadsheet newspaper from down under - colloquially known as The Oz'
-    language = 'en'
+    language = 'en_AU'
 
     oldest_article = 2
     max_articles_per_feed = 10

src/calibre/web/feeds/recipes/recipe_the_scotsman.py

@@ -16,7 +16,7 @@ class TheScotsman(BasicNewsRecipe):
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
-    language = 'en'
+    language = 'en_GB'
 
     simultaneous_downloads = 1
 

src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py

@@ -22,7 +22,7 @@ class TheEconomicTimes(BasicNewsRecipe):
     simultaneous_downloads = 1
     encoding               = 'utf-8'
     lang                   = 'en-IN'
-    language = 'en'
+    language = 'en_IN'
 
 
     html2lrf_options = [