diff --git a/resources/recipes/de_standaard.recipe b/resources/recipes/de_standaard.recipe index 64233819bd..57baa1afbe 100644 --- a/resources/recipes/de_standaard.recipe +++ b/resources/recipes/de_standaard.recipe @@ -9,22 +9,22 @@ from calibre.web.feeds.news import BasicNewsRecipe class DeStandaard(BasicNewsRecipe): title = u'De Standaard' __author__ = u'Darko Miletic' - language = 'nl' + language = 'nl_BE' - description = u'News from Belgium' + description = u'News from Belgium' oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - + keep_only_tags = [dict(name='div' , attrs={'id':['intro','continued']})] - + feeds = [(u'De Standaard Online', u'http://feeds.feedburner.com/dso-front')] - + def get_article_url(self, article): return article.get('guid', None) - + def print_version(self, url): return url.replace('/Detail.aspx?','/PrintArtikel.aspx?') diff --git a/resources/recipes/degentenaar.recipe b/resources/recipes/degentenaar.recipe index d3b65b9231..fbf30b9f9a 100644 --- a/resources/recipes/degentenaar.recipe +++ b/resources/recipes/degentenaar.recipe @@ -19,7 +19,7 @@ class DeGentenaarOnline(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = 'nl' + language = 'nl_BE' lang = 'nl-BE' direction = 'ltr' diff --git a/resources/recipes/demorgen_be.recipe b/resources/recipes/demorgen_be.recipe index 43f45d37f7..a9a50576a5 100644 --- a/resources/recipes/demorgen_be.recipe +++ b/resources/recipes/demorgen_be.recipe @@ -11,9 +11,9 @@ from calibre.web.feeds.news import BasicNewsRecipe class DeMorganBe(BasicNewsRecipe): title = u'De Morgen' __author__ = u'Darko Miletic' - description = u'News from Belgium' + description = u'News from Belgium' oldest_article = 7 - language = 'nl' + language = 'nl_BE' max_articles_per_feed = 100 no_stylesheets = True @@ -21,7 +21,7 @@ class DeMorganBe(BasicNewsRecipe): keep_only_tags = [dict(name='div' , attrs={'class':'art_box2'})] - feeds = [ + feeds = [ (u'Nieuws' , u'http://www.demorgen.be/nieuws/rss.xml' ) ,(u'De Gedachte' , u'http://www.demorgen.be/degedachte/rss.xml' ) ,(u'Financiele morgen' , u'http://www.demorgen.be/financielemorgen/rss.xml') @@ -29,5 +29,5 @@ class DeMorganBe(BasicNewsRecipe): ,(u'Sport' , u'http://www.demorgen.be/sport/rss.xml' ) ,(u'Bis' , u'http://www.demorgen.be/bis/rss.xml' ) ,(u'Magazine' , u'http://www.demorgen.be/magazine/rss.xml' ) - ,(u'De stand der dingen', u'http://www.demorgen.be/standderdingen/rss.xml' ) + ,(u'De stand der dingen', u'http://www.demorgen.be/standderdingen/rss.xml' ) ] diff --git a/resources/recipes/gva_be.recipe b/resources/recipes/gva_be.recipe index db44178b37..34c4122394 100644 --- a/resources/recipes/gva_be.recipe +++ b/resources/recipes/gva_be.recipe @@ -19,7 +19,7 @@ class GazetvanAntwerpen(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = 'nl' + language = 'nl_BE' lang = 'nl-BE' direction = 'ltr' diff --git a/resources/recipes/hln.recipe b/resources/recipes/hln.recipe index e327d50b6a..fefb5f65f7 100644 --- a/resources/recipes/hln.recipe +++ b/resources/recipes/hln.recipe @@ -19,7 +19,7 @@ class HLN_be(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = 'nl' + language = 'nl_BE' lang = 'nl-BE' direction = 'ltr' @@ -39,7 +39,7 @@ class HLN_be(BasicNewsRecipe): .gen_footnote3{font-size:80%; color: #666666;} ''' - + keep_only_tags = [dict(name='div', attrs={'class':'art_box2'})] remove_tags = [ dict(name=['embed','object']) diff --git a/resources/recipes/hln_be.recipe b/resources/recipes/hln_be.recipe index 64ee99c260..e2f9b15ffb 100644 --- a/resources/recipes/hln_be.recipe +++ b/resources/recipes/hln_be.recipe @@ -19,16 +19,16 @@ class HLN_be(BasicNewsRecipe): use_embedded_content = False no_stylesheets = True encoding = 'utf-8' - language = 'nl' + language = 'nl_BE' - - conversion_options = { + + conversion_options = { 'comments' : description ,'tags' : category ,'language' : 'nl-NL' ,'publisher' : publisher } - + remove_tags = [dict(name=['form','object','embed'])] keep_only_tags = [dict(name='div', attrs={'id':'art_box2'})] diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 0b671073e8..f01cb48e44 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.6.24\n" -"POT-Creation-Date: 2009-11-25 19:33+MST\n" -"PO-Revision-Date: 2009-11-25 19:33+MST\n" +"POT-Creation-Date: 2009-11-29 14:44+MST\n" +"PO-Revision-Date: 2009-11-29 14:44+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -66,9 +66,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:778 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:886 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:891 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:951 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:887 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:892 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:952 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:105 @@ -130,7 +130,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/server.py:649 #: /home/kovid/work/calibre/src/calibre/library/server.py:721 #: /home/kovid/work/calibre/src/calibre/library/server.py:768 -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 #: /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 @@ -475,7 +475,7 @@ msgid "Getting list of books on device..." msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26 -msgid "Communicate with the Sony PRS-300/505 eBook reader." +msgid "Communicate with the Sony PRS-300/505/500 eBook reader." msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:27 @@ -1502,7 +1502,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1083 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1314 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1315 msgid "Cover" msgstr "" @@ -1531,70 +1531,70 @@ msgstr "" msgid "All articles" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1315 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1316 msgid "Title Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1316 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1317 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:51 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168 msgid "Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1317 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1318 msgid "Index" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1318 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1319 msgid "Glossary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1319 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1320 msgid "Acknowledgements" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1320 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1321 msgid "Bibliography" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1321 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1322 msgid "Colophon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1322 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1323 msgid "Copyright" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1323 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1324 msgid "Dedication" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1324 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1325 msgid "Epigraph" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1325 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1326 msgid "Foreword" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1326 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1327 msgid "List of Illustrations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1327 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1328 msgid "List of Tables" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1328 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1329 msgid "Notes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1329 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1330 msgid "Preface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1330 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1331 msgid "Main Text" msgstr "" @@ -6568,6 +6568,14 @@ msgstr "" msgid "English (IND)" msgstr "" +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 +msgid "Dutch (NL)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 +msgid "Dutch (BE)" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53 msgid "URL must have the scheme sftp" msgstr "" diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 6e4838ebe4..ce94ab61f8 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -100,6 +100,8 @@ _extra_lang_codes = { 'en_AU' : _('English (AU)'), 'en_CA' : _('English (CA)'), 'en_IN' : _('English (IND)'), + 'nl' : _('Dutch (NL)'), + 'nl_BE' : _('Dutch (BE)'), 'und' : _('Unknown') }