From b262a4bfe5ce1da7a59465ddeea7e7a88c3248e6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 5 Sep 2009 13:11:05 -0600 Subject: [PATCH] Change recipes to using ISO639 language codes --- src/calibre/translations/calibre.pot | 360 ++---------------- src/calibre/web/feeds/news.py | 5 +- .../web/feeds/recipes/recipe_24sata.py | 3 +- .../web/feeds/recipes/recipe_24sata_rs.py | 3 +- src/calibre/web/feeds/recipes/recipe_7dias.py | 3 +- .../feeds/recipes/recipe_accountancyage.py | 3 +- .../feeds/recipes/recipe_adventuregamers.py | 6 +- .../web/feeds/recipes/recipe_al_jazeera.py | 3 +- .../web/feeds/recipes/recipe_ambito.py | 3 +- .../web/feeds/recipes/recipe_amspec.py | 3 +- src/calibre/web/feeds/recipes/recipe_ap.py | 3 +- .../web/feeds/recipes/recipe_ars_technica.py | 3 +- .../web/feeds/recipes/recipe_atlantic.py | 3 +- .../web/feeds/recipes/recipe_axxon_news.py | 3 +- .../web/feeds/recipes/recipe_azstarnet.py | 3 +- src/calibre/web/feeds/recipes/recipe_b92.py | 3 +- .../web/feeds/recipes/recipe_barrons.py | 3 +- src/calibre/web/feeds/recipes/recipe_bbc.py | 3 +- .../web/feeds/recipes/recipe_bbcvietnamese.py | 3 +- src/calibre/web/feeds/recipes/recipe_beta.py | 3 +- .../web/feeds/recipes/recipe_beta_en.py | 3 +- src/calibre/web/feeds/recipes/recipe_blic.py | 3 +- src/calibre/web/feeds/recipes/recipe_borba.py | 3 +- .../recipes/recipe_buenosaireseconomico.py | 3 +- .../web/feeds/recipes/recipe_business_week.py | 3 +- src/calibre/web/feeds/recipes/recipe_carta.py | 3 +- .../recipes/recipe_chicago_breaking_news.py | 3 +- .../feeds/recipes/recipe_chicago_tribune.py | 3 +- .../web/feeds/recipes/recipe_chr_mon.py | 3 +- .../recipes/recipe_cincinnati_enquirer.py | 3 +- .../web/feeds/recipes/recipe_clarin.py | 3 +- .../feeds/recipes/recipe_climate_progress.py | 3 +- src/calibre/web/feeds/recipes/recipe_cnn.py | 3 +- .../web/feeds/recipes/recipe_coding_horror.py | 3 +- .../web/feeds/recipes/recipe_common_dreams.py | 3 +- .../recipes/recipe_corriere_della_sera_en.py | 3 +- .../recipes/recipe_corriere_della_sera_it.py | 3 +- .../recipes/recipe_courrierinternational.py | 3 +- .../web/feeds/recipes/recipe_craigslist.py | 3 +- .../feeds/recipes/recipe_criticadigital.py | 3 +- .../web/feeds/recipes/recipe_cubadebate.py | 3 +- .../web/feeds/recipes/recipe_cyberpresse.py | 3 +- .../web/feeds/recipes/recipe_daily_mail.py | 3 +- .../feeds/recipes/recipe_daily_telegraph.py | 3 +- src/calibre/web/feeds/recipes/recipe_danas.py | 3 +- .../web/feeds/recipes/recipe_darknet.py | 3 +- .../web/feeds/recipes/recipe_de_standaard.py | 3 +- .../web/feeds/recipes/recipe_degentenaar.py | 3 +- .../web/feeds/recipes/recipe_demorgen_be.py | 3 +- .../web/feeds/recipes/recipe_der_standard.py | 3 +- .../web/feeds/recipes/recipe_diagonales.py | 3 +- .../web/feeds/recipes/recipe_diepresse.py | 3 +- .../feeds/recipes/recipe_discover_magazine.py | 3 +- src/calibre/web/feeds/recipes/recipe_dna.py | 3 +- .../web/feeds/recipes/recipe_dnevni_avaz.py | 3 +- .../web/feeds/recipes/recipe_dnevnik_cro.py | 3 +- .../web/feeds/recipes/recipe_e_novine.py | 3 +- .../web/feeds/recipes/recipe_ecogeek.py | 3 +- .../web/feeds/recipes/recipe_economist.py | 3 +- .../feeds/recipes/recipe_el_mercurio_chile.py | 3 +- .../web/feeds/recipes/recipe_el_pais.py | 3 +- .../web/feeds/recipes/recipe_el_universal.py | 3 +- .../web/feeds/recipes/recipe_elargentino.py | 3 +- .../web/feeds/recipes/recipe_elcronista.py | 3 +- .../web/feeds/recipes/recipe_elektrolese.py | 3 +- .../web/feeds/recipes/recipe_elmundo.py | 3 +- .../recipes/recipe_elperiodico_catalan.py | 3 +- .../recipes/recipe_elperiodico_spanish.py | 3 +- .../web/feeds/recipes/recipe_eltiempo_hn.py | 3 +- .../web/feeds/recipes/recipe_endgadget.py | 3 +- src/calibre/web/feeds/recipes/recipe_espn.py | 3 +- .../web/feeds/recipes/recipe_esquire.py | 3 +- .../web/feeds/recipes/recipe_estadao.py | 3 +- .../web/feeds/recipes/recipe_exiled.py | 3 +- .../feeds/recipes/recipe_expansion_spanish.py | 3 +- .../web/feeds/recipes/recipe_fastcompany.py | 3 +- .../web/feeds/recipes/recipe_faznet.py | 3 +- .../feeds/recipes/recipe_financial_times.py | 3 +- .../web/feeds/recipes/recipe_forbes.py | 3 +- .../web/feeds/recipes/recipe_freakonomics.py | 3 +- src/calibre/web/feeds/recipes/recipe_ftd.py | 3 +- .../web/feeds/recipes/recipe_fudzilla.py | 3 +- .../web/feeds/recipes/recipe_glas_srpske.py | 3 +- .../feeds/recipes/recipe_glasgow_herald.py | 3 +- .../web/feeds/recipes/recipe_glasjavnosti.py | 3 +- .../feeds/recipes/recipe_globe_and_mail.py | 3 +- .../web/feeds/recipes/recipe_granma.py | 3 +- .../web/feeds/recipes/recipe_guardian.py | 3 +- .../web/feeds/recipes/recipe_gva_be.py | 3 +- src/calibre/web/feeds/recipes/recipe_h1.py | 3 +- src/calibre/web/feeds/recipes/recipe_h2.py | 3 +- src/calibre/web/feeds/recipes/recipe_h3.py | 3 +- .../web/feeds/recipes/recipe_harpers.py | 3 +- .../web/feeds/recipes/recipe_harpers_full.py | 3 +- src/calibre/web/feeds/recipes/recipe_heise.py | 3 +- src/calibre/web/feeds/recipes/recipe_hindu.py | 3 +- src/calibre/web/feeds/recipes/recipe_hln.py | 3 +- .../web/feeds/recipes/recipe_hln_be.py | 3 +- src/calibre/web/feeds/recipes/recipe_hna.py | 3 +- .../recipes/recipe_honoluluadvertiser.py | 3 +- .../web/feeds/recipes/recipe_honvedelem.py | 3 +- src/calibre/web/feeds/recipes/recipe_hrt.py | 3 +- .../web/feeds/recipes/recipe_huntechnet.py | 3 +- src/calibre/web/feeds/recipes/recipe_iht.py | 3 +- .../web/feeds/recipes/recipe_index_hu.py | 3 +- .../web/feeds/recipes/recipe_indy_star.py | 3 +- .../web/feeds/recipes/recipe_infobae.py | 3 +- .../web/feeds/recipes/recipe_inquirer_net.py | 3 +- .../web/feeds/recipes/recipe_intelligencer.py | 3 +- .../web/feeds/recipes/recipe_irish_times.py | 3 +- .../web/feeds/recipes/recipe_japan_times.py | 3 +- .../web/feeds/recipes/recipe_jb_online.py | 3 +- .../feeds/recipes/recipe_joelonsoftware.py | 3 +- src/calibre/web/feeds/recipes/recipe_jpost.py | 3 +- .../web/feeds/recipes/recipe_jutarnji.py | 3 +- .../feeds/recipes/recipe_juventudrebelde.py | 3 +- .../recipes/recipe_juventudrebelde_english.py | 3 +- .../feeds/recipes/recipe_kellog_faculty.py | 3 +- .../feeds/recipes/recipe_kellog_insight.py | 3 +- .../web/feeds/recipes/recipe_krstarica.py | 3 +- .../web/feeds/recipes/recipe_krstarica_en.py | 3 +- .../web/feeds/recipes/recipe_la_cuarta.py | 3 +- .../web/feeds/recipes/recipe_la_republica.py | 3 +- .../web/feeds/recipes/recipe_la_segunda.py | 3 +- .../web/feeds/recipes/recipe_la_tercera.py | 3 +- .../feeds/recipes/recipe_lamujerdemivida.py | 3 +- .../web/feeds/recipes/recipe_lanacion.py | 3 +- .../feeds/recipes/recipe_lanacion_chile.py | 3 +- .../web/feeds/recipes/recipe_laprensa.py | 3 +- .../web/feeds/recipes/recipe_laprensa_hn.py | 3 +- .../web/feeds/recipes/recipe_laprensa_ni.py | 3 +- .../web/feeds/recipes/recipe_latimes.py | 3 +- .../web/feeds/recipes/recipe_latribuna.py | 3 +- .../web/feeds/recipes/recipe_lavanguardia.py | 3 +- .../web/feeds/recipes/recipe_le_monde.py | 3 +- .../web/feeds/recipes/recipe_liberation.py | 3 +- .../feeds/recipes/recipe_linux_magazine.py | 3 +- .../web/feeds/recipes/recipe_linuxdevices.py | 3 +- .../web/feeds/recipes/recipe_livemint.py | 3 +- src/calibre/web/feeds/recipes/recipe_lrb.py | 3 +- src/calibre/web/feeds/recipes/recipe_marca.py | 3 +- .../web/feeds/recipes/recipe_mediapart.py | 3 +- .../web/feeds/recipes/recipe_miami_herald.py | 3 +- .../web/feeds/recipes/recipe_miradasalsur.py | 3 +- .../web/feeds/recipes/recipe_mondedurable.py | 3 +- .../web/feeds/recipes/recipe_moneynews.py | 3 +- .../web/feeds/recipes/recipe_monitor.py | 3 +- .../web/feeds/recipes/recipe_moscow_times.py | 3 +- .../web/feeds/recipes/recipe_msdnmag_en.py | 3 +- .../web/feeds/recipes/recipe_nacional_cro.py | 3 +- src/calibre/web/feeds/recipes/recipe_nasa.py | 3 +- .../web/feeds/recipes/recipe_new_scientist.py | 3 +- .../recipe_new_york_review_of_books.py | 3 +- .../recipe_new_york_review_of_books_no_sub.py | 3 +- .../web/feeds/recipes/recipe_new_yorker.py | 3 +- .../web/feeds/recipes/recipe_news_times.py | 3 +- .../web/feeds/recipes/recipe_newsweek.py | 3 +- .../recipes/recipe_newsweek_argentina.py | 3 +- src/calibre/web/feeds/recipes/recipe_nin.py | 3 +- src/calibre/web/feeds/recipes/recipe_noaa.py | 3 +- .../web/feeds/recipes/recipe_novosti.py | 3 +- src/calibre/web/feeds/recipes/recipe_nspm.py | 3 +- .../web/feeds/recipes/recipe_nspm_int.py | 3 +- .../web/feeds/recipes/recipe_nytimes.py | 3 +- .../web/feeds/recipes/recipe_nytimes_sub.py | 3 +- .../web/feeds/recipes/recipe_nzz_ger.py | 3 +- .../web/feeds/recipes/recipe_o_globo.py | 3 +- .../web/feeds/recipes/recipe_ourdailybread.py | 3 +- .../web/feeds/recipes/recipe_outlook_india.py | 3 +- .../web/feeds/recipes/recipe_pagina12.py | 3 +- .../web/feeds/recipes/recipe_pcworld_hu.py | 3 +- .../web/feeds/recipes/recipe_pescanik.py | 3 +- .../web/feeds/recipes/recipe_phd_comics.py | 3 +- .../web/feeds/recipes/recipe_physics_today.py | 3 +- .../web/feeds/recipes/recipe_physics_world.py | 3 +- .../web/feeds/recipes/recipe_pobjeda.py | 3 +- .../web/feeds/recipes/recipe_politico.py | 3 +- .../web/feeds/recipes/recipe_politika.py | 3 +- .../web/feeds/recipes/recipe_portfolio.py | 3 +- .../web/feeds/recipes/recipe_pressonline.py | 3 +- .../web/feeds/recipes/recipe_publico.py | 3 +- .../web/feeds/recipes/recipe_republika.py | 3 +- .../web/feeds/recipes/recipe_reuters.py | 3 +- src/calibre/web/feeds/recipes/recipe_rga.py | 3 +- src/calibre/web/feeds/recipes/recipe_rts.py | 3 +- .../recipes/recipe_san_fran_chronicle.py | 3 +- .../web/feeds/recipes/recipe_science_aas.py | 3 +- .../web/feeds/recipes/recipe_science_news.py | 3 +- .../web/feeds/recipes/recipe_sciencedaily.py | 3 +- .../recipes/recipe_scientific_american.py | 3 +- .../feeds/recipes/recipe_scott_hanselman.py | 3 +- .../web/feeds/recipes/recipe_seattle_times.py | 3 +- .../feeds/recipes/recipe_security_watch.py | 3 +- .../web/feeds/recipes/recipe_shacknews.py | 3 +- .../web/feeds/recipes/recipe_slashdot.py | 3 +- src/calibre/web/feeds/recipes/recipe_slate.py | 3 +- src/calibre/web/feeds/recipes/recipe_smh.py | 3 +- .../web/feeds/recipes/recipe_soldiers.py | 3 +- .../web/feeds/recipes/recipe_spiegel_int.py | 3 +- .../web/feeds/recipes/recipe_spiegelde.py | 3 +- .../recipes/recipe_st_petersburg_times.py | 3 +- .../web/feeds/recipes/recipe_stackoverflow.py | 3 +- .../web/feeds/recipes/recipe_starbulletin.py | 3 +- .../web/feeds/recipes/recipe_straitstimes.py | 3 +- .../web/feeds/recipes/recipe_sueddeutsche.py | 3 +- .../web/feeds/recipes/recipe_tanjug.py | 3 +- .../web/feeds/recipes/recipe_telegraph_uk.py | 3 +- .../web/feeds/recipes/recipe_teleread.py | 3 +- .../web/feeds/recipes/recipe_the_age.py | 3 +- .../recipes/recipe_the_budget_fashionista.py | 3 +- .../web/feeds/recipes/recipe_the_nation.py | 3 +- .../web/feeds/recipes/recipe_the_oz.py | 3 +- .../web/feeds/recipes/recipe_the_register.py | 3 +- .../web/feeds/recipes/recipe_the_scotsman.py | 3 +- .../feeds/recipes/recipe_thedgesingapore.py | 3 +- .../recipes/recipe_theeconomictimes_india.py | 3 +- .../feeds/recipes/recipe_themarketticker.py | 3 +- .../web/feeds/recipes/recipe_theoldfoodie.py | 3 +- .../web/feeds/recipes/recipe_theonion.py | 3 +- src/calibre/web/feeds/recipes/recipe_tijd.py | 3 +- .../web/feeds/recipes/recipe_time_magazine.py | 3 +- .../web/feeds/recipes/recipe_times_online.py | 3 +- src/calibre/web/feeds/recipes/recipe_tnxm.py | 3 +- .../web/feeds/recipes/recipe_tomshardware.py | 3 +- .../feeds/recipes/recipe_tomshardware_de.py | 3 +- .../web/feeds/recipes/recipe_twitchfilms.py | 3 +- .../web/feeds/recipes/recipe_uncrate.py | 3 +- src/calibre/web/feeds/recipes/recipe_upi.py | 3 +- .../web/feeds/recipes/recipe_usatoday.py | 3 +- .../web/feeds/recipes/recipe_usnews.py | 3 +- src/calibre/web/feeds/recipes/recipe_utne.py | 3 +- .../web/feeds/recipes/recipe_vecernji_list.py | 3 +- .../web/feeds/recipes/recipe_veintitres.py | 3 +- .../web/feeds/recipes/recipe_vijesti.py | 3 +- .../web/feeds/recipes/recipe_vnexpress.py | 3 +- .../web/feeds/recipes/recipe_volksrant.py | 3 +- src/calibre/web/feeds/recipes/recipe_vreme.py | 3 +- .../web/feeds/recipes/recipe_wash_post.py | 3 +- .../web/feeds/recipes/recipe_wikinews_en.py | 3 +- .../web/feeds/recipes/recipe_winsupersite.py | 3 +- src/calibre/web/feeds/recipes/recipe_wired.py | 3 +- .../web/feeds/recipes/recipe_woz_die.py | 3 +- src/calibre/web/feeds/recipes/recipe_wsj.py | 3 +- src/calibre/web/feeds/recipes/recipe_xkcd.py | 3 +- .../web/feeds/recipes/recipe_zaobao.py | 3 +- src/calibre/web/feeds/recipes/recipe_zdnet.py | 3 +- .../web/feeds/recipes/recipe_zeitde.py | 3 +- 247 files changed, 525 insertions(+), 578 deletions(-) diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index a20e67e91c..1fd4e04dfa 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.11\n" -"POT-Creation-Date: 2009-09-05 12:20+MDT\n" -"PO-Revision-Date: 2009-09-05 12:20+MDT\n" +"POT-Creation-Date: 2009-09-05 13:10+MDT\n" +"PO-Revision-Date: 2009-09-05 13:10+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -135,7 +135,6 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77 #: /home/kovid/work/calibre/src/calibre/utils/poppler/__init__.py:28 #: /home/kovid/work/calibre/src/calibre/utils/poppler/__init__.py:32 -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:52 msgid "Unknown" msgstr "" @@ -370,7 +369,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24 #: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:88 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:13 msgid "Kovid Goyal" msgstr "" @@ -6287,395 +6286,96 @@ msgstr "" msgid "Unknown News Source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:589 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:590 msgid "Download finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:591 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:592 msgid "Failed to download the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:597 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:598 msgid "Failed to download parts of the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:599 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:600 msgid " from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:601 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:602 msgid "\tFailed links:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:682 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:683 msgid "Could not fetch article. Run with -vv to see the reason" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:703 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:704 msgid "Fetching feeds..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:707 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708 msgid "Got feeds from index page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714 msgid "Trying to download cover..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:767 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768 msgid "Starting download [%d thread(s)]..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:783 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:784 msgid "Feeds downloaded to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:793 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:794 msgid "Could not download cover: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:800 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:801 msgid "Downloading cover from %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:932 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:933 msgid "Untitled Article" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1003 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1004 msgid "Article downloaded: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1014 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1015 msgid "Article download failed: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1029 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:80 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1030 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:81 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:77 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:59 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py:63 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_monitor.py:78 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:83 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_republika.py:66 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:60 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py:64 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_monitor.py:79 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:84 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_republika.py:67 msgid "Fetching feed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hrt.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26 -msgid "Croatian" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_beta.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glasjavnosti.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_krstarica.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_republika.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_rts.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tanjug.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:27 -msgid "Serbian" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_7dias.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_axxon_news.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cubadebate.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_diagonales.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_eltiempo_hn.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_expansion_spanish.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa_hn.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_latribuna.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lavanguardia.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_marca.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miradasalsur.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_newsweek_argentina.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_veintitres.py:23 -msgid "Spanish" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_accountancyage.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_al_jazeera.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_atlantic.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_azstarnet.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_barrons.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbc.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_beta_en.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_business_week.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chr_mon.py:11 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_climate_progress.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cnn.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_coding_horror.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_common_dreams.py:8 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_craigslist.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_mail.py:6 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_darknet.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_discover_magazine.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dna.py:12 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ecogeek.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_economist.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_endgadget.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_espn.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_esquire.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_exiled.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_fastcompany.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_financial_times.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_forbes.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_freakonomics.py:13 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_fudzilla.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_guardian.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers_full.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_iht.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_indy_star.py:6 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_inquirer_net.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_intelligencer.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_irish_times.py:13 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_japan_times.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jpost.py:8 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py:44 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_kellog_faculty.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_kellog_insight.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_krstarica_en.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_latimes.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linux_magazine.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linuxdevices.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_livemint.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lrb.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moneynews.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_news_times.py:7 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_newsweek.py:30 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_noaa.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm_int.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ourdailybread.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_outlook_india.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_phd_comics.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_today.py:11 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_world.py:8 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politico.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_portfolio.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_reuters.py:12 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_aas.py:13 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_news.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sciencedaily.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scientific_american.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_seattle_times.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_security_watch.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_shacknews.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_slashdot.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_slate.py:29 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_smh.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_soldiers.py:26 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegel_int.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_stackoverflow.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_starbulletin.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_straitstimes.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_teleread.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_age.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_nation.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_oz.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_register.py:6 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_scotsman.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_thedgesingapore.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_themarketticker.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_theoldfoodie.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_theonion.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_time_magazine.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_times_online.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_twitchfilms.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_uncrate.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_upi.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_usatoday.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_usnews.py:21 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_utne.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wash_post.py:12 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wikinews_en.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_winsupersite.py:10 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wired.py:14 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wsj.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:16 -msgid "English" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbcvietnamese.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tnxm.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vnexpress.py:16 -msgid "Vietnamese" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:20 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:21 msgid "sr-Latn-RS" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_carta.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_der_standard.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_diepresse.py:23 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elektrolese.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hna.py:17 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nzz_ger.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_rga.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:20 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_woz_die.py:7 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15 -msgid "German" -msgstr "" - #: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6 -msgid "Italian" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13 -msgid "French" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_degentenaar.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_gva_be.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hln.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hln_be.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tijd.py:22 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_volksrant.py:17 -msgid "Dutch" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:28 -msgid "Bosnian" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py:25 -msgid "Catalan" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_publico.py:20 -msgid "Portuguese" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_h1.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_h2.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_h3.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_honvedelem.py:16 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_huntechnet.py:15 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_index_hu.py:8 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pcworld_hu.py:17 -msgid "Hungarian" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:84 msgid "Skipping duplicated article: %s" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:88 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:89 msgid "Skipping filtered article: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_monitor.py:25 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:24 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:25 -msgid "Montenegrin" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zaobao.py:17 -msgid "Chinese" -msgstr "" - #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452 msgid "" "%prog URL\n" diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index 212578c5af..4e81f15d89 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -48,8 +48,9 @@ class BasicNewsRecipe(Recipe): #: The author of this recipe __author__ = __appname__ - #: The language that the news is in - language = _('Unknown') + #: The language that the news is in. Must be an ISO-639 code either + #: two or three characters long + language = 'und' #: Maximum number of articles to download from each feed. This is primarily #: useful for feeds that don't have article dates. For most feeds, you should diff --git a/src/calibre/web/feeds/recipes/recipe_24sata.py b/src/calibre/web/feeds/recipes/recipe_24sata.py index 25fe556cd4..637d0ce626 100644 --- a/src/calibre/web/feeds/recipes/recipe_24sata.py +++ b/src/calibre/web/feeds/recipes/recipe_24sata.py @@ -23,7 +23,8 @@ class Cro24Sata(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Croatian') + language = 'hr' + lang = 'hr-HR' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_24sata_rs.py b/src/calibre/web/feeds/recipes/recipe_24sata_rs.py index 9ddee0be32..9c14527a8b 100644 --- a/src/calibre/web/feeds/recipes/recipe_24sata_rs.py +++ b/src/calibre/web/feeds/recipes/recipe_24sata_rs.py @@ -22,7 +22,8 @@ class Ser24Sata(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_7dias.py b/src/calibre/web/feeds/recipes/recipe_7dias.py index 48970f2081..2507687677 100644 --- a/src/calibre/web/feeds/recipes/recipe_7dias.py +++ b/src/calibre/web/feeds/recipes/recipe_7dias.py @@ -20,7 +20,8 @@ class SieteDias(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/125/7-Dias.html' diff --git a/src/calibre/web/feeds/recipes/recipe_accountancyage.py b/src/calibre/web/feeds/recipes/recipe_accountancyage.py index d6be57d514..b6be176083 100644 --- a/src/calibre/web/feeds/recipes/recipe_accountancyage.py +++ b/src/calibre/web/feeds/recipes/recipe_accountancyage.py @@ -22,7 +22,8 @@ class AccountancyAge(BasicNewsRecipe): simultaneous_downloads = 1 encoding = 'utf-8' lang = 'en' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_adventuregamers.py b/src/calibre/web/feeds/recipes/recipe_adventuregamers.py index 2ef87e532b..86e741c441 100644 --- a/src/calibre/web/feeds/recipes/recipe_adventuregamers.py +++ b/src/calibre/web/feeds/recipes/recipe_adventuregamers.py @@ -10,12 +10,14 @@ from calibre.web.feeds.news import BasicNewsRecipe class AdventureGamers(BasicNewsRecipe): title = u'Adventure Gamers' - language = _('English') + language = 'en' + __author__ = 'Darko Miletic' description = 'Adventure games portal' publisher = 'Adventure Gamers' category = 'news, games, adventure, technology' - language = _('English') + language = 'en' + oldest_article = 10 delay = 10 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_al_jazeera.py b/src/calibre/web/feeds/recipes/recipe_al_jazeera.py index d8aada2356..fd5f07973d 100644 --- a/src/calibre/web/feeds/recipes/recipe_al_jazeera.py +++ b/src/calibre/web/feeds/recipes/recipe_al_jazeera.py @@ -12,7 +12,8 @@ class AlJazeera(BasicNewsRecipe): title = 'Al Jazeera in English' __author__ = 'Darko Miletic' description = 'News from Middle East' - language = _('English') + language = 'en' + publisher = 'Al Jazeera' category = 'news, politics, middle east' simultaneous_downloads = 1 diff --git a/src/calibre/web/feeds/recipes/recipe_ambito.py b/src/calibre/web/feeds/recipes/recipe_ambito.py index e6e3c224e9..f0fb73e873 100644 --- a/src/calibre/web/feeds/recipes/recipe_ambito.py +++ b/src/calibre/web/feeds/recipes/recipe_ambito.py @@ -58,4 +58,5 @@ class Ambito(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_amspec.py b/src/calibre/web/feeds/recipes/recipe_amspec.py index 0e5358dd26..967e4a542a 100644 --- a/src/calibre/web/feeds/recipes/recipe_amspec.py +++ b/src/calibre/web/feeds/recipes/recipe_amspec.py @@ -11,7 +11,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class TheAmericanSpectator(BasicNewsRecipe): title = 'The American Spectator' __author__ = 'Darko Miletic' - language = _('English') + language = 'en' + description = 'News from USA' oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_ap.py b/src/calibre/web/feeds/recipes/recipe_ap.py index 6bff0ab0a8..572c0aa392 100644 --- a/src/calibre/web/feeds/recipes/recipe_ap.py +++ b/src/calibre/web/feeds/recipes/recipe_ap.py @@ -8,7 +8,8 @@ class AssociatedPress(BasicNewsRecipe): description = 'Global news' __author__ = 'Kovid Goyal' use_embedded_content = False - language = _('English') + language = 'en' + max_articles_per_feed = 15 html2lrf_options = ['--force-page-break-before-tag="chapter"'] diff --git a/src/calibre/web/feeds/recipes/recipe_ars_technica.py b/src/calibre/web/feeds/recipes/recipe_ars_technica.py index 2561a463d8..943889e223 100644 --- a/src/calibre/web/feeds/recipes/recipe_ars_technica.py +++ b/src/calibre/web/feeds/recipes/recipe_ars_technica.py @@ -10,7 +10,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class ArsTechnica2(BasicNewsRecipe): title = u'Ars Technica' - language = _('English') + language = 'en' + __author__ = 'Darko Miletic' description = 'The art of technology' publisher = 'Ars Technica' diff --git a/src/calibre/web/feeds/recipes/recipe_atlantic.py b/src/calibre/web/feeds/recipes/recipe_atlantic.py index b6b5705af2..7593665d30 100644 --- a/src/calibre/web/feeds/recipes/recipe_atlantic.py +++ b/src/calibre/web/feeds/recipes/recipe_atlantic.py @@ -14,7 +14,8 @@ class TheAtlantic(BasicNewsRecipe): __author__ = 'Kovid Goyal and Sujata Raman' description = 'Current affairs and politics focussed on the US' INDEX = 'http://www.theatlantic.com/doc/current' - language = _('English') + language = 'en' + remove_tags_before = dict(name='div', id='storytop') remove_tags = [ dict(name='div', id=['seealso','storybottom', 'footer', 'ad_banner_top', 'sidebar','articletoolstop','subcontent',]), diff --git a/src/calibre/web/feeds/recipes/recipe_axxon_news.py b/src/calibre/web/feeds/recipes/recipe_axxon_news.py index cb9f5fca51..ec5d260aed 100644 --- a/src/calibre/web/feeds/recipes/recipe_axxon_news.py +++ b/src/calibre/web/feeds/recipes/recipe_axxon_news.py @@ -18,7 +18,8 @@ class Axxon_news(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = False - language = _('Spanish') + language = 'es' + lang = 'es-AR' conversion_options = { diff --git a/src/calibre/web/feeds/recipes/recipe_azstarnet.py b/src/calibre/web/feeds/recipes/recipe_azstarnet.py index c1652eb10e..391f21ef56 100644 --- a/src/calibre/web/feeds/recipes/recipe_azstarnet.py +++ b/src/calibre/web/feeds/recipes/recipe_azstarnet.py @@ -12,7 +12,8 @@ class Azstarnet(BasicNewsRecipe): title = 'Arizona Daily Star' __author__ = 'Darko Miletic' description = 'news from Arizona' - language = _('English') + language = 'en' + publisher = 'azstarnet.com' category = 'news, politics, Arizona, USA' delay = 1 diff --git a/src/calibre/web/feeds/recipes/recipe_b92.py b/src/calibre/web/feeds/recipes/recipe_b92.py index 98e1967bd2..decb5d898b 100644 --- a/src/calibre/web/feeds/recipes/recipe_b92.py +++ b/src/calibre/web/feeds/recipes/recipe_b92.py @@ -19,7 +19,8 @@ class B92(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'cp1250' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_barrons.py b/src/calibre/web/feeds/recipes/recipe_barrons.py index f9f501a9c3..3e0e4a64ca 100644 --- a/src/calibre/web/feeds/recipes/recipe_barrons.py +++ b/src/calibre/web/feeds/recipes/recipe_barrons.py @@ -15,7 +15,8 @@ class Barrons(BasicNewsRecipe): title = 'Barron\'s' max_articles_per_feed = 50 needs_subscription = True - language = _('English') + language = 'en' + __author__ = 'Kovid Goyal' description = 'Weekly publication for investors from the publisher of the Wall Street Journal' timefmt = ' [%a, %b %d, %Y]' diff --git a/src/calibre/web/feeds/recipes/recipe_bbc.py b/src/calibre/web/feeds/recipes/recipe_bbc.py index f82401f987..3634769d85 100644 --- a/src/calibre/web/feeds/recipes/recipe_bbc.py +++ b/src/calibre/web/feeds/recipes/recipe_bbc.py @@ -12,7 +12,8 @@ class BBC(BasicNewsRecipe): title = u'The BBC' __author__ = 'Kovid Goyal ans Sujata Raman' description = 'Global news and current affairs from the British Broadcasting Corporation' - language = _('English') + language = 'en' + no_stylesheets = True remove_tags = [dict(name='div', attrs={'class':'footer'}), {'id' : ['popstory','blq-footer']}, diff --git a/src/calibre/web/feeds/recipes/recipe_bbcvietnamese.py b/src/calibre/web/feeds/recipes/recipe_bbcvietnamese.py index a485798ad1..a9555de7c5 100644 --- a/src/calibre/web/feeds/recipes/recipe_bbcvietnamese.py +++ b/src/calibre/web/feeds/recipes/recipe_bbcvietnamese.py @@ -13,7 +13,8 @@ class BBCVietnamese(BasicNewsRecipe): __author__ = 'Huan Komrade T' description = 'Vietnam news and current affairs from the British Broadcasting Corporation' no_stylesheets = True - language = _('Vietnamese') + language = 'vi' + encoding = 'utf-8' recursions = 0 diff --git a/src/calibre/web/feeds/recipes/recipe_beta.py b/src/calibre/web/feeds/recipes/recipe_beta.py index a647c43ab2..3c0351706f 100644 --- a/src/calibre/web/feeds/recipes/recipe_beta.py +++ b/src/calibre/web/feeds/recipes/recipe_beta.py @@ -19,7 +19,8 @@ class Danas(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = True - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_beta_en.py b/src/calibre/web/feeds/recipes/recipe_beta_en.py index 8ace641233..e887b771fc 100644 --- a/src/calibre/web/feeds/recipes/recipe_beta_en.py +++ b/src/calibre/web/feeds/recipes/recipe_beta_en.py @@ -19,7 +19,8 @@ class Danas(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = True - language = _('English') + language = 'en' + lang = 'en' conversion_options = { diff --git a/src/calibre/web/feeds/recipes/recipe_blic.py b/src/calibre/web/feeds/recipes/recipe_blic.py index 5a2c290c60..f75420609c 100644 --- a/src/calibre/web/feeds/recipes/recipe_blic.py +++ b/src/calibre/web/feeds/recipes/recipe_blic.py @@ -22,7 +22,8 @@ class Blic(BasicNewsRecipe): remove_javascript = True no_stylesheets = True use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif} ' diff --git a/src/calibre/web/feeds/recipes/recipe_borba.py b/src/calibre/web/feeds/recipes/recipe_borba.py index 827c94cacd..ba249e8036 100644 --- a/src/calibre/web/feeds/recipes/recipe_borba.py +++ b/src/calibre/web/feeds/recipes/recipe_borba.py @@ -16,7 +16,8 @@ class Borba(BasicNewsRecipe): description = 'Dnevne novine Borba Online' publisher = 'IP Novine Borba' category = 'news, politics, Serbia' - language = _('Serbian') + language = 'sr' + lang = _('sr-Latn-RS') oldest_article = 2 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py b/src/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py index 68e917284f..7ccf156982 100644 --- a/src/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py +++ b/src/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py @@ -20,7 +20,8 @@ class BsAsEconomico(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/121/Buenos-Aires-Economico.html' diff --git a/src/calibre/web/feeds/recipes/recipe_business_week.py b/src/calibre/web/feeds/recipes/recipe_business_week.py index da64eed711..69d27649be 100644 --- a/src/calibre/web/feeds/recipes/recipe_business_week.py +++ b/src/calibre/web/feeds/recipes/recipe_business_week.py @@ -13,7 +13,8 @@ class BusinessWeek(BasicNewsRecipe): title = 'Business Week' description = 'Business News, Stock Market and Financial Advice' __author__ = 'ChuckEggDotCom and Sujata Raman' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 10 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_carta.py b/src/calibre/web/feeds/recipes/recipe_carta.py index 2504b74c67..b63ab0aa6d 100644 --- a/src/calibre/web/feeds/recipes/recipe_carta.py +++ b/src/calibre/web/feeds/recipes/recipe_carta.py @@ -21,7 +21,8 @@ class Carta(BasicNewsRecipe): remove_javascript = True #html2epub_options = 'linearize_tables = True\nbase_font_size2=14' encoding = 'utf-8' - language = _('German') + language = 'de' + remove_tags_after = [dict(name='p', attrs={'class':'tags-blog'})] diff --git a/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py b/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py index 2a3cc21596..c106601a18 100644 --- a/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py +++ b/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py @@ -19,7 +19,8 @@ class ChicagoBreakingNews(BasicNewsRecipe): publisher = 'Chicago Breaking News' category = 'news, politics, USA, Chicago' encoding = 'utf8' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py b/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py index 7c747003d2..e76a10c88c 100644 --- a/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py +++ b/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py @@ -14,7 +14,8 @@ class ChicagoTribune(BasicNewsRecipe): title = 'Chicago Tribune' __author__ = 'Kovid Goyal and Sujata Raman' description = 'Politics, local and business news from Chicago' - language = _('English') + language = 'en' + use_embedded_content = False no_stylesheets = True remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_chr_mon.py b/src/calibre/web/feeds/recipes/recipe_chr_mon.py index ccf17bc2e0..e4c12cc931 100644 --- a/src/calibre/web/feeds/recipes/recipe_chr_mon.py +++ b/src/calibre/web/feeds/recipes/recipe_chr_mon.py @@ -8,7 +8,8 @@ class ChristianScienceMonitor(BasicNewsRecipe): description = 'Providing context and clarity on national and international news, peoples and cultures' max_articles_per_feed = 20 __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py b/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py index 8e62c5f1db..cc3cb1c0ca 100644 --- a/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py +++ b/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py @@ -7,7 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class AdvancedUserRecipe1234144423(BasicNewsRecipe): title = u'Cincinnati Enquirer' oldest_article = 7 - language = _('English') + language = 'en' + __author__ = 'Joseph Kitzmiller' max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_clarin.py b/src/calibre/web/feeds/recipes/recipe_clarin.py index 5a357c3cab..ecdd2c3346 100644 --- a/src/calibre/web/feeds/recipes/recipe_clarin.py +++ b/src/calibre/web/feeds/recipes/recipe_clarin.py @@ -23,7 +23,8 @@ class Clarin(BasicNewsRecipe): cover_url = strftime('http://www.clarin.com/diario/%Y/%m/%d/portada.jpg') remove_javascript = True encoding = 'cp1252' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' extra_css = ' .Txt{ font-family: sans-serif } .Volan{ font-family: sans-serif; font-size: x-small} .Pie{ font-family: sans-serif; font-size: x-small} .Copete{font-family: sans-serif; font-size: large} .Hora{font-family: sans-serif; font-size: large} .Autor{font-family: sans-serif; font-size: small} ' diff --git a/src/calibre/web/feeds/recipes/recipe_climate_progress.py b/src/calibre/web/feeds/recipes/recipe_climate_progress.py index c49c4718a3..5dfccf7b3d 100644 --- a/src/calibre/web/feeds/recipes/recipe_climate_progress.py +++ b/src/calibre/web/feeds/recipes/recipe_climate_progress.py @@ -20,7 +20,8 @@ class ClimateProgress(BasicNewsRecipe): no_stylesheets = True use_embedded_content = True encoding = 'utf-8' - language = _("English") + language = 'en' + lang = 'en-US' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_cnn.py b/src/calibre/web/feeds/recipes/recipe_cnn.py index f9aef380f9..868f3f3641 100644 --- a/src/calibre/web/feeds/recipes/recipe_cnn.py +++ b/src/calibre/web/feeds/recipes/recipe_cnn.py @@ -11,7 +11,8 @@ class CNN(BasicNewsRecipe): description = 'Global news' timefmt = ' [%d %b %Y]' __author__ = 'Kovid Goyal and Sujata Raman' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False oldest_article = 15 diff --git a/src/calibre/web/feeds/recipes/recipe_coding_horror.py b/src/calibre/web/feeds/recipes/recipe_coding_horror.py index edc671f6ef..de8fafe71f 100644 --- a/src/calibre/web/feeds/recipes/recipe_coding_horror.py +++ b/src/calibre/web/feeds/recipes/recipe_coding_horror.py @@ -14,7 +14,8 @@ class CodingHorror(BasicNewsRecipe): description = 'programming and human factors - Jeff Atwood' category = 'blog, programming' publisher = 'Jeff Atwood' - language = _('English') + language = 'en' + author = 'Jeff Atwood' oldest_article = 30 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_common_dreams.py b/src/calibre/web/feeds/recipes/recipe_common_dreams.py index 3f44dfd09d..b662cc3ee0 100644 --- a/src/calibre/web/feeds/recipes/recipe_common_dreams.py +++ b/src/calibre/web/feeds/recipes/recipe_common_dreams.py @@ -5,7 +5,8 @@ class CommonDreams(BasicNewsRecipe): title = u'Common Dreams' description = u'Progressive news and views' __author__ = u'XanthanGum' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py b/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py index 94b8aff1fe..da4413879c 100644 --- a/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py +++ b/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py @@ -20,7 +20,8 @@ class Corriere_en(BasicNewsRecipe): use_embedded_content = False encoding = 'cp1252' remove_javascript = True - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py b/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py index 757864c285..75f121776b 100644 --- a/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py +++ b/src/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py @@ -19,7 +19,8 @@ class Corriere_it(BasicNewsRecipe): use_embedded_content = False encoding = 'cp1252' remove_javascript = True - language = _('Italian') + language = 'it' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_courrierinternational.py b/src/calibre/web/feeds/recipes/recipe_courrierinternational.py index 153896d4e0..070b5b96fa 100644 --- a/src/calibre/web/feeds/recipes/recipe_courrierinternational.py +++ b/src/calibre/web/feeds/recipes/recipe_courrierinternational.py @@ -15,7 +15,8 @@ class CourrierInternational(BasicNewsRecipe): __author__ = 'Mathieu Godlewski ' description = 'Global news in french from international newspapers' oldest_article = 7 - language = _('French') + language = 'fr' + max_articles_per_feed = 50 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_craigslist.py b/src/calibre/web/feeds/recipes/recipe_craigslist.py index f2b2b31465..8454ea8305 100644 --- a/src/calibre/web/feeds/recipes/recipe_craigslist.py +++ b/src/calibre/web/feeds/recipes/recipe_craigslist.py @@ -12,7 +12,8 @@ class CraigsList(BasicNewsRecipe): title = u'craigslist - Best Of' oldest_article = 365 max_articles_per_feed = 100 - language = _('English') + language = 'en' + __author__ = 'kiodane' feeds = [(u'Best of craigslist', diff --git a/src/calibre/web/feeds/recipes/recipe_criticadigital.py b/src/calibre/web/feeds/recipes/recipe_criticadigital.py index ed04fd8b55..c36c82e45f 100644 --- a/src/calibre/web/feeds/recipes/recipe_criticadigital.py +++ b/src/calibre/web/feeds/recipes/recipe_criticadigital.py @@ -14,7 +14,8 @@ class CriticaDigital(BasicNewsRecipe): description = 'Noticias de Argentina' oldest_article = 2 max_articles_per_feed = 100 - language = _('Spanish') + language = 'es' + no_stylesheets = True use_embedded_content = False encoding = 'cp1252' diff --git a/src/calibre/web/feeds/recipes/recipe_cubadebate.py b/src/calibre/web/feeds/recipes/recipe_cubadebate.py index 13747348fd..19aa58ed0d 100644 --- a/src/calibre/web/feeds/recipes/recipe_cubadebate.py +++ b/src/calibre/web/feeds/recipes/recipe_cubadebate.py @@ -14,7 +14,8 @@ class CubaDebate(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'Contra el Terorismo Mediatico' oldest_article = 15 - language = _('Spanish') + language = 'es' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_cyberpresse.py b/src/calibre/web/feeds/recipes/recipe_cyberpresse.py index ead1589e0f..9e20c11502 100644 --- a/src/calibre/web/feeds/recipes/recipe_cyberpresse.py +++ b/src/calibre/web/feeds/recipes/recipe_cyberpresse.py @@ -6,7 +6,8 @@ class Cyberpresse(BasicNewsRecipe): title = u'Cyberpresse' __author__ = 'balok' description = 'Canadian news in French' - language = _('French') + language = 'fr' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_daily_mail.py b/src/calibre/web/feeds/recipes/recipe_daily_mail.py index c64e328bf2..cea59fc67c 100644 --- a/src/calibre/web/feeds/recipes/recipe_daily_mail.py +++ b/src/calibre/web/feeds/recipes/recipe_daily_mail.py @@ -3,7 +3,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class TheDailyMail(BasicNewsRecipe): title = u'The Daily Mail' oldest_article = 2 - language = _('English') + language = 'en' + author = 'RufusA' simultaneous_downloads= 1 max_articles_per_feed = 50 diff --git a/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py b/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py index 84a379537e..9935face07 100644 --- a/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py +++ b/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py @@ -12,7 +12,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class DailyTelegraph(BasicNewsRecipe): title = u'Daily Telegraph' __author__ = u'AprilHare' - language = _('English') + language = 'en' + description = u'News from down under' oldest_article = 2 max_articles_per_feed = 10 diff --git a/src/calibre/web/feeds/recipes/recipe_danas.py b/src/calibre/web/feeds/recipes/recipe_danas.py index 8882b9db9d..0ff720eb1a 100644 --- a/src/calibre/web/feeds/recipes/recipe_danas.py +++ b/src/calibre/web/feeds/recipes/recipe_danas.py @@ -19,7 +19,8 @@ class Danas(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_darknet.py b/src/calibre/web/feeds/recipes/recipe_darknet.py index e86be1655a..4410e0567f 100644 --- a/src/calibre/web/feeds/recipes/recipe_darknet.py +++ b/src/calibre/web/feeds/recipes/recipe_darknet.py @@ -13,7 +13,8 @@ class darknet(BasicNewsRecipe): title = 'darknet' description = 'Ethical hacking and security news' __author__ = 'Oliver Niesner' - language = _('English') + language = 'en' + use_embedded_content = False timefmt = ' [%b %d %Y]' max_articles_per_feed = 40 diff --git a/src/calibre/web/feeds/recipes/recipe_de_standaard.py b/src/calibre/web/feeds/recipes/recipe_de_standaard.py index cead8018a5..64233819bd 100644 --- a/src/calibre/web/feeds/recipes/recipe_de_standaard.py +++ b/src/calibre/web/feeds/recipes/recipe_de_standaard.py @@ -9,7 +9,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class DeStandaard(BasicNewsRecipe): title = u'De Standaard' __author__ = u'Darko Miletic' - language = _('Dutch') + language = 'nl' + description = u'News from Belgium' oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_degentenaar.py b/src/calibre/web/feeds/recipes/recipe_degentenaar.py index 03b324cc2d..b63dc7f417 100644 --- a/src/calibre/web/feeds/recipes/recipe_degentenaar.py +++ b/src/calibre/web/feeds/recipes/recipe_degentenaar.py @@ -19,7 +19,8 @@ class DeGentenaarOnline(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Dutch') + language = 'nl' + lang = 'nl-BE' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_demorgen_be.py b/src/calibre/web/feeds/recipes/recipe_demorgen_be.py index 5dc912aa3e..43f45d37f7 100644 --- a/src/calibre/web/feeds/recipes/recipe_demorgen_be.py +++ b/src/calibre/web/feeds/recipes/recipe_demorgen_be.py @@ -13,7 +13,8 @@ class DeMorganBe(BasicNewsRecipe): __author__ = u'Darko Miletic' description = u'News from Belgium' oldest_article = 7 - language = _('Dutch') + language = 'nl' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_der_standard.py b/src/calibre/web/feeds/recipes/recipe_der_standard.py index c053d74cfb..1ee3b3c979 100644 --- a/src/calibre/web/feeds/recipes/recipe_der_standard.py +++ b/src/calibre/web/feeds/recipes/recipe_der_standard.py @@ -19,7 +19,8 @@ class DerStandardRecipe(BasicNewsRecipe): lang = 'de-AT' no_stylesheets = True encoding = 'utf-8' - language = _('German') + language = 'de' + recursions = 0 oldest_article = 1 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_diagonales.py b/src/calibre/web/feeds/recipes/recipe_diagonales.py index 9a8b3fe758..baebbf6b58 100644 --- a/src/calibre/web/feeds/recipes/recipe_diagonales.py +++ b/src/calibre/web/feeds/recipes/recipe_diagonales.py @@ -20,7 +20,8 @@ class Diagonales(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/122/Diagonales.html' diff --git a/src/calibre/web/feeds/recipes/recipe_diepresse.py b/src/calibre/web/feeds/recipes/recipe_diepresse.py index 362a08fb3a..44dea65a4c 100644 --- a/src/calibre/web/feeds/recipes/recipe_diepresse.py +++ b/src/calibre/web/feeds/recipes/recipe_diepresse.py @@ -20,7 +20,8 @@ class DiePresseRecipe(BasicNewsRecipe): lang = 'de-AT' no_stylesheets = True encoding = 'ISO-8859-1' - language = _('German') + language = 'de' + recursions = 0 oldest_article = 1 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_discover_magazine.py b/src/calibre/web/feeds/recipes/recipe_discover_magazine.py index 9c4c4259a5..a3562bbbd1 100644 --- a/src/calibre/web/feeds/recipes/recipe_discover_magazine.py +++ b/src/calibre/web/feeds/recipes/recipe_discover_magazine.py @@ -14,7 +14,8 @@ class DiscoverMagazine(BasicNewsRecipe): description = u'Science, Technology and the Future' __author__ = 'Mike Diaz' oldest_article = 33 - language = _('English') + language = 'en' + max_articles_per_feed = 20 feeds = [ (u'Technology', u'http://discovermagazine.com/topics/technology/rss.xml'), diff --git a/src/calibre/web/feeds/recipes/recipe_dna.py b/src/calibre/web/feeds/recipes/recipe_dna.py index a335fd5655..91cc207e24 100644 --- a/src/calibre/web/feeds/recipes/recipe_dna.py +++ b/src/calibre/web/feeds/recipes/recipe_dna.py @@ -9,7 +9,8 @@ class DNAIndia(BasicNewsRecipe): title = 'DNA India' description = 'Mumbai news, India news, World news, breaking news' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + encoding = 'cp1252' feeds = [ diff --git a/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py b/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py index e4c47c3f2e..6caefe2979 100644 --- a/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py +++ b/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py @@ -25,7 +25,8 @@ class DnevniAvaz(BasicNewsRecipe): remove_javascript = True cover_url = 'http://www.dnevniavaz.ba/img/logo.gif' lang = 'bs-BA' - language = _('Bosnian') + language = 'bs' + direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py b/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py index b2c3013513..8a4d7c9891 100644 --- a/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py +++ b/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py @@ -23,7 +23,8 @@ class DnevnikCro(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Croatian') + language = 'hr' + lang = 'hr-HR' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_e_novine.py b/src/calibre/web/feeds/recipes/recipe_e_novine.py index 166f0087d1..e26c55d3f7 100644 --- a/src/calibre/web/feeds/recipes/recipe_e_novine.py +++ b/src/calibre/web/feeds/recipes/recipe_e_novine.py @@ -22,7 +22,8 @@ class E_novine(BasicNewsRecipe): no_stylesheets = True encoding = 'cp1250' use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{text-align: justify; font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_ecogeek.py b/src/calibre/web/feeds/recipes/recipe_ecogeek.py index 7695763295..ce0918aff2 100644 --- a/src/calibre/web/feeds/recipes/recipe_ecogeek.py +++ b/src/calibre/web/feeds/recipes/recipe_ecogeek.py @@ -13,7 +13,8 @@ class EcoGeek(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'EcoGeek - Technology for the Environment Blog Feed' publisher = 'EcoGeek' - language = _('English') + language = 'en' + category = 'news, ecology, blog' oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_economist.py b/src/calibre/web/feeds/recipes/recipe_economist.py index 6965cfe0c4..d1c3f5b546 100644 --- a/src/calibre/web/feeds/recipes/recipe_economist.py +++ b/src/calibre/web/feeds/recipes/recipe_economist.py @@ -14,7 +14,8 @@ from urllib2 import quote class Economist(BasicNewsRecipe): title = 'The Economist' - language = _('English') + language = 'en' + __author__ = "Kovid Goyal" description = 'Global news and current affairs from a European perspective' oldest_article = 7.0 diff --git a/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py b/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py index fb11d54072..f6b1e6c304 100644 --- a/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py +++ b/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py @@ -58,4 +58,5 @@ class ElMercurio(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_el_pais.py b/src/calibre/web/feeds/recipes/recipe_el_pais.py index a738c517aa..caffab6284 100644 --- a/src/calibre/web/feeds/recipes/recipe_el_pais.py +++ b/src/calibre/web/feeds/recipes/recipe_el_pais.py @@ -11,7 +11,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class ElPais(BasicNewsRecipe): title = u'EL PAIS' - language = _('Spanish') + language = 'es' + oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_el_universal.py b/src/calibre/web/feeds/recipes/recipe_el_universal.py index 2dae795387..c3030d879f 100644 --- a/src/calibre/web/feeds/recipes/recipe_el_universal.py +++ b/src/calibre/web/feeds/recipes/recipe_el_universal.py @@ -20,7 +20,8 @@ class ElUniversal(BasicNewsRecipe): use_embedded_content = False encoding = 'cp1252' remove_javascript = True - language = _('Spanish') + language = 'es' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_elargentino.py b/src/calibre/web/feeds/recipes/recipe_elargentino.py index 5c7d314f24..9382eae659 100644 --- a/src/calibre/web/feeds/recipes/recipe_elargentino.py +++ b/src/calibre/web/feeds/recipes/recipe_elargentino.py @@ -20,7 +20,8 @@ class ElArgentino(BasicNewsRecipe): use_embedded_content = False encoding = 'utf8' cover_url = 'http://www.elargentino.com/TemplateWeb/MediosFooter/tapa_elargentino.png' - language = _('Spanish') + language = 'es' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_elcronista.py b/src/calibre/web/feeds/recipes/recipe_elcronista.py index c875ba45ce..e38d8c8c71 100644 --- a/src/calibre/web/feeds/recipes/recipe_elcronista.py +++ b/src/calibre/web/feeds/recipes/recipe_elcronista.py @@ -13,7 +13,8 @@ class ElCronista(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'Noticias de Argentina' oldest_article = 2 - language = _('Spanish') + language = 'es' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_elektrolese.py b/src/calibre/web/feeds/recipes/recipe_elektrolese.py index 07eef95bbc..070cb9a82c 100644 --- a/src/calibre/web/feeds/recipes/recipe_elektrolese.py +++ b/src/calibre/web/feeds/recipes/recipe_elektrolese.py @@ -15,7 +15,8 @@ class elektrolese(BasicNewsRecipe): __author__ = 'Oliver Niesner' use_embedded_content = False timefmt = ' [%a %d %b %Y]' - language = _('German') + language = 'de' + oldest_article = 14 max_articles_per_feed = 50 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_elmundo.py b/src/calibre/web/feeds/recipes/recipe_elmundo.py index 3ecedb5822..b42fca972f 100644 --- a/src/calibre/web/feeds/recipes/recipe_elmundo.py +++ b/src/calibre/web/feeds/recipes/recipe_elmundo.py @@ -57,4 +57,5 @@ class ElMundo(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py b/src/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py index 01a9d16d6b..ed97d8779c 100644 --- a/src/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py +++ b/src/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py @@ -22,7 +22,8 @@ class ElPeriodico_cat(BasicNewsRecipe): use_embedded_content = False delay = 1 encoding = 'cp1252' - language = _('Catalan') + language = 'ca' + html2lrf_options = [ '--comment' , description diff --git a/src/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py b/src/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py index 750e4884e7..3479522596 100644 --- a/src/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py +++ b/src/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py @@ -22,7 +22,8 @@ class ElPeriodico_esp(BasicNewsRecipe): use_embedded_content = False delay = 1 encoding = 'cp1252' - language = _('Spanish') + language = 'es' + html2lrf_options = [ '--comment' , description diff --git a/src/calibre/web/feeds/recipes/recipe_eltiempo_hn.py b/src/calibre/web/feeds/recipes/recipe_eltiempo_hn.py index e7fd23b797..5c0696a77a 100644 --- a/src/calibre/web/feeds/recipes/recipe_eltiempo_hn.py +++ b/src/calibre/web/feeds/recipes/recipe_eltiempo_hn.py @@ -21,7 +21,8 @@ class ElTiempoHn(BasicNewsRecipe): no_stylesheets = True remove_javascript = True encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-HN' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_endgadget.py b/src/calibre/web/feeds/recipes/recipe_endgadget.py index bcf9fc13f4..3bb97bc9d2 100644 --- a/src/calibre/web/feeds/recipes/recipe_endgadget.py +++ b/src/calibre/web/feeds/recipes/recipe_endgadget.py @@ -13,7 +13,8 @@ class Engadget(BasicNewsRecipe): title = u'Engadget' __author__ = 'Darko Miletic' description = 'Tech news' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_espn.py b/src/calibre/web/feeds/recipes/recipe_espn.py index 56f0af5c86..a1d5862525 100644 --- a/src/calibre/web/feeds/recipes/recipe_espn.py +++ b/src/calibre/web/feeds/recipes/recipe_espn.py @@ -14,7 +14,8 @@ class ESPN(BasicNewsRecipe): title = 'ESPN' description = 'Sports news' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + needs_subscription = True remove_tags = [dict(name='font', attrs={'class':'footer'}), dict(name='hr', noshade='noshade')] diff --git a/src/calibre/web/feeds/recipes/recipe_esquire.py b/src/calibre/web/feeds/recipes/recipe_esquire.py index 366b2ddf96..3b91178d7c 100644 --- a/src/calibre/web/feeds/recipes/recipe_esquire.py +++ b/src/calibre/web/feeds/recipes/recipe_esquire.py @@ -22,7 +22,8 @@ class Esquire(BasicNewsRecipe): no_stylesheets = True encoding = 'cp1250' use_embedded_content = False - language = _('English') + language = 'en' + lang = 'en-US' cover_url = strftime('http://www.esquire.com/cm/esquire/cover-images/%Y_') + strftime('%m').strip('0') + '.jpg' diff --git a/src/calibre/web/feeds/recipes/recipe_estadao.py b/src/calibre/web/feeds/recipes/recipe_estadao.py index 994aafadac..e42eb0574d 100644 --- a/src/calibre/web/feeds/recipes/recipe_estadao.py +++ b/src/calibre/web/feeds/recipes/recipe_estadao.py @@ -59,4 +59,5 @@ class Estadao(BasicNewsRecipe): del item['style'] return soup - language = _('Portuguese') + language = 'pt' + diff --git a/src/calibre/web/feeds/recipes/recipe_exiled.py b/src/calibre/web/feeds/recipes/recipe_exiled.py index 017c9ea26e..754ca65129 100644 --- a/src/calibre/web/feeds/recipes/recipe_exiled.py +++ b/src/calibre/web/feeds/recipes/recipe_exiled.py @@ -20,7 +20,8 @@ class Exiled(BasicNewsRecipe): use_embedded_content = False encoding = 'utf8' remove_javascript = True - language = _('English') + language = 'en' + cover_url = 'http://exiledonline.com/wp-content/themes/exiledonline_theme/images/header-sm.gif' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_expansion_spanish.py b/src/calibre/web/feeds/recipes/recipe_expansion_spanish.py index 2d402d343f..9ae42e57b0 100644 --- a/src/calibre/web/feeds/recipes/recipe_expansion_spanish.py +++ b/src/calibre/web/feeds/recipes/recipe_expansion_spanish.py @@ -22,7 +22,8 @@ class Expansion(BasicNewsRecipe): use_embedded_content = False delay = 1 encoding = 'iso-8859-15' - language = _('Spanish') + language = 'es' + direction = 'ltr' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_fastcompany.py b/src/calibre/web/feeds/recipes/recipe_fastcompany.py index fadbdcfc98..ba3cce9888 100644 --- a/src/calibre/web/feeds/recipes/recipe_fastcompany.py +++ b/src/calibre/web/feeds/recipes/recipe_fastcompany.py @@ -22,7 +22,8 @@ class FastCompany(BasicNewsRecipe): simultaneous_downloads = 1 encoding = 'utf-8' lang = 'en' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_faznet.py b/src/calibre/web/feeds/recipes/recipe_faznet.py index a47bf8ced5..e3ff5e01cc 100644 --- a/src/calibre/web/feeds/recipes/recipe_faznet.py +++ b/src/calibre/web/feeds/recipes/recipe_faznet.py @@ -13,7 +13,8 @@ class FazNet(BasicNewsRecipe): publisher = 'FAZ Electronic Media GmbH' category = 'news, politics, Germany' use_embedded_content = False - language = _('German') + language = 'de' + max_articles_per_feed = 30 no_stylesheets = True encoding = 'utf-8' diff --git a/src/calibre/web/feeds/recipes/recipe_financial_times.py b/src/calibre/web/feeds/recipes/recipe_financial_times.py index fe2956f572..9c42c1e8f7 100644 --- a/src/calibre/web/feeds/recipes/recipe_financial_times.py +++ b/src/calibre/web/feeds/recipes/recipe_financial_times.py @@ -13,7 +13,8 @@ class FinancialTimes(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'Financial world news' oldest_article = 2 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_forbes.py b/src/calibre/web/feeds/recipes/recipe_forbes.py index 71dd817a5f..a633d0f543 100644 --- a/src/calibre/web/feeds/recipes/recipe_forbes.py +++ b/src/calibre/web/feeds/recipes/recipe_forbes.py @@ -7,7 +7,8 @@ class Forbes(BasicNewsRecipe): __author__ = 'Darko Miletic' oldest_article = 30 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True html2lrf_options = ['--base-font-size', '10'] diff --git a/src/calibre/web/feeds/recipes/recipe_freakonomics.py b/src/calibre/web/feeds/recipes/recipe_freakonomics.py index 8846172e30..1d098fe2ba 100644 --- a/src/calibre/web/feeds/recipes/recipe_freakonomics.py +++ b/src/calibre/web/feeds/recipes/recipe_freakonomics.py @@ -10,7 +10,8 @@ class Freakonomics(BasicNewsRecipe): title = 'Freakonomics Blog' description = 'The Hidden side of everything' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + feeds = [('Blog', 'http://freakonomics.blogs.nytimes.com/feed/atom/')] diff --git a/src/calibre/web/feeds/recipes/recipe_ftd.py b/src/calibre/web/feeds/recipes/recipe_ftd.py index 00c5081bd3..410906ee81 100644 --- a/src/calibre/web/feeds/recipes/recipe_ftd.py +++ b/src/calibre/web/feeds/recipes/recipe_ftd.py @@ -15,7 +15,8 @@ class FTheiseDe(BasicNewsRecipe): __author__ = 'Oliver Niesner' use_embedded_content = False timefmt = ' [%d %b %Y]' - language = _('German') + language = 'de' + max_articles_per_feed = 40 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_fudzilla.py b/src/calibre/web/feeds/recipes/recipe_fudzilla.py index d4c4429d70..bdc610b1e4 100644 --- a/src/calibre/web/feeds/recipes/recipe_fudzilla.py +++ b/src/calibre/web/feeds/recipes/recipe_fudzilla.py @@ -12,7 +12,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class Fudzilla(BasicNewsRecipe): title = u'Fudzilla' __author__ = 'Darko Miletic' - language = _('English') + language = 'en' + description = 'Tech news' oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_glas_srpske.py b/src/calibre/web/feeds/recipes/recipe_glas_srpske.py index 8e5624792d..bfc3a64d8e 100644 --- a/src/calibre/web/feeds/recipes/recipe_glas_srpske.py +++ b/src/calibre/web/feeds/recipes/recipe_glas_srpske.py @@ -24,7 +24,8 @@ class GlasSrpske(BasicNewsRecipe): use_embedded_content = False cover_url = 'http://www.glassrpske.com/var/slike/glassrpske-logo.png' lang = 'sr-BA' - language = _('Serbian') + language = 'sr' + INDEX = 'http://www.glassrpske.com' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py b/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py index a2f5577d81..353db41c93 100644 --- a/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py +++ b/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py @@ -7,7 +7,8 @@ class GlasgowHerald(BasicNewsRecipe): oldest_article = 1 max_articles_per_feed = 100 no_stylesheets = True - language = _('English') + language = 'en' + __author__ = 'McCande' preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in diff --git a/src/calibre/web/feeds/recipes/recipe_glasjavnosti.py b/src/calibre/web/feeds/recipes/recipe_glasjavnosti.py index 229f79276b..25d43055ef 100644 --- a/src/calibre/web/feeds/recipes/recipe_glasjavnosti.py +++ b/src/calibre/web/feeds/recipes/recipe_glasjavnosti.py @@ -18,7 +18,8 @@ class GlasJavnosti(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py b/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py index 1126990e5b..f7ac7a63e2 100644 --- a/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py +++ b/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py @@ -12,7 +12,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class GlobeAndMail(BasicNewsRecipe): title = u'Globe and Mail' - language = _('English') + language = 'en' + __author__ = 'Kovid Goyal' oldest_article = 2 max_articles_per_feed = 10 diff --git a/src/calibre/web/feeds/recipes/recipe_granma.py b/src/calibre/web/feeds/recipes/recipe_granma.py index 958d95c2df..e29c75e619 100644 --- a/src/calibre/web/feeds/recipes/recipe_granma.py +++ b/src/calibre/web/feeds/recipes/recipe_granma.py @@ -21,7 +21,8 @@ class Granma(BasicNewsRecipe): use_embedded_content = False encoding = 'cp1252' cover_url = 'http://www.granma.cubaweb.cu/imagenes/granweb229d.jpg' - language = _('Spanish') + language = 'es' + remove_javascript = True html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_guardian.py b/src/calibre/web/feeds/recipes/recipe_guardian.py index 58e1c3e706..c1f34f6a1f 100644 --- a/src/calibre/web/feeds/recipes/recipe_guardian.py +++ b/src/calibre/web/feeds/recipes/recipe_guardian.py @@ -13,7 +13,8 @@ class Guardian(BasicNewsRecipe): title = u'The Guardian' __author__ = 'Seabound and Sujata Raman' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 20 remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_gva_be.py b/src/calibre/web/feeds/recipes/recipe_gva_be.py index a02807d8d2..97907392a8 100644 --- a/src/calibre/web/feeds/recipes/recipe_gva_be.py +++ b/src/calibre/web/feeds/recipes/recipe_gva_be.py @@ -19,7 +19,8 @@ class GazetvanAntwerpen(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Dutch') + language = 'nl' + lang = 'nl-BE' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_h1.py b/src/calibre/web/feeds/recipes/recipe_h1.py index 2678e5b2eb..981770092f 100644 --- a/src/calibre/web/feeds/recipes/recipe_h1.py +++ b/src/calibre/web/feeds/recipes/recipe_h1.py @@ -12,7 +12,8 @@ class H168(BasicNewsRecipe): title = u'168\xf3ra' oldest_article = 4 max_articles_per_feed = 50 - language = _('Hungarian') + language = 'hu' + __author__ = 'Ezmegaz' feeds = [(u'Itthon', diff --git a/src/calibre/web/feeds/recipes/recipe_h2.py b/src/calibre/web/feeds/recipes/recipe_h2.py index 20c251ded9..f1f9d7af41 100644 --- a/src/calibre/web/feeds/recipes/recipe_h2.py +++ b/src/calibre/web/feeds/recipes/recipe_h2.py @@ -12,7 +12,8 @@ class ATV(BasicNewsRecipe): title = u'ATV' oldest_article = 5 max_articles_per_feed = 50 - language = _('Hungarian') + language = 'hu' + __author__ = 'Ezmegaz' diff --git a/src/calibre/web/feeds/recipes/recipe_h3.py b/src/calibre/web/feeds/recipes/recipe_h3.py index a4da0c71cd..30bf9223a5 100644 --- a/src/calibre/web/feeds/recipes/recipe_h3.py +++ b/src/calibre/web/feeds/recipes/recipe_h3.py @@ -12,7 +12,8 @@ class H3(BasicNewsRecipe): title = u'H\xedrszerz\u0151' oldest_article = 5 max_articles_per_feed = 50 - language = _('Hungarian') + language = 'hu' + __author__ = 'Ezmegaz' diff --git a/src/calibre/web/feeds/recipes/recipe_harpers.py b/src/calibre/web/feeds/recipes/recipe_harpers.py index 6cdcfe800d..db255d673f 100644 --- a/src/calibre/web/feeds/recipes/recipe_harpers.py +++ b/src/calibre/web/feeds/recipes/recipe_harpers.py @@ -11,7 +11,8 @@ from calibre.ebooks.BeautifulSoup import Tag class Harpers(BasicNewsRecipe): title = u"Harper's Magazine" __author__ = u'Darko Miletic' - language = _('English') + language = 'en' + description = u"Harper's Magazine: Founded June 1850." publisher = "Harper's Magazine " category = 'news, politics, USA' diff --git a/src/calibre/web/feeds/recipes/recipe_harpers_full.py b/src/calibre/web/feeds/recipes/recipe_harpers_full.py index bec16cd5c4..567aa3eac8 100644 --- a/src/calibre/web/feeds/recipes/recipe_harpers_full.py +++ b/src/calibre/web/feeds/recipes/recipe_harpers_full.py @@ -23,7 +23,8 @@ class Harpers_full(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False delay = 1 - language = _('English') + language = 'en' + needs_subscription = True INDEX = strftime('http://www.harpers.org/archive/%Y/%m') LOGIN = 'http://www.harpers.org' diff --git a/src/calibre/web/feeds/recipes/recipe_heise.py b/src/calibre/web/feeds/recipes/recipe_heise.py index 199bee4135..4c208792aa 100644 --- a/src/calibre/web/feeds/recipes/recipe_heise.py +++ b/src/calibre/web/feeds/recipes/recipe_heise.py @@ -13,7 +13,8 @@ class heiseDe(BasicNewsRecipe): title = 'heise' description = 'Computernews from Germany' __author__ = 'Oliver Niesner' - language = _('German') + language = 'de' + use_embedded_content = False timefmt = ' [%d %b %Y]' max_articles_per_feed = 40 diff --git a/src/calibre/web/feeds/recipes/recipe_hindu.py b/src/calibre/web/feeds/recipes/recipe_hindu.py index 073eb7afd1..3d51490662 100644 --- a/src/calibre/web/feeds/recipes/recipe_hindu.py +++ b/src/calibre/web/feeds/recipes/recipe_hindu.py @@ -7,7 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class TheHindu(BasicNewsRecipe): title = u'The Hindu' - language = _('English') + language = 'en' + oldest_article = 7 __author__ = _('Kovid Goyal') max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_hln.py b/src/calibre/web/feeds/recipes/recipe_hln.py index c2b6b2375a..ea54c654df 100644 --- a/src/calibre/web/feeds/recipes/recipe_hln.py +++ b/src/calibre/web/feeds/recipes/recipe_hln.py @@ -19,7 +19,8 @@ class HLN_be(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Dutch') + language = 'nl' + lang = 'nl-BE' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_hln_be.py b/src/calibre/web/feeds/recipes/recipe_hln_be.py index 9ba04585e2..1d38c72f9d 100644 --- a/src/calibre/web/feeds/recipes/recipe_hln_be.py +++ b/src/calibre/web/feeds/recipes/recipe_hln_be.py @@ -19,7 +19,8 @@ class HLN_be(BasicNewsRecipe): use_embedded_content = False no_stylesheets = True encoding = 'utf-8' - language = _('Dutch') + language = 'nl' + conversion_options = { 'comments' : description diff --git a/src/calibre/web/feeds/recipes/recipe_hna.py b/src/calibre/web/feeds/recipes/recipe_hna.py index 928d3f032b..e04837bd17 100644 --- a/src/calibre/web/feeds/recipes/recipe_hna.py +++ b/src/calibre/web/feeds/recipes/recipe_hna.py @@ -14,7 +14,8 @@ class hnaDe(BasicNewsRecipe): description = 'local news from Hessen/Germany' __author__ = 'Oliver Niesner' use_embedded_content = False - language = _('German') + language = 'de' + use_embedded_content = False timefmt = ' [%d %b %Y]' max_articles_per_feed = 40 diff --git a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py b/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py index d4f3e0a3ab..d3f6f64aa2 100644 --- a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py +++ b/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py @@ -15,7 +15,8 @@ class Honoluluadvertiser(BasicNewsRecipe): publisher = 'Honolulu Advertiser' category = 'news, Honolulu, Hawaii' oldest_article = 2 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_honvedelem.py b/src/calibre/web/feeds/recipes/recipe_honvedelem.py index 96ca29f5e9..f2cab5d640 100644 --- a/src/calibre/web/feeds/recipes/recipe_honvedelem.py +++ b/src/calibre/web/feeds/recipes/recipe_honvedelem.py @@ -13,7 +13,8 @@ class HunMilNews(BasicNewsRecipe): title = u'Honvedelem.hu' oldest_article = 3 description = u'Katonah\xedrek' - language = _('Hungarian') + language = 'hu' + lang = 'hu' encoding = 'windows-1250' category = 'news, military' diff --git a/src/calibre/web/feeds/recipes/recipe_hrt.py b/src/calibre/web/feeds/recipes/recipe_hrt.py index 9e8e60b945..4293fe3a39 100644 --- a/src/calibre/web/feeds/recipes/recipe_hrt.py +++ b/src/calibre/web/feeds/recipes/recipe_hrt.py @@ -20,7 +20,8 @@ class HRT(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _("Croatian") + language = 'hr' + lang = 'hr-HR' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_huntechnet.py b/src/calibre/web/feeds/recipes/recipe_huntechnet.py index 1468cc838e..3dea03ba34 100644 --- a/src/calibre/web/feeds/recipes/recipe_huntechnet.py +++ b/src/calibre/web/feeds/recipes/recipe_huntechnet.py @@ -12,7 +12,8 @@ class HunTechNet(BasicNewsRecipe): title = u'TechNet' oldest_article = 3 description = u'Az ut\xf3bbi 3 nap TechNet h\xedrei' - language = _('Hungarian') + language = 'hu' + lang = 'hu' encoding = 'utf-8' __author__ = 'Devilinside' diff --git a/src/calibre/web/feeds/recipes/recipe_iht.py b/src/calibre/web/feeds/recipes/recipe_iht.py index b81b11d579..040ff83927 100644 --- a/src/calibre/web/feeds/recipes/recipe_iht.py +++ b/src/calibre/web/feeds/recipes/recipe_iht.py @@ -12,7 +12,8 @@ from calibre.ptempfile import PersistentTemporaryFile class InternationalHeraldTribune(BasicNewsRecipe): title = u'The International Herald Tribune' __author__ = 'Derry FitzGerald' - language = _('English') + language = 'en' + oldest_article = 1 max_articles_per_feed = 10 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_index_hu.py b/src/calibre/web/feeds/recipes/recipe_index_hu.py index 8b36500e5c..e4b90d1d23 100644 --- a/src/calibre/web/feeds/recipes/recipe_index_hu.py +++ b/src/calibre/web/feeds/recipes/recipe_index_hu.py @@ -5,7 +5,8 @@ class Index(BasicNewsRecipe): title = u'INDEX.HU' oldest_article = 3 max_articles_per_feed = 50 - language = _('Hungarian') + language = 'hu' + __author__ = 'Ezmegaz' feeds = [(u'ALL', u'http://index.hu/24ora/rss/'), diff --git a/src/calibre/web/feeds/recipes/recipe_indy_star.py b/src/calibre/web/feeds/recipes/recipe_indy_star.py index 81efa77dbe..ebd6119900 100644 --- a/src/calibre/web/feeds/recipes/recipe_indy_star.py +++ b/src/calibre/web/feeds/recipes/recipe_indy_star.py @@ -3,7 +3,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class AdvancedUserRecipe1234144423(BasicNewsRecipe): title = u'Indianapolis Star' oldest_article = 5 - language = _('English') + language = 'en' + __author__ = 'Owen Kelly' max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_infobae.py b/src/calibre/web/feeds/recipes/recipe_infobae.py index b5c867b914..eb4fd78248 100644 --- a/src/calibre/web/feeds/recipes/recipe_infobae.py +++ b/src/calibre/web/feeds/recipes/recipe_infobae.py @@ -18,7 +18,8 @@ class Infobae(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False - language = _('Spanish') + language = 'es' + encoding = 'cp1252' cover_url = 'http://www.infobae.com/imgs/header/header.gif' remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_inquirer_net.py b/src/calibre/web/feeds/recipes/recipe_inquirer_net.py index 5a7109e6fb..dfe12568a1 100644 --- a/src/calibre/web/feeds/recipes/recipe_inquirer_net.py +++ b/src/calibre/web/feeds/recipes/recipe_inquirer_net.py @@ -21,7 +21,8 @@ class InquirerNet(BasicNewsRecipe): publisher = 'inquirer.net' category = 'news, politics, philipines' lang = 'en' - language = _('English') + language = 'en' + extra_css = ' .fontheadline{font-size: x-large} .fontsubheadline{font-size: large} .fontkick{font-size: medium}' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_intelligencer.py b/src/calibre/web/feeds/recipes/recipe_intelligencer.py index 1b588a68bf..e7162b22af 100644 --- a/src/calibre/web/feeds/recipes/recipe_intelligencer.py +++ b/src/calibre/web/feeds/recipes/recipe_intelligencer.py @@ -14,7 +14,8 @@ class Inteligencer(BasicNewsRecipe): oldest_article = 7 max_articles_per_feed = 100 encoding = 'utf-8' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False lang = 'en-CA' diff --git a/src/calibre/web/feeds/recipes/recipe_irish_times.py b/src/calibre/web/feeds/recipes/recipe_irish_times.py index 807af6baf5..c07a8ef8fd 100644 --- a/src/calibre/web/feeds/recipes/recipe_irish_times.py +++ b/src/calibre/web/feeds/recipes/recipe_irish_times.py @@ -10,7 +10,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class IrishTimes(BasicNewsRecipe): title = u'The Irish Times' __author__ = 'Derry FitzGerald and Ray Kinsella' - language = _('English') + language = 'en' + no_stylesheets = True simultaneous_downloads= 1 diff --git a/src/calibre/web/feeds/recipes/recipe_japan_times.py b/src/calibre/web/feeds/recipes/recipe_japan_times.py index 4a8c83a883..bb83b16f1e 100644 --- a/src/calibre/web/feeds/recipes/recipe_japan_times.py +++ b/src/calibre/web/feeds/recipes/recipe_japan_times.py @@ -12,7 +12,8 @@ class JapanTimes(BasicNewsRecipe): title = u'The Japan Times' __author__ = 'Darko Miletic' description = 'News from Japan' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_jb_online.py b/src/calibre/web/feeds/recipes/recipe_jb_online.py index c597615c43..5e97831143 100644 --- a/src/calibre/web/feeds/recipes/recipe_jb_online.py +++ b/src/calibre/web/feeds/recipes/recipe_jb_online.py @@ -44,4 +44,5 @@ class JBOnline(BasicNewsRecipe): del item['style'] return soup - language = _('Portuguese') + language = 'pt' + diff --git a/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py index b76018d87a..02f36394b8 100644 --- a/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py +++ b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py @@ -12,7 +12,8 @@ class Joelonsoftware(BasicNewsRecipe): title = 'Joel on Software' __author__ = 'Darko Miletic' description = 'Painless Software Management' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = True oldest_article = 60 diff --git a/src/calibre/web/feeds/recipes/recipe_jpost.py b/src/calibre/web/feeds/recipes/recipe_jpost.py index d8a00037d5..b4b7d19c3c 100644 --- a/src/calibre/web/feeds/recipes/recipe_jpost.py +++ b/src/calibre/web/feeds/recipes/recipe_jpost.py @@ -5,7 +5,8 @@ class JerusalemPost(BasicNewsRecipe): title = 'Jerusalem Post' description = 'News from Israel and the Middle East' use_embedded_content = False - language = _('English') + language = 'en' + __author__ = 'Kovid Goyal' max_articles_per_feed = 10 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_jutarnji.py b/src/calibre/web/feeds/recipes/recipe_jutarnji.py index 89164e801e..f2423a6705 100644 --- a/src/calibre/web/feeds/recipes/recipe_jutarnji.py +++ b/src/calibre/web/feeds/recipes/recipe_jutarnji.py @@ -19,7 +19,8 @@ class Jutarnji(BasicNewsRecipe): oldest_article = 2 max_articles_per_feed = 100 delay = 1 - language = _('Croatian') + language = 'hr' + no_stylesheets = True use_embedded_content = False encoding = 'cp1250' diff --git a/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py b/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py index bb8e645fbe..6a66232406 100644 --- a/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py +++ b/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py @@ -20,7 +20,8 @@ class Juventudrebelde(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'cp1252' - language = _('Spanish') + language = 'es' + cover_url = strftime('http://www.juventudrebelde.cu/UserFiles/File/impreso/iportada-%Y-%m-%d.jpg') remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py b/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py index 5bae2b6e9c..e1679f17d3 100644 --- a/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py +++ b/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py @@ -41,4 +41,5 @@ class Juventudrebelde_english(BasicNewsRecipe): del item['style'] return soup - language = _('English') \ No newline at end of file + language = 'en' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_kellog_faculty.py b/src/calibre/web/feeds/recipes/recipe_kellog_faculty.py index b66659382b..4c66892c7b 100644 --- a/src/calibre/web/feeds/recipes/recipe_kellog_faculty.py +++ b/src/calibre/web/feeds/recipes/recipe_kellog_faculty.py @@ -16,7 +16,8 @@ class KellogFaculty(BasicNewsRecipe): description = 'Blogs of the Kellog School of Management Faculty' no_stylesheets = True encoding = 'utf-8' - language = _('English') + language = 'en' + remove_tags_before = {'name':'h2'} remove_tags_after = {'class':'col-two-text'} diff --git a/src/calibre/web/feeds/recipes/recipe_kellog_insight.py b/src/calibre/web/feeds/recipes/recipe_kellog_insight.py index 9dcf4c7039..7a97e4cdd6 100644 --- a/src/calibre/web/feeds/recipes/recipe_kellog_insight.py +++ b/src/calibre/web/feeds/recipes/recipe_kellog_insight.py @@ -16,7 +16,8 @@ class KellogInsight(BasicNewsRecipe): description = 'Articles from the Kellog School of Management' no_stylesheets = True encoding = 'utf-8' - language = _('English') + language = 'en' + oldest_article = 60 remove_tags_before = {'name':'h1'} remove_tags_after = {'class':'col-two-text'} diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica.py b/src/calibre/web/feeds/recipes/recipe_krstarica.py index fb25ae8d84..1a8f43902f 100644 --- a/src/calibre/web/feeds/recipes/recipe_krstarica.py +++ b/src/calibre/web/feeds/recipes/recipe_krstarica.py @@ -20,7 +20,8 @@ class Krstarica(BasicNewsRecipe): use_embedded_content = False remove_javascript = True encoding = 'utf-8' - language = _('Serbian') + language = 'sr' + extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica_en.py b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py index e426e7d807..9c338bac4b 100644 --- a/src/calibre/web/feeds/recipes/recipe_krstarica_en.py +++ b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py @@ -20,7 +20,8 @@ class Krstarica_en(BasicNewsRecipe): use_embedded_content = False remove_javascript = True encoding = 'utf-8' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_la_cuarta.py b/src/calibre/web/feeds/recipes/recipe_la_cuarta.py index 17bc708245..b7ef42dda9 100644 --- a/src/calibre/web/feeds/recipes/recipe_la_cuarta.py +++ b/src/calibre/web/feeds/recipes/recipe_la_cuarta.py @@ -50,4 +50,5 @@ class LaCuarta(BasicNewsRecipe): feeds = [(u'Noticias', u'http://lacuarta.cl/app/rss?sc=TEFDVUFSVEE=')] - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_la_republica.py b/src/calibre/web/feeds/recipes/recipe_la_republica.py index 7c086d49e8..773def9e1a 100644 --- a/src/calibre/web/feeds/recipes/recipe_la_republica.py +++ b/src/calibre/web/feeds/recipes/recipe_la_republica.py @@ -3,7 +3,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class LaRepublica(BasicNewsRecipe): title = u'la Repubblica' oldest_article = 1 - language = _('Italian') + language = 'it' + author = 'Darko Miletic' max_articles_per_feed = 100 remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_la_segunda.py b/src/calibre/web/feeds/recipes/recipe_la_segunda.py index 5852e6ba9a..44af318376 100644 --- a/src/calibre/web/feeds/recipes/recipe_la_segunda.py +++ b/src/calibre/web/feeds/recipes/recipe_la_segunda.py @@ -21,7 +21,8 @@ class LaSegunda(BasicNewsRecipe): encoding = 'cp1252' cover_url = 'http://www.lasegunda.com/imagenes/logotipo_lasegunda_Oli.gif' remove_javascript = True - language = _('Spanish') + language = 'es' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_la_tercera.py b/src/calibre/web/feeds/recipes/recipe_la_tercera.py index a0a2f94ee3..b5657401e0 100644 --- a/src/calibre/web/feeds/recipes/recipe_la_tercera.py +++ b/src/calibre/web/feeds/recipes/recipe_la_tercera.py @@ -61,4 +61,5 @@ class LaTercera(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py b/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py index a99be8f955..678b6b53dd 100644 --- a/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py +++ b/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py @@ -19,7 +19,8 @@ class LaMujerDeMiVida(BasicNewsRecipe): encoding = 'cp1252' publisher = 'La Mujer de mi Vida' category = 'literatura, critica, arte, ensayos' - language = _('Spanish') + language = 'es' + INDEX = 'http://www.lamujerdemivida.com.ar/' html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_lanacion.py b/src/calibre/web/feeds/recipes/recipe_lanacion.py index 6675fc9b21..bbdc46849e 100644 --- a/src/calibre/web/feeds/recipes/recipe_lanacion.py +++ b/src/calibre/web/feeds/recipes/recipe_lanacion.py @@ -57,4 +57,5 @@ class Lanacion(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py b/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py index 8bd521df4b..2c2579b975 100644 --- a/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py +++ b/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py @@ -51,4 +51,5 @@ class LaNacionChile(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_laprensa.py b/src/calibre/web/feeds/recipes/recipe_laprensa.py index f2064c1f6b..eacc14ec47 100644 --- a/src/calibre/web/feeds/recipes/recipe_laprensa.py +++ b/src/calibre/web/feeds/recipes/recipe_laprensa.py @@ -57,4 +57,5 @@ class LaPrensa(BasicNewsRecipe): del item['style'] return soup - language = _('Spanish') \ No newline at end of file + language = 'es' + \ No newline at end of file diff --git a/src/calibre/web/feeds/recipes/recipe_laprensa_hn.py b/src/calibre/web/feeds/recipes/recipe_laprensa_hn.py index b34f158400..bea3966680 100644 --- a/src/calibre/web/feeds/recipes/recipe_laprensa_hn.py +++ b/src/calibre/web/feeds/recipes/recipe_laprensa_hn.py @@ -21,7 +21,8 @@ class LaPrensaHn(BasicNewsRecipe): no_stylesheets = True remove_javascript = True encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-HN' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py b/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py index c208640283..6ef20bdea3 100644 --- a/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py +++ b/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py @@ -22,7 +22,8 @@ class LaPrensa_ni(BasicNewsRecipe): use_embedded_content = False encoding = 'cp1252' remove_javascript = True - language = _('Spanish') + language = 'es' + months_es = ['enero','febrero','marzo','abril','mayo','junio','julio','agosto','septiembre','octubre','noviembre','diciembre'] current_month = months_es[datetime.date.today().month - 1] current_index = time.strftime("http://www.laprensa.com.ni/archivo/%Y/" + current_month + "/%d/noticias/") diff --git a/src/calibre/web/feeds/recipes/recipe_latimes.py b/src/calibre/web/feeds/recipes/recipe_latimes.py index a25684b5ab..f79bcea987 100644 --- a/src/calibre/web/feeds/recipes/recipe_latimes.py +++ b/src/calibre/web/feeds/recipes/recipe_latimes.py @@ -14,7 +14,8 @@ class LATimes(BasicNewsRecipe): description = u'News from Los Angeles' oldest_article = 7 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False encoding = 'utf-8' diff --git a/src/calibre/web/feeds/recipes/recipe_latribuna.py b/src/calibre/web/feeds/recipes/recipe_latribuna.py index d3a9a333cb..93a04eeb67 100644 --- a/src/calibre/web/feeds/recipes/recipe_latribuna.py +++ b/src/calibre/web/feeds/recipes/recipe_latribuna.py @@ -21,7 +21,8 @@ class LaTribuna(BasicNewsRecipe): no_stylesheets = True remove_javascript = True encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-HN' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_lavanguardia.py b/src/calibre/web/feeds/recipes/recipe_lavanguardia.py index 1daa2940ba..4d10b90b26 100644 --- a/src/calibre/web/feeds/recipes/recipe_lavanguardia.py +++ b/src/calibre/web/feeds/recipes/recipe_lavanguardia.py @@ -22,7 +22,8 @@ class LaVanguardia(BasicNewsRecipe): use_embedded_content = False delay = 1 encoding = 'cp1252' - language = _('Spanish') + language = 'es' + direction = 'ltr' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_le_monde.py b/src/calibre/web/feeds/recipes/recipe_le_monde.py index 0fc05b3aa5..cd49d4a6c4 100644 --- a/src/calibre/web/feeds/recipes/recipe_le_monde.py +++ b/src/calibre/web/feeds/recipes/recipe_le_monde.py @@ -16,7 +16,8 @@ class LeMonde(BasicNewsRecipe): __author__ = 'Mathieu Godlewski ' description = 'Global news in french' oldest_article = 3 - language = _('French') + language = 'fr' + max_articles_per_feed = 30 no_stylesheets = True cover_url='http://abonnes.lemonde.fr/titresdumonde/'+date.today().strftime("%y%m%d")+'/1.jpg' diff --git a/src/calibre/web/feeds/recipes/recipe_liberation.py b/src/calibre/web/feeds/recipes/recipe_liberation.py index 9eb1436b38..588392f116 100644 --- a/src/calibre/web/feeds/recipes/recipe_liberation.py +++ b/src/calibre/web/feeds/recipes/recipe_liberation.py @@ -12,7 +12,8 @@ class Liberation(BasicNewsRecipe): title = u'Liberation' __author__ = 'Darko Miletic' description = 'News from France' - language = _('French') + language = 'fr' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_linux_magazine.py b/src/calibre/web/feeds/recipes/recipe_linux_magazine.py index 1ce96f9d19..f71ec99e73 100644 --- a/src/calibre/web/feeds/recipes/recipe_linux_magazine.py +++ b/src/calibre/web/feeds/recipes/recipe_linux_magazine.py @@ -13,7 +13,8 @@ class LinuxMagazine(BasicNewsRecipe): title = u'Linux Magazine' __author__ = 'Darko Miletic' description = 'Linux news' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py index 4c32bad80c..cf4bfe6567 100644 --- a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py +++ b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py @@ -17,7 +17,8 @@ class LinuxDevices(BasicNewsRecipe): timefmt = ' [%a %d %b %Y]' max_articles_per_feed = 50 no_stylesheets = True - language = _('English') + language = 'en' + remove_javascript = True conversion_options = { 'linearize_tables' : True} encoding = 'latin1' diff --git a/src/calibre/web/feeds/recipes/recipe_livemint.py b/src/calibre/web/feeds/recipes/recipe_livemint.py index 2461dde404..6723a80451 100644 --- a/src/calibre/web/feeds/recipes/recipe_livemint.py +++ b/src/calibre/web/feeds/recipes/recipe_livemint.py @@ -14,7 +14,8 @@ class LiveMint(BasicNewsRecipe): description = 'The Wall Street Journal' publisher = 'The Wall Street Journal' category = 'news, games, adventure, technology' - language = _('English') + language = 'en' + oldest_article = 15 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_lrb.py b/src/calibre/web/feeds/recipes/recipe_lrb.py index bec6799ffe..ea89fcd653 100644 --- a/src/calibre/web/feeds/recipes/recipe_lrb.py +++ b/src/calibre/web/feeds/recipes/recipe_lrb.py @@ -14,7 +14,8 @@ 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 = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False encoding = 'cp1252' diff --git a/src/calibre/web/feeds/recipes/recipe_marca.py b/src/calibre/web/feeds/recipes/recipe_marca.py index 2920afeb6d..47fcc64d78 100644 --- a/src/calibre/web/feeds/recipes/recipe_marca.py +++ b/src/calibre/web/feeds/recipes/recipe_marca.py @@ -22,7 +22,8 @@ class Marca(BasicNewsRecipe): use_embedded_content = False delay = 1 encoding = 'iso-8859-15' - language = _('Spanish') + language = 'es' + direction = 'ltr' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_mediapart.py b/src/calibre/web/feeds/recipes/recipe_mediapart.py index 60dc893834..7f4a5a821a 100644 --- a/src/calibre/web/feeds/recipes/recipe_mediapart.py +++ b/src/calibre/web/feeds/recipes/recipe_mediapart.py @@ -16,7 +16,8 @@ class Mediapart(BasicNewsRecipe): __author__ = 'Mathieu Godlewski ' description = 'Global news in french from online newspapers' oldest_article = 7 - language = _('French') + language = 'fr' + max_articles_per_feed = 50 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_miami_herald.py b/src/calibre/web/feeds/recipes/recipe_miami_herald.py index c97e556428..2f6ce9ee02 100644 --- a/src/calibre/web/feeds/recipes/recipe_miami_herald.py +++ b/src/calibre/web/feeds/recipes/recipe_miami_herald.py @@ -16,7 +16,8 @@ class TheMiamiHerald(BasicNewsRecipe): max_articles_per_feed = 100 publisher = u'The Miami Herald' category = u'miami herald, weather, dolphins, news, miami news, local news, miamiherald, miami newspaper, miamiherald.com, miami, the miami herald, broward, miami-dade' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False encoding = 'cp1252' diff --git a/src/calibre/web/feeds/recipes/recipe_miradasalsur.py b/src/calibre/web/feeds/recipes/recipe_miradasalsur.py index fa8f8a753d..688283a88f 100644 --- a/src/calibre/web/feeds/recipes/recipe_miradasalsur.py +++ b/src/calibre/web/feeds/recipes/recipe_miradasalsur.py @@ -20,7 +20,8 @@ class MiradasAlSur(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/123/Miradas-al-Sur.html' diff --git a/src/calibre/web/feeds/recipes/recipe_mondedurable.py b/src/calibre/web/feeds/recipes/recipe_mondedurable.py index 99d2cf379d..998b4f929a 100644 --- a/src/calibre/web/feeds/recipes/recipe_mondedurable.py +++ b/src/calibre/web/feeds/recipes/recipe_mondedurable.py @@ -10,7 +10,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class AdventureGamers(BasicNewsRecipe): title = 'Monde durable' - language = _('French') + language = 'fr' + __author__ = 'Darko Miletic' description = 'science news' publisher = 'Monde durable' diff --git a/src/calibre/web/feeds/recipes/recipe_moneynews.py b/src/calibre/web/feeds/recipes/recipe_moneynews.py index 46f494f27e..7b13b6dac1 100644 --- a/src/calibre/web/feeds/recipes/recipe_moneynews.py +++ b/src/calibre/web/feeds/recipes/recipe_moneynews.py @@ -13,7 +13,8 @@ class MoneyNews(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'Financial news worldwide' publisher = 'moneynews.com' - language = _('English') + language = 'en' + category = 'news, finances, USA, business' oldest_article = 2 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_monitor.py b/src/calibre/web/feeds/recipes/recipe_monitor.py index c34a925c98..e815aea0f9 100644 --- a/src/calibre/web/feeds/recipes/recipe_monitor.py +++ b/src/calibre/web/feeds/recipes/recipe_monitor.py @@ -22,7 +22,8 @@ class MonitorCG(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Montenegrin') + language = 'sr' + lang ='sr-Latn-Me' INDEX = 'http://www.monitorcg.com' diff --git a/src/calibre/web/feeds/recipes/recipe_moscow_times.py b/src/calibre/web/feeds/recipes/recipe_moscow_times.py index e16d99284f..93dcb3d226 100644 --- a/src/calibre/web/feeds/recipes/recipe_moscow_times.py +++ b/src/calibre/web/feeds/recipes/recipe_moscow_times.py @@ -12,7 +12,8 @@ class Moscowtimes(BasicNewsRecipe): title = u'The Moscow Times' __author__ = 'Darko Miletic' description = 'News from Russia' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py b/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py index 09813c1a70..c734c16003 100644 --- a/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py +++ b/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py @@ -20,7 +20,8 @@ class MSDNMagazine_en(BasicNewsRecipe): encoding = 'utf-8' remove_javascript = True current_issue = 'http://msdn.microsoft.com/en-us/magazine/default.aspx' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_nacional_cro.py b/src/calibre/web/feeds/recipes/recipe_nacional_cro.py index 70156b8766..6f42e15665 100644 --- a/src/calibre/web/feeds/recipes/recipe_nacional_cro.py +++ b/src/calibre/web/feeds/recipes/recipe_nacional_cro.py @@ -23,7 +23,8 @@ class NacionalCro(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Croatian') + language = 'hr' + lang = 'hr-HR' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_nasa.py b/src/calibre/web/feeds/recipes/recipe_nasa.py index 174750e972..88b35b1a98 100644 --- a/src/calibre/web/feeds/recipes/recipe_nasa.py +++ b/src/calibre/web/feeds/recipes/recipe_nasa.py @@ -31,7 +31,8 @@ class NASA(BasicNewsRecipe): title = 'NASA' timefmt = ' [%Y%b%d %H%M]' - language = _('English') + language = 'en' + description = 'News from NASA' __author__ = 'Scott Wxby & David Chen' no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_new_scientist.py b/src/calibre/web/feeds/recipes/recipe_new_scientist.py index acd98a8c6e..f795d88bea 100644 --- a/src/calibre/web/feeds/recipes/recipe_new_scientist.py +++ b/src/calibre/web/feeds/recipes/recipe_new_scientist.py @@ -12,7 +12,8 @@ class NewScientist(BasicNewsRecipe): title = 'New Scientist - Online News' __author__ = 'Darko Miletic' description = 'Science news and science articles from New Scientist.' - language = _('English') + language = 'en' + publisher = 'New Scientist' category = 'science news, science articles, science jobs, drugs, cancer, depression, computer software, sex' delay = 3 diff --git a/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py index 6846b64521..8217cb2f27 100644 --- a/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py +++ b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py @@ -15,7 +15,8 @@ class NewYorkReviewOfBooks(BasicNewsRecipe): title = u'New York Review of Books' description = u'Book reviews' - language = _('English') + language = 'en' + __author__ = 'Kovid Goyal' needs_subscription = True remove_tags_before = {'id':'container'} diff --git a/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py index d4aeba3537..edac91e3b5 100644 --- a/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py +++ b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py @@ -15,7 +15,8 @@ class NewYorkReviewOfBooks(BasicNewsRecipe): title = u'New York Review of Books (no subscription)' description = u'Book reviews' - language = _('English') + language = 'en' + __author__ = 'Kovid Goyal' remove_tags_before = {'id':'container'} remove_tags = [{'class':['noprint', 'ad', 'footer']}, {'id':'right-content'}] diff --git a/src/calibre/web/feeds/recipes/recipe_new_yorker.py b/src/calibre/web/feeds/recipes/recipe_new_yorker.py index 9a737b7aa5..69aac34499 100644 --- a/src/calibre/web/feeds/recipes/recipe_new_yorker.py +++ b/src/calibre/web/feeds/recipes/recipe_new_yorker.py @@ -14,7 +14,8 @@ class NewYorker(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'The best of US journalism' oldest_article = 15 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_news_times.py b/src/calibre/web/feeds/recipes/recipe_news_times.py index 3fee33c028..83b49df7e9 100644 --- a/src/calibre/web/feeds/recipes/recipe_news_times.py +++ b/src/calibre/web/feeds/recipes/recipe_news_times.py @@ -4,7 +4,8 @@ class NewsTimes(BasicNewsRecipe): title = 'Newstimes' __author__ = 'Darko Miletic' description = 'news from USA' - language = _('English') + language = 'en' + oldest_article = 1 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_newsweek.py b/src/calibre/web/feeds/recipes/recipe_newsweek.py index b0e86e8adb..f6c5e85a9e 100644 --- a/src/calibre/web/feeds/recipes/recipe_newsweek.py +++ b/src/calibre/web/feeds/recipes/recipe_newsweek.py @@ -27,7 +27,8 @@ class Newsweek(BasicNewsRecipe): .photoCaption{color:#0A0A09;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;font-weight:bold;}''' encoding = 'utf-8' - language = _('English') + language = 'en' + remove_tags = [ {'class':['fwArticle noHr','fwArticle','subinfo','hdlBulletItem','head-content','navbar','link', 'ad', 'sponsorLinksArticle', 'mm-content', 'inline-social-links-wrapper', 'email-article', diff --git a/src/calibre/web/feeds/recipes/recipe_newsweek_argentina.py b/src/calibre/web/feeds/recipes/recipe_newsweek_argentina.py index 5c1c867a51..7d935aded4 100644 --- a/src/calibre/web/feeds/recipes/recipe_newsweek_argentina.py +++ b/src/calibre/web/feeds/recipes/recipe_newsweek_argentina.py @@ -20,7 +20,8 @@ class Newsweek_Argentina(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/126/Newsweek.html' diff --git a/src/calibre/web/feeds/recipes/recipe_nin.py b/src/calibre/web/feeds/recipes/recipe_nin.py index f7492cffce..9f3c96d883 100644 --- a/src/calibre/web/feeds/recipes/recipe_nin.py +++ b/src/calibre/web/feeds/recipes/recipe_nin.py @@ -27,7 +27,8 @@ class Nin(BasicNewsRecipe): LOGIN = PREFIX + '/?logout=true' FEED = PREFIX + '/misc/rss.php?feed=RSS2.0' use_embedded_content = False - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif} .artTitle{font-size: x-large; font-weight: bold} .columnhead{font-size: small; font-weight: bold}' diff --git a/src/calibre/web/feeds/recipes/recipe_noaa.py b/src/calibre/web/feeds/recipes/recipe_noaa.py index bdc1b46ad1..6e3ee7aaa7 100644 --- a/src/calibre/web/feeds/recipes/recipe_noaa.py +++ b/src/calibre/web/feeds/recipes/recipe_noaa.py @@ -22,7 +22,8 @@ class NOAA(BasicNewsRecipe): simultaneous_downloads = 1 encoding = 'utf-8' lang = 'en-US' - language = _('English') + language = 'en' + remove_tags = [dict(name=['embed','object'])] diff --git a/src/calibre/web/feeds/recipes/recipe_novosti.py b/src/calibre/web/feeds/recipes/recipe_novosti.py index 165a04329a..32e235abdb 100644 --- a/src/calibre/web/feeds/recipes/recipe_novosti.py +++ b/src/calibre/web/feeds/recipes/recipe_novosti.py @@ -21,7 +21,8 @@ class Novosti(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_nspm.py b/src/calibre/web/feeds/recipes/recipe_nspm.py index f90e971c37..8b94938893 100644 --- a/src/calibre/web/feeds/recipes/recipe_nspm.py +++ b/src/calibre/web/feeds/recipes/recipe_nspm.py @@ -22,7 +22,8 @@ class Nspm(BasicNewsRecipe): use_embedded_content = False INDEX = 'http://www.nspm.rs/?alphabet=l' encoding = 'utf-8' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{text-align: justify; font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_nspm_int.py b/src/calibre/web/feeds/recipes/recipe_nspm_int.py index ef5aae883a..14c8b5a4de 100644 --- a/src/calibre/web/feeds/recipes/recipe_nspm_int.py +++ b/src/calibre/web/feeds/recipes/recipe_nspm_int.py @@ -14,7 +14,8 @@ class Nspm_int(BasicNewsRecipe): description = 'Magazine dedicated to political theory and sociological research' oldest_article = 20 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False INDEX = 'http://www.nspm.rs/?alphabet=l' diff --git a/src/calibre/web/feeds/recipes/recipe_nytimes.py b/src/calibre/web/feeds/recipes/recipe_nytimes.py index d57bd6594c..d3381dabb2 100644 --- a/src/calibre/web/feeds/recipes/recipe_nytimes.py +++ b/src/calibre/web/feeds/recipes/recipe_nytimes.py @@ -14,7 +14,8 @@ class NYTimes(BasicNewsRecipe): title = 'New York Times Top Stories' __author__ = 'GRiker' - language = _('English') + language = 'en' + description = 'Top Stories from the New York Times' # List of sections typically included in Top Stories. Use a keyword from the diff --git a/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py b/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py index b558d688a4..07db16daa4 100644 --- a/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py +++ b/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py @@ -14,7 +14,8 @@ class NYTimes(BasicNewsRecipe): title = 'The New York Times (subscription)' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + description = 'Daily news from the New York Times (subscription version)' timefmt = '' needs_subscription = True diff --git a/src/calibre/web/feeds/recipes/recipe_nzz_ger.py b/src/calibre/web/feeds/recipes/recipe_nzz_ger.py index cdd23064bb..d501339f04 100644 --- a/src/calibre/web/feeds/recipes/recipe_nzz_ger.py +++ b/src/calibre/web/feeds/recipes/recipe_nzz_ger.py @@ -21,7 +21,8 @@ class Nzz(BasicNewsRecipe): encoding = 'utf-8' use_embedded_content = False lang = 'de-CH' - language = _('German') + language = 'de' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_o_globo.py b/src/calibre/web/feeds/recipes/recipe_o_globo.py index 3bf2a98779..ad785a26aa 100644 --- a/src/calibre/web/feeds/recipes/recipe_o_globo.py +++ b/src/calibre/web/feeds/recipes/recipe_o_globo.py @@ -66,4 +66,5 @@ class OGlobo(BasicNewsRecipe): del item['style'] return soup - language = _('Portuguese') + language = 'pt' + diff --git a/src/calibre/web/feeds/recipes/recipe_ourdailybread.py b/src/calibre/web/feeds/recipes/recipe_ourdailybread.py index 12e3528af8..578123553d 100644 --- a/src/calibre/web/feeds/recipes/recipe_ourdailybread.py +++ b/src/calibre/web/feeds/recipes/recipe_ourdailybread.py @@ -13,7 +13,8 @@ class OurDailyBread(BasicNewsRecipe): __author__ = 'Darko Miletic' description = 'Religion' oldest_article = 15 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_outlook_india.py b/src/calibre/web/feeds/recipes/recipe_outlook_india.py index e931c89b4a..86e1985fc3 100644 --- a/src/calibre/web/feeds/recipes/recipe_outlook_india.py +++ b/src/calibre/web/feeds/recipes/recipe_outlook_india.py @@ -14,7 +14,8 @@ class OutlookIndia(BasicNewsRecipe): description = 'Weekly news and current affairs in India' no_stylesheets = True encoding = 'utf-8' - language = _('English') + language = 'en' + recursions = 1 extra_css = ''' body{font-family:Arial,Helvetica,sans-serif; font-size:xx-small;} diff --git a/src/calibre/web/feeds/recipes/recipe_pagina12.py b/src/calibre/web/feeds/recipes/recipe_pagina12.py index e0836a14c6..40ede54e40 100644 --- a/src/calibre/web/feeds/recipes/recipe_pagina12.py +++ b/src/calibre/web/feeds/recipes/recipe_pagina12.py @@ -22,7 +22,8 @@ class Pagina12(BasicNewsRecipe): cover_url = strftime('http://www.pagina12.com.ar/fotos/%Y%m%d/diario/tapagn.jpg') remove_javascript = True use_embedded_content = False - language = _('Spanish') + language = 'es' + html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_pcworld_hu.py b/src/calibre/web/feeds/recipes/recipe_pcworld_hu.py index ad1f1df72a..76b7190c8b 100644 --- a/src/calibre/web/feeds/recipes/recipe_pcworld_hu.py +++ b/src/calibre/web/feeds/recipes/recipe_pcworld_hu.py @@ -14,7 +14,8 @@ class Index(BasicNewsRecipe): title = u'PCWORLD.HU' oldest_article = 3 max_articles_per_feed = 50 - language = _('Hungarian') + language = 'hu' + __author__ = 'Ezmegaz' diff --git a/src/calibre/web/feeds/recipes/recipe_pescanik.py b/src/calibre/web/feeds/recipes/recipe_pescanik.py index adc4d67a8e..2c0a261f54 100644 --- a/src/calibre/web/feeds/recipes/recipe_pescanik.py +++ b/src/calibre/web/feeds/recipes/recipe_pescanik.py @@ -21,7 +21,8 @@ class Pescanik(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif} .contentheading{font-size: x-large; font-weight: bold} .small{font-size: small} .createdate{font-size: x-small; font-weight: bold}' diff --git a/src/calibre/web/feeds/recipes/recipe_phd_comics.py b/src/calibre/web/feeds/recipes/recipe_phd_comics.py index 4bf8772064..a1be31385b 100644 --- a/src/calibre/web/feeds/recipes/recipe_phd_comics.py +++ b/src/calibre/web/feeds/recipes/recipe_phd_comics.py @@ -13,7 +13,8 @@ class PHDComics(BasicNewsRecipe): title = u'PHD Comics' oldest_article = 14 max_articles_per_feed = 100 - language = _('English') + language = 'en' + __author__ = 'Rafardeon' feeds = [(u'PHD Comics', u'http://www.phdcomics.com/gradfeed.php')] diff --git a/src/calibre/web/feeds/recipes/recipe_physics_today.py b/src/calibre/web/feeds/recipes/recipe_physics_today.py index d2250ca253..ed5c19cca0 100644 --- a/src/calibre/web/feeds/recipes/recipe_physics_today.py +++ b/src/calibre/web/feeds/recipes/recipe_physics_today.py @@ -8,7 +8,8 @@ class Physicstoday(BasicNewsRecipe): description = u'Physics Today magazine' publisher = 'American Institute of Physics' category = 'Physics' - language = _('English') + language = 'en' + cover_url = strftime('http://ptonline.aip.org/journals/doc/PHTOAD-home/jrnls/images/medcover%m_%Y.jpg') oldest_article = 30 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_physics_world.py b/src/calibre/web/feeds/recipes/recipe_physics_world.py index 56ed2460c1..6420614b1c 100644 --- a/src/calibre/web/feeds/recipes/recipe_physics_world.py +++ b/src/calibre/web/feeds/recipes/recipe_physics_world.py @@ -5,7 +5,8 @@ class PhysicsWorld(BasicNewsRecipe): title = u'Physicsworld' description = 'News from the world of physics' __author__ = 'Hypernova' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_pobjeda.py b/src/calibre/web/feeds/recipes/recipe_pobjeda.py index 6ecc048d2c..452c7cac95 100644 --- a/src/calibre/web/feeds/recipes/recipe_pobjeda.py +++ b/src/calibre/web/feeds/recipes/recipe_pobjeda.py @@ -21,7 +21,8 @@ class Pobjeda(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Montenegrin') + language = 'sr' + lang = 'sr-Latn-Me' INDEX = u'http://www.pobjeda.co.me' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_politico.py b/src/calibre/web/feeds/recipes/recipe_politico.py index 94980d0cb2..f58c109b57 100644 --- a/src/calibre/web/feeds/recipes/recipe_politico.py +++ b/src/calibre/web/feeds/recipes/recipe_politico.py @@ -20,7 +20,8 @@ class Politico(BasicNewsRecipe): no_stylesheets = True remove_javascript = True encoding = 'cp1252' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_politika.py b/src/calibre/web/feeds/recipes/recipe_politika.py index 2015271ca4..be6caf884a 100644 --- a/src/calibre/web/feeds/recipes/recipe_politika.py +++ b/src/calibre/web/feeds/recipes/recipe_politika.py @@ -21,7 +21,8 @@ class Politika(BasicNewsRecipe): use_embedded_content = False remove_javascript = True encoding = 'utf8' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_portfolio.py b/src/calibre/web/feeds/recipes/recipe_portfolio.py index 83fd665157..1a69e99b3a 100644 --- a/src/calibre/web/feeds/recipes/recipe_portfolio.py +++ b/src/calibre/web/feeds/recipes/recipe_portfolio.py @@ -13,7 +13,8 @@ class Portfolio(BasicNewsRecipe): title = 'Portfolio' __author__ = 'JTravers' description = 'Conde Nast Portfolio: For the businessman.' - language = _('English') + language = 'en' + use_embedded_content = True timefmt = ' [%a, %b %d, %Y]' html2lrf_options = ['--ignore-tables'] diff --git a/src/calibre/web/feeds/recipes/recipe_pressonline.py b/src/calibre/web/feeds/recipes/recipe_pressonline.py index 184e80a24f..700887c9e6 100644 --- a/src/calibre/web/feeds/recipes/recipe_pressonline.py +++ b/src/calibre/web/feeds/recipes/recipe_pressonline.py @@ -22,7 +22,8 @@ class PressOnline(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = True - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_publico.py b/src/calibre/web/feeds/recipes/recipe_publico.py index a3406ec83f..c5fbcde53b 100644 --- a/src/calibre/web/feeds/recipes/recipe_publico.py +++ b/src/calibre/web/feeds/recipes/recipe_publico.py @@ -17,7 +17,8 @@ class Publico(BasicNewsRecipe): max_articles_per_feed = 30 encoding='utf-8' no_stylesheets = True - language = _('Portuguese') + language = 'pt' + preprocess_regexps = [(re.compile(u"\uFFFD", re.DOTALL|re.IGNORECASE), lambda match: ''),] feeds = [ diff --git a/src/calibre/web/feeds/recipes/recipe_republika.py b/src/calibre/web/feeds/recipes/recipe_republika.py index 65577c9119..48184bde59 100644 --- a/src/calibre/web/feeds/recipes/recipe_republika.py +++ b/src/calibre/web/feeds/recipes/recipe_republika.py @@ -16,7 +16,8 @@ class Republika(BasicNewsRecipe): description = 'Glasilo gradjanskog samooslobadjanja. Protiv stihije straha, mrznje i nasilja' publisher = ' Zadruga Res Publica' category = 'news, politics, Serbia' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' oldest_article = 2 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_reuters.py b/src/calibre/web/feeds/recipes/recipe_reuters.py index 3a2d4d6de7..d64099ce8e 100644 --- a/src/calibre/web/feeds/recipes/recipe_reuters.py +++ b/src/calibre/web/feeds/recipes/recipe_reuters.py @@ -9,7 +9,8 @@ class Reuters(BasicNewsRecipe): description = 'Global news' __author__ = 'Kovid Goyal' use_embedded_content = False - language = _('English') + language = 'en' + max_articles_per_feed = 10 diff --git a/src/calibre/web/feeds/recipes/recipe_rga.py b/src/calibre/web/feeds/recipes/recipe_rga.py index 47ae2f4614..42e8eb3d47 100644 --- a/src/calibre/web/feeds/recipes/recipe_rga.py +++ b/src/calibre/web/feeds/recipes/recipe_rga.py @@ -16,7 +16,8 @@ class rga_onliner(BasicNewsRecipe): category = 'Nachrichten, RGA' oldest_article = 3 max_articles_per_feed = 100 - language = _('German') + language = 'de' + lang = 'de-DE' no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_rts.py b/src/calibre/web/feeds/recipes/recipe_rts.py index ebde793723..f4547f4d1c 100644 --- a/src/calibre/web/feeds/recipes/recipe_rts.py +++ b/src/calibre/web/feeds/recipes/recipe_rts.py @@ -20,7 +20,8 @@ class RTS(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = True - language = _("Serbian") + language = 'sr' + lang = 'sr-Latn-RS' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py b/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py index 148383b496..5649da9bf8 100644 --- a/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py +++ b/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py @@ -12,7 +12,8 @@ class SanFranciscoChronicle(BasicNewsRecipe): title = u'San Francisco Chronicle' __author__ = u'Darko Miletic' description = u'San Francisco news' - language = _('English') + language = 'en' + oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_science_aas.py b/src/calibre/web/feeds/recipes/recipe_science_aas.py index 2b0c706a0d..092db8665e 100644 --- a/src/calibre/web/feeds/recipes/recipe_science_aas.py +++ b/src/calibre/web/feeds/recipes/recipe_science_aas.py @@ -10,7 +10,8 @@ from calibre.web.feeds.news import BasicNewsRecipe class ScienceAAS(BasicNewsRecipe): title = u'Science AAAS' __author__ = u'Darko Miletic' - language = _('English') + language = 'en' + description = u'The best in science news, commentary, and research' oldest_article = 7 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_science_news.py b/src/calibre/web/feeds/recipes/recipe_science_news.py index 8828ef9b22..b5867ef837 100644 --- a/src/calibre/web/feeds/recipes/recipe_science_news.py +++ b/src/calibre/web/feeds/recipes/recipe_science_news.py @@ -12,7 +12,8 @@ class Sciencenews(BasicNewsRecipe): __author__ = u'Darko Miletic' description = u"Science News is an award-winning weekly newsmagazine covering the most important research in all fields of science. Its 16 pages each week are packed with short, accurate articles that appeal to both general readers and scientists. Published since 1922, the magazine now reaches about 150,000 subscribers and more than 1 million readers. These are the latest News Items from Science News." oldest_article = 30 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_sciencedaily.py b/src/calibre/web/feeds/recipes/recipe_sciencedaily.py index 15293a12e3..18f8c69478 100644 --- a/src/calibre/web/feeds/recipes/recipe_sciencedaily.py +++ b/src/calibre/web/feeds/recipes/recipe_sciencedaily.py @@ -12,7 +12,8 @@ class ScienceDaily(BasicNewsRecipe): __author__ = u'Darko Miletic' description = u"Breaking science news and articles on global warming, extrasolar planets, stem cells, bird flu, autism, nanotechnology, dinosaurs, evolution -- the latest discoveries in astronomy, anthropology, biology, chemistry, climate & environment, computers, engineering, health & medicine, math, physics, psychology, technology, and more -- from the world's leading universities and research organizations." oldest_article = 7 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_scientific_american.py b/src/calibre/web/feeds/recipes/recipe_scientific_american.py index 1a03591672..89968d8b38 100644 --- a/src/calibre/web/feeds/recipes/recipe_scientific_american.py +++ b/src/calibre/web/feeds/recipes/recipe_scientific_american.py @@ -13,7 +13,8 @@ class ScientificAmerican(BasicNewsRecipe): title = u'Scientific American' description = u'Popular science. Monthly magazine.' __author__ = 'Kovid Goyal and Sujata Raman' - language = _('English') + language = 'en' + oldest_article = 30 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py b/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py index 968868cf8a..0f1301706e 100644 --- a/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py +++ b/src/calibre/web/feeds/recipes/recipe_scott_hanselman.py @@ -15,7 +15,8 @@ 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') + language = 'en' + oldest_article = 30 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_seattle_times.py b/src/calibre/web/feeds/recipes/recipe_seattle_times.py index 695a82b5b4..103b159491 100644 --- a/src/calibre/web/feeds/recipes/recipe_seattle_times.py +++ b/src/calibre/web/feeds/recipes/recipe_seattle_times.py @@ -19,7 +19,8 @@ class SeattleTimes(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'cp1252' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment' , description diff --git a/src/calibre/web/feeds/recipes/recipe_security_watch.py b/src/calibre/web/feeds/recipes/recipe_security_watch.py index b449b25f37..cae37e6727 100644 --- a/src/calibre/web/feeds/recipes/recipe_security_watch.py +++ b/src/calibre/web/feeds/recipes/recipe_security_watch.py @@ -12,7 +12,8 @@ class SecurityWatch(BasicNewsRecipe): filter_regexps = [r'feedads\.googleadservices\.com'] filter_regexps = [r'ad\.doubleclick'] filter_regexps = [r'advert'] - language = _('English') + language = 'en' + extra_css = 'div {text-align:left}' remove_tags = [dict(id='topBannerContainer'), diff --git a/src/calibre/web/feeds/recipes/recipe_shacknews.py b/src/calibre/web/feeds/recipes/recipe_shacknews.py index 7006bc8a7f..01169fb2b4 100644 --- a/src/calibre/web/feeds/recipes/recipe_shacknews.py +++ b/src/calibre/web/feeds/recipes/recipe_shacknews.py @@ -7,7 +7,8 @@ class Shacknews(BasicNewsRecipe): title = u'Shacknews' oldest_article = 7 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True remove_tags = [dict(name='div', attrs={'class': ['nuggets', 'comments']}), dict(name='p', attrs={'class': 'videoembed'})] diff --git a/src/calibre/web/feeds/recipes/recipe_slashdot.py b/src/calibre/web/feeds/recipes/recipe_slashdot.py index 973342759d..490a9ea068 100644 --- a/src/calibre/web/feeds/recipes/recipe_slashdot.py +++ b/src/calibre/web/feeds/recipes/recipe_slashdot.py @@ -11,7 +11,8 @@ class Slashdot(BasicNewsRecipe): title = u'Slashdot.org' oldest_article = 7 max_articles_per_feed = 100 - language = _('English') + language = 'en' + __author__ = 'floweros edited by Huan T' no_stylesheets = True # keep_only_tags = [ diff --git a/src/calibre/web/feeds/recipes/recipe_slate.py b/src/calibre/web/feeds/recipes/recipe_slate.py index 09c6c2fa5a..fe5b91617b 100644 --- a/src/calibre/web/feeds/recipes/recipe_slate.py +++ b/src/calibre/web/feeds/recipes/recipe_slate.py @@ -26,7 +26,8 @@ class PeriodicalNameHere(BasicNewsRecipe): feeds = None no_stylesheets = True encoding = None - language = _('English') + language = 'en' + diff --git a/src/calibre/web/feeds/recipes/recipe_smh.py b/src/calibre/web/feeds/recipes/recipe_smh.py index f330cc9d8a..4b4d5dd047 100644 --- a/src/calibre/web/feeds/recipes/recipe_smh.py +++ b/src/calibre/web/feeds/recipes/recipe_smh.py @@ -16,7 +16,8 @@ class SMH(BasicNewsRecipe): title = 'Sydney Morning Herald' description = 'Business News, World News and Breaking News in Australia' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + def get_browser(self): br = BasicNewsRecipe.get_browser() diff --git a/src/calibre/web/feeds/recipes/recipe_soldiers.py b/src/calibre/web/feeds/recipes/recipe_soldiers.py index dfaa070928..dbd9952caf 100644 --- a/src/calibre/web/feeds/recipes/recipe_soldiers.py +++ b/src/calibre/web/feeds/recipes/recipe_soldiers.py @@ -23,7 +23,8 @@ class Soldiers(BasicNewsRecipe): encoding = 'utf-8' publisher = 'U.S. Army' category = 'news, politics, war, weapons' - language = _('English') + language = 'en' + INDEX = 'http://www.army.mil/soldiers/' html2lrf_options = [ diff --git a/src/calibre/web/feeds/recipes/recipe_spiegel_int.py b/src/calibre/web/feeds/recipes/recipe_spiegel_int.py index 0040c76f98..ec9dcb6b60 100644 --- a/src/calibre/web/feeds/recipes/recipe_spiegel_int.py +++ b/src/calibre/web/feeds/recipes/recipe_spiegel_int.py @@ -14,7 +14,8 @@ class Spiegel_int(BasicNewsRecipe): description = "News and POV from Europe's largest newsmagazine" oldest_article = 7 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False publisher = 'SPIEGEL ONLINE GmbH' diff --git a/src/calibre/web/feeds/recipes/recipe_spiegelde.py b/src/calibre/web/feeds/recipes/recipe_spiegelde.py index f2952be983..d19111623e 100644 --- a/src/calibre/web/feeds/recipes/recipe_spiegelde.py +++ b/src/calibre/web/feeds/recipes/recipe_spiegelde.py @@ -17,7 +17,8 @@ class Spiegel_ger(BasicNewsRecipe): category = 'SPIEGEL ONLINE, DER SPIEGEL, Nachrichten, News,Dienste, RSS, RSS, Feedreader, Newsfeed, iGoogle, Netvibes, Widget' oldest_article = 7 max_articles_per_feed = 100 - language = _('German') + language = 'de' + lang = 'de-DE' no_stylesheets = True use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py b/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py index cc023448c7..1b47706768 100644 --- a/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py +++ b/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py @@ -20,7 +20,8 @@ class PetersburgTimes(BasicNewsRecipe): remove_javascript = True encoding = 'cp1251' use_embedded_content = False - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_stackoverflow.py b/src/calibre/web/feeds/recipes/recipe_stackoverflow.py index bec58e0e20..4ebfa502e8 100644 --- a/src/calibre/web/feeds/recipes/recipe_stackoverflow.py +++ b/src/calibre/web/feeds/recipes/recipe_stackoverflow.py @@ -15,7 +15,8 @@ class StackOverflowBlog(BasicNewsRecipe): category = 'blog, programming' publisher = 'StackOverflow team' oldest_article = 30 - language = _('English') + language = 'en' + max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = True diff --git a/src/calibre/web/feeds/recipes/recipe_starbulletin.py b/src/calibre/web/feeds/recipes/recipe_starbulletin.py index 4fc9e51a8c..7cc9f47e4f 100644 --- a/src/calibre/web/feeds/recipes/recipe_starbulletin.py +++ b/src/calibre/web/feeds/recipes/recipe_starbulletin.py @@ -16,7 +16,8 @@ class Starbulletin(BasicNewsRecipe): category = 'news, Honolulu, Hawaii' oldest_article = 2 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False encoding = 'utf8' diff --git a/src/calibre/web/feeds/recipes/recipe_straitstimes.py b/src/calibre/web/feeds/recipes/recipe_straitstimes.py index 45caec4d87..ff03ac9687 100644 --- a/src/calibre/web/feeds/recipes/recipe_straitstimes.py +++ b/src/calibre/web/feeds/recipes/recipe_straitstimes.py @@ -19,7 +19,8 @@ class StraitsTimes(BasicNewsRecipe): encoding = 'cp1252' publisher = 'Singapore Press Holdings Ltd.' category = 'news, politics, singapore, asia' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py b/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py index 07a8b10fa3..d1832dbfda 100644 --- a/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py +++ b/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py @@ -17,7 +17,8 @@ class Sueddeutsche(BasicNewsRecipe): oldest_article = 7 max_articles_per_feed = 50 no_stylesheets = True - language = _('German') + language = 'de' + encoding = 'iso-8859-15' remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_tanjug.py b/src/calibre/web/feeds/recipes/recipe_tanjug.py index c7dddb8bc1..36e161678f 100644 --- a/src/calibre/web/feeds/recipes/recipe_tanjug.py +++ b/src/calibre/web/feeds/recipes/recipe_tanjug.py @@ -20,7 +20,8 @@ class Tanjug(BasicNewsRecipe): use_embedded_content = True encoding = 'utf-8' lang = 'sr-Latn-RS' - language = _('Serbian') + language = 'sr' + direction = 'ltr' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py b/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py index e2ab2539a0..5d51bebba4 100644 --- a/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py +++ b/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py @@ -14,7 +14,8 @@ class TelegraphUK(BasicNewsRecipe): oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True - language = _('English') + language = 'en' + use_embedded_content = False extra_css = ''' diff --git a/src/calibre/web/feeds/recipes/recipe_teleread.py b/src/calibre/web/feeds/recipes/recipe_teleread.py index 1bfd38ea85..d1740f39d2 100644 --- a/src/calibre/web/feeds/recipes/recipe_teleread.py +++ b/src/calibre/web/feeds/recipes/recipe_teleread.py @@ -14,7 +14,8 @@ class Teleread(BasicNewsRecipe): title = 'Teleread Blog' description = 'News & views on e-books, libraries, publishing and related topics' __author__ = 'Kovid Goyal' - language = _('English') + language = 'en' + feeds = [('Entries', 'http://www.teleread.org/feed/')] diff --git a/src/calibre/web/feeds/recipes/recipe_the_age.py b/src/calibre/web/feeds/recipes/recipe_the_age.py index dbc7427c1e..996b832bda 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_age.py +++ b/src/calibre/web/feeds/recipes/recipe_the_age.py @@ -16,7 +16,8 @@ class TheAge(BasicNewsRecipe): title = 'The Age' description = 'Business News, World News and Breaking News in Melbourne, Australia' __author__ = 'Matthew Briggs' - language = _('English') + language = 'en' + def get_browser(self): br = BasicNewsRecipe.get_browser() diff --git a/src/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py b/src/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py index 802b5da287..5ebc412a64 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py +++ b/src/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py @@ -20,7 +20,8 @@ class TheBudgetFashionista(BasicNewsRecipe): publisher = 'TBF GROUP, LLC.' category = 'news, fashion, comsetics, women' lang = 'en-US' - language = _('English') + language = 'en' + conversion_options = { 'comment' : description diff --git a/src/calibre/web/feeds/recipes/recipe_the_nation.py b/src/calibre/web/feeds/recipes/recipe_the_nation.py index 9b2e48e39e..2a1f226e56 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_nation.py +++ b/src/calibre/web/feeds/recipes/recipe_the_nation.py @@ -14,7 +14,8 @@ class Thenation(BasicNewsRecipe): oldest_article = 120 max_articles_per_feed = 100 no_stylesheets = True - language = _('English') + language = 'en' + use_embedded_content = False simultaneous_downloads = 1 delay = 1 diff --git a/src/calibre/web/feeds/recipes/recipe_the_oz.py b/src/calibre/web/feeds/recipes/recipe_the_oz.py index 351c76a1c4..5c1d26f48b 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_oz.py +++ b/src/calibre/web/feeds/recipes/recipe_the_oz.py @@ -13,7 +13,8 @@ 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 = _('English') + language = 'en' + oldest_article = 2 max_articles_per_feed = 10 remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_the_register.py b/src/calibre/web/feeds/recipes/recipe_the_register.py index 8b0fa48cff..9ad260d0fe 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_register.py +++ b/src/calibre/web/feeds/recipes/recipe_the_register.py @@ -3,7 +3,8 @@ from calibre.web.feeds.recipes import BasicNewsRecipe class TheRegister(BasicNewsRecipe): title = u'The Register' __author__ = 'vgrama' - language = _('English') + language = 'en' + oldest_article = 1 max_articles_per_feed = 100 use_embedded_content = False diff --git a/src/calibre/web/feeds/recipes/recipe_the_scotsman.py b/src/calibre/web/feeds/recipes/recipe_the_scotsman.py index c42bc4aed7..5c550511cb 100644 --- a/src/calibre/web/feeds/recipes/recipe_the_scotsman.py +++ b/src/calibre/web/feeds/recipes/recipe_the_scotsman.py @@ -16,7 +16,8 @@ class TheScotsman(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False - language = _('English') + language = 'en' + simultaneous_downloads = 1 keep_only_tags = [dict(name='div', attrs={'id':'viewarticle'})] diff --git a/src/calibre/web/feeds/recipes/recipe_thedgesingapore.py b/src/calibre/web/feeds/recipes/recipe_thedgesingapore.py index 248255bee5..6e08b01bbe 100644 --- a/src/calibre/web/feeds/recipes/recipe_thedgesingapore.py +++ b/src/calibre/web/feeds/recipes/recipe_thedgesingapore.py @@ -14,7 +14,8 @@ class Edgesingapore(BasicNewsRecipe): description = 'Financial news from Singapore' publisher = 'The Edge Singapore' category = 'news, finances, singapore' - language = _('English') + language = 'en' + lang = 'en' oldest_article = 15 max_articles_per_feed = 100 diff --git a/src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py b/src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py index b621ae55c0..51af8ceb67 100644 --- a/src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py +++ b/src/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py @@ -22,7 +22,8 @@ class TheEconomicTimes(BasicNewsRecipe): simultaneous_downloads = 1 encoding = 'utf-8' lang = 'en-IN' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_themarketticker.py b/src/calibre/web/feeds/recipes/recipe_themarketticker.py index b6cf752e23..437ce23b35 100644 --- a/src/calibre/web/feeds/recipes/recipe_themarketticker.py +++ b/src/calibre/web/feeds/recipes/recipe_themarketticker.py @@ -14,7 +14,8 @@ class Themarketticker(BasicNewsRecipe): description = 'Commentary On The Capital Markets' oldest_article = 7 max_articles_per_feed = 100 - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = True html2lrf_options = [ '--comment' , description diff --git a/src/calibre/web/feeds/recipes/recipe_theoldfoodie.py b/src/calibre/web/feeds/recipes/recipe_theoldfoodie.py index dacff26c15..51223a4132 100644 --- a/src/calibre/web/feeds/recipes/recipe_theoldfoodie.py +++ b/src/calibre/web/feeds/recipes/recipe_theoldfoodie.py @@ -18,7 +18,8 @@ class TheOldFoodie(BasicNewsRecipe): use_embedded_content = True no_stylesheets = True encoding = 'utf-8' - language = _('English') + language = 'en' + conversion_options = { 'comments' : description diff --git a/src/calibre/web/feeds/recipes/recipe_theonion.py b/src/calibre/web/feeds/recipes/recipe_theonion.py index 06f7edd32b..c59d95f1a4 100644 --- a/src/calibre/web/feeds/recipes/recipe_theonion.py +++ b/src/calibre/web/feeds/recipes/recipe_theonion.py @@ -17,7 +17,8 @@ class TheOnion(BasicNewsRecipe): max_articles_per_feed = 100 publisher = u'Onion, Inc.' category = u'humor, news, USA' - language = _('English') + language = 'en' + no_stylesheets = True use_embedded_content = False encoding = 'utf-8' diff --git a/src/calibre/web/feeds/recipes/recipe_tijd.py b/src/calibre/web/feeds/recipes/recipe_tijd.py index 7e8fe62449..33f4b64404 100644 --- a/src/calibre/web/feeds/recipes/recipe_tijd.py +++ b/src/calibre/web/feeds/recipes/recipe_tijd.py @@ -19,7 +19,8 @@ class DeTijd(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Dutch') + language = 'nl' + lang = 'nl-BE' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_time_magazine.py b/src/calibre/web/feeds/recipes/recipe_time_magazine.py index 22660410d6..9224d95962 100644 --- a/src/calibre/web/feeds/recipes/recipe_time_magazine.py +++ b/src/calibre/web/feeds/recipes/recipe_time_magazine.py @@ -15,7 +15,8 @@ class Time(BasicNewsRecipe): description = 'Weekly magazine' encoding = 'utf-8' no_stylesheets = True - language = _('English') + language = 'en' + extra_css = '''.headline {font-size: large;} .fact { padding-top: 10pt } h1 {font-family:Arial,Sans-serif} diff --git a/src/calibre/web/feeds/recipes/recipe_times_online.py b/src/calibre/web/feeds/recipes/recipe_times_online.py index f652ddc62c..d1e309abb4 100644 --- a/src/calibre/web/feeds/recipes/recipe_times_online.py +++ b/src/calibre/web/feeds/recipes/recipe_times_online.py @@ -22,7 +22,8 @@ class Timesonline(BasicNewsRecipe): simultaneous_downloads = 1 encoding = 'cp1252' lang = 'en-UK' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_tnxm.py b/src/calibre/web/feeds/recipes/recipe_tnxm.py index 6d9ba919de..eb9e5edd0c 100644 --- a/src/calibre/web/feeds/recipes/recipe_tnxm.py +++ b/src/calibre/web/feeds/recipes/recipe_tnxm.py @@ -13,7 +13,8 @@ class TNXM(BasicNewsRecipe): __author__ = 'Wasabi' description = 'Vietnam news and current affairs from TNXM - the finest Vietnamese bulletin board.' no_stylesheets = True - language = _('Vietnamese') + language = 'vi' + encoding = 'utf-8' recursions = 0 diff --git a/src/calibre/web/feeds/recipes/recipe_tomshardware.py b/src/calibre/web/feeds/recipes/recipe_tomshardware.py index af080ccbb7..ea73e72e2f 100644 --- a/src/calibre/web/feeds/recipes/recipe_tomshardware.py +++ b/src/calibre/web/feeds/recipes/recipe_tomshardware.py @@ -18,7 +18,8 @@ class Tomshardware(BasicNewsRecipe): category = 'news, IT, hardware, USA' no_stylesheets = True needs_subscription = True - language = _('English') + language = 'en' + INDEX = 'http://www.tomshardware.com' LOGIN = INDEX + '/membres/' remove_javascript = True diff --git a/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py b/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py index 7ba656e1d5..90b53101cb 100644 --- a/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py +++ b/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py @@ -17,7 +17,8 @@ class cdnet(BasicNewsRecipe): timefmt = ' [%d %b %Y]' max_articles_per_feed = 50 no_stylesheets = True - language = _('German') + language = 'de' + encoding = 'utf-8' diff --git a/src/calibre/web/feeds/recipes/recipe_twitchfilms.py b/src/calibre/web/feeds/recipes/recipe_twitchfilms.py index 395920c4da..7ba49a0338 100644 --- a/src/calibre/web/feeds/recipes/recipe_twitchfilms.py +++ b/src/calibre/web/feeds/recipes/recipe_twitchfilms.py @@ -19,7 +19,8 @@ class Twitchfilm(BasicNewsRecipe): encoding = 'utf-8' publisher = 'Twitch' category = 'twitch, twitchfilm, movie news, movie reviews, cult cinema, independent cinema, anime, foreign cinema, geek talk' - language = _('English') + language = 'en' + lang = 'en-US' conversion_options = { diff --git a/src/calibre/web/feeds/recipes/recipe_uncrate.py b/src/calibre/web/feeds/recipes/recipe_uncrate.py index ac0c54cd37..2886d475a6 100644 --- a/src/calibre/web/feeds/recipes/recipe_uncrate.py +++ b/src/calibre/web/feeds/recipes/recipe_uncrate.py @@ -21,7 +21,8 @@ class Uncrate(BasicNewsRecipe): publisher = 'Zombie corp.' category = 'news, gadgets, clothes, cars, DVDs' lang = 'en-US' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_upi.py b/src/calibre/web/feeds/recipes/recipe_upi.py index 5a96df7b48..42e9bb00c9 100644 --- a/src/calibre/web/feeds/recipes/recipe_upi.py +++ b/src/calibre/web/feeds/recipes/recipe_upi.py @@ -12,7 +12,8 @@ class UnitedPressInternational(BasicNewsRecipe): title = 'United Press International' max_articles_per_feed = 15 html2lrf_options = ['--override-css= "H1 {font-family: Arial; font-weight: bold; color: #000000; size: 10pt;}"'] - language = _('English') + language = 'en' + preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in [ diff --git a/src/calibre/web/feeds/recipes/recipe_usatoday.py b/src/calibre/web/feeds/recipes/recipe_usatoday.py index f191b53c13..67fe725302 100644 --- a/src/calibre/web/feeds/recipes/recipe_usatoday.py +++ b/src/calibre/web/feeds/recipes/recipe_usatoday.py @@ -15,7 +15,8 @@ class USAToday(BasicNewsRecipe): timefmt = ' [%d %b %Y]' __author__ = 'Kovid Goyal and Sujata Raman' max_articles_per_feed = 20 - language = _('English') + language = 'en' + no_stylesheets = True extra_css = ''' diff --git a/src/calibre/web/feeds/recipes/recipe_usnews.py b/src/calibre/web/feeds/recipes/recipe_usnews.py index 3a807570d0..8cd81a542b 100644 --- a/src/calibre/web/feeds/recipes/recipe_usnews.py +++ b/src/calibre/web/feeds/recipes/recipe_usnews.py @@ -18,7 +18,8 @@ class LaPrensa(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_utne.py b/src/calibre/web/feeds/recipes/recipe_utne.py index 2eed5a411e..c865ba28f6 100644 --- a/src/calibre/web/feeds/recipes/recipe_utne.py +++ b/src/calibre/web/feeds/recipes/recipe_utne.py @@ -17,7 +17,8 @@ class Utne(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False - language = _('English') + language = 'en' + cover_url = 'http://www.utne.com/images/template/logo.gif' diff --git a/src/calibre/web/feeds/recipes/recipe_vecernji_list.py b/src/calibre/web/feeds/recipes/recipe_vecernji_list.py index 0c76739b1e..ebf751cd27 100644 --- a/src/calibre/web/feeds/recipes/recipe_vecernji_list.py +++ b/src/calibre/web/feeds/recipes/recipe_vecernji_list.py @@ -23,7 +23,8 @@ class VecernjiList(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - language = _('Croatian') + language = 'hr' + lang = 'hr-HR' direction = 'ltr' diff --git a/src/calibre/web/feeds/recipes/recipe_veintitres.py b/src/calibre/web/feeds/recipes/recipe_veintitres.py index 165d9a7efc..f794c3e37b 100644 --- a/src/calibre/web/feeds/recipes/recipe_veintitres.py +++ b/src/calibre/web/feeds/recipes/recipe_veintitres.py @@ -20,7 +20,8 @@ class Veintitres(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = _('Spanish') + language = 'es' + lang = 'es-AR' direction = 'ltr' INDEX = 'http://www.elargentino.com/medios/120/veintitres.html' diff --git a/src/calibre/web/feeds/recipes/recipe_vijesti.py b/src/calibre/web/feeds/recipes/recipe_vijesti.py index fe7d5b0442..191ed42b95 100644 --- a/src/calibre/web/feeds/recipes/recipe_vijesti.py +++ b/src/calibre/web/feeds/recipes/recipe_vijesti.py @@ -22,7 +22,8 @@ class Vijesti(BasicNewsRecipe): no_stylesheets = True encoding = 'cp1250' use_embedded_content = False - language = _('Montenegrin') + language = 'sr' + lang ='sr-Latn-Me' extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}' diff --git a/src/calibre/web/feeds/recipes/recipe_vnexpress.py b/src/calibre/web/feeds/recipes/recipe_vnexpress.py index 0d50aa5f9a..7f1169b130 100644 --- a/src/calibre/web/feeds/recipes/recipe_vnexpress.py +++ b/src/calibre/web/feeds/recipes/recipe_vnexpress.py @@ -13,7 +13,8 @@ class BBCVietnamese(BasicNewsRecipe): __author__ = 'Huan Komrade T' description = 'Vietnam news and current affairs from the Food Production Technology Corporation' no_stylesheets = True - language = _('Vietnamese') + language = 'vi' + encoding = 'utf-8' recursions = 0 diff --git a/src/calibre/web/feeds/recipes/recipe_volksrant.py b/src/calibre/web/feeds/recipes/recipe_volksrant.py index d95cbdb1c7..0229bb0376 100644 --- a/src/calibre/web/feeds/recipes/recipe_volksrant.py +++ b/src/calibre/web/feeds/recipes/recipe_volksrant.py @@ -14,7 +14,8 @@ class AdvancedUserRecipe1249039563(BasicNewsRecipe): oldest_article = 7 max_articles_per_feed = 100 no_stylesheets = True - language = _('Dutch') + language = 'nl' + keep_only_tags = [dict(name='div', attrs={'id':'leftColumnArticle'}) ] remove_tags = [ dict(name='div',attrs={'class':'article_tools'}), diff --git a/src/calibre/web/feeds/recipes/recipe_vreme.py b/src/calibre/web/feeds/recipes/recipe_vreme.py index 02addb3f23..0d0d770784 100644 --- a/src/calibre/web/feeds/recipes/recipe_vreme.py +++ b/src/calibre/web/feeds/recipes/recipe_vreme.py @@ -24,7 +24,8 @@ class Vreme(BasicNewsRecipe): LOGIN = 'http://www.vreme.com/account/login.php?url=%2F' use_embedded_content = False encoding = 'utf-8' - language = _('Serbian') + language = 'sr' + lang = 'sr-Latn-RS' direction = 'ltr' extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} .heading1{font-family: sans1, sans-serif; font-size: x-large; font-weight: bold} .heading2{font-family: sans1, sans-serif; font-size: large; font-weight: bold} .toc-heading{font-family: sans1, sans-serif; font-size: small} .column-heading2{font-family: sans1, sans-serif; font-size: large} .column-heading1{font-family: sans1, sans-serif; font-size: x-large} .column-normal{font-family: sans1, sans-serif; font-size: medium} .large{font-family: sans1, sans-serif; font-size: large} ' diff --git a/src/calibre/web/feeds/recipes/recipe_wash_post.py b/src/calibre/web/feeds/recipes/recipe_wash_post.py index 44e8458ec6..5e62aa753c 100644 --- a/src/calibre/web/feeds/recipes/recipe_wash_post.py +++ b/src/calibre/web/feeds/recipes/recipe_wash_post.py @@ -9,7 +9,8 @@ class WashingtonPost(BasicNewsRecipe): __author__ = 'Kovid Goyal and Sujata Raman' use_embedded_content = False max_articles_per_feed = 20 - language = _('English') + language = 'en' + remove_javascript = True no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_wikinews_en.py b/src/calibre/web/feeds/recipes/recipe_wikinews_en.py index 932981ca4c..40a03c40a1 100644 --- a/src/calibre/web/feeds/recipes/recipe_wikinews_en.py +++ b/src/calibre/web/feeds/recipes/recipe_wikinews_en.py @@ -20,7 +20,8 @@ class WikiNews(BasicNewsRecipe): use_embedded_content = False encoding = 'utf-8' remove_javascript = True - language = _('English') + language = 'en' + html2lrf_options = [ '--comment', description diff --git a/src/calibre/web/feeds/recipes/recipe_winsupersite.py b/src/calibre/web/feeds/recipes/recipe_winsupersite.py index 11d901cba9..50b0819ca6 100644 --- a/src/calibre/web/feeds/recipes/recipe_winsupersite.py +++ b/src/calibre/web/feeds/recipes/recipe_winsupersite.py @@ -7,7 +7,8 @@ class Winsupersite(BasicNewsRecipe): description = u'Paul Thurrott SuperSite for Windows' publisher = 'Paul Thurrott' __author__ = 'Hypernova' - language = _('English') + language = 'en' + oldest_article = 30 max_articles_per_feed = 100 no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_wired.py b/src/calibre/web/feeds/recipes/recipe_wired.py index e49153cd27..fcc2494850 100644 --- a/src/calibre/web/feeds/recipes/recipe_wired.py +++ b/src/calibre/web/feeds/recipes/recipe_wired.py @@ -11,7 +11,8 @@ class Wired(BasicNewsRecipe): __author__ = 'Kovid Goyal' description = 'Technology news' timefmt = ' [%Y%b%d %H%M]' - language = _('English') + language = 'en' + no_stylesheets = True remove_tags_before = dict(name='div', id='content') diff --git a/src/calibre/web/feeds/recipes/recipe_woz_die.py b/src/calibre/web/feeds/recipes/recipe_woz_die.py index 730425eb9f..67c3df9cb8 100644 --- a/src/calibre/web/feeds/recipes/recipe_woz_die.py +++ b/src/calibre/web/feeds/recipes/recipe_woz_die.py @@ -4,7 +4,8 @@ class WozDie(BasicNewsRecipe): title = u'WOZ Die Wochenzeitung' oldest_article = 7 max_articles_per_feed = 100 - language = _('German') + language = 'de' + no_stylesheets = True remove_tags = [dict(name='p', attrs={'class':'arrow_top'})] remove_tags = [dict(name='p', attrs={'class':'bottom_right'})] diff --git a/src/calibre/web/feeds/recipes/recipe_wsj.py b/src/calibre/web/feeds/recipes/recipe_wsj.py index a206b6cc50..513d0a7024 100644 --- a/src/calibre/web/feeds/recipes/recipe_wsj.py +++ b/src/calibre/web/feeds/recipes/recipe_wsj.py @@ -13,7 +13,8 @@ class WallStreetJournal(BasicNewsRecipe): __author__ = 'Kovid Goyal and Sujata Raman' description = 'News and current affairs.' needs_subscription = True - language = _('English') + language = 'en' + max_articles_per_feed = 10 timefmt = ' [%a, %b %d, %Y]' no_stylesheets = True diff --git a/src/calibre/web/feeds/recipes/recipe_xkcd.py b/src/calibre/web/feeds/recipes/recipe_xkcd.py index 36b776c380..312027004e 100644 --- a/src/calibre/web/feeds/recipes/recipe_xkcd.py +++ b/src/calibre/web/feeds/recipes/recipe_xkcd.py @@ -12,7 +12,8 @@ class XkcdCom(BasicNewsRecipe): title = 'xkcd' description = 'A webcomic of romance and math humor.' __author__ = 'Martin Pitt' - language = _('English') + language = 'en' + use_embedded_content = False oldest_article = 60 keep_only_tags = [dict(id='middleContent')] diff --git a/src/calibre/web/feeds/recipes/recipe_zaobao.py b/src/calibre/web/feeds/recipes/recipe_zaobao.py index 8dae2274a0..ef4221e896 100644 --- a/src/calibre/web/feeds/recipes/recipe_zaobao.py +++ b/src/calibre/web/feeds/recipes/recipe_zaobao.py @@ -14,7 +14,8 @@ class ZAOBAO(BasicNewsRecipe): description = 'News from zaobao.com' no_stylesheets = True recursions = 1 - language = _('Chinese') + language = 'zh' + encoding = 'gbk' # multithreaded_fetch = True diff --git a/src/calibre/web/feeds/recipes/recipe_zdnet.py b/src/calibre/web/feeds/recipes/recipe_zdnet.py index 6bfc324379..9673eb1fcf 100644 --- a/src/calibre/web/feeds/recipes/recipe_zdnet.py +++ b/src/calibre/web/feeds/recipes/recipe_zdnet.py @@ -13,7 +13,8 @@ class cdnet(BasicNewsRecipe): title = 'zdnet' description = 'zdnet security' __author__ = 'Oliver Niesner' - language = _('English') + language = 'en' + use_embedded_content = False timefmt = ' [%d %b %Y]' max_articles_per_feed = 40 diff --git a/src/calibre/web/feeds/recipes/recipe_zeitde.py b/src/calibre/web/feeds/recipes/recipe_zeitde.py index 8de0809736..922e6e130d 100644 --- a/src/calibre/web/feeds/recipes/recipe_zeitde.py +++ b/src/calibre/web/feeds/recipes/recipe_zeitde.py @@ -12,7 +12,8 @@ class ZeitDe(BasicNewsRecipe): title = 'Die Zeit Nachrichten' description = 'Die Zeit - Online Nachrichten' - language = _('German') + language = 'de' + __author__ = 'Kovid Goyal and Martin Pitt' use_embedded_content = False timefmt = ' [%d %b %Y]'