From 576e8aaebfd104372b5c0fe1ef1dd60b88859137 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 21 Jul 2011 08:48:31 -0600 Subject: [PATCH] Fix #813924 ('zh-TW' come up in language list of News Schedule dialog) --- recipes/united_daily.recipe | 2 +- src/calibre/utils/localization.py | 2 +- src/calibre/web/feeds/recipes/model.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/united_daily.recipe b/recipes/united_daily.recipe index 1013b3d2b6..25493a43ac 100644 --- a/recipes/united_daily.recipe +++ b/recipes/united_daily.recipe @@ -64,7 +64,7 @@ class UnitedDaily(BasicNewsRecipe): __author__ = 'Eddie Lau' __version__ = '1.1' - language = 'zh-TW' + language = 'zh_TW' publisher = 'United Daily News Group' description = 'United Daily (Taiwan)' category = 'News, Chinese, Taiwan' diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 43b4fbcc89..39cb228d60 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -72,7 +72,7 @@ def set_translators(): if lang: buf = iso639 = None mpath = get_lc_messages_path(lang) - if os.access(mpath+'.po', os.R_OK): + if mpath and os.access(mpath+'.po', os.R_OK): from calibre.translations.msgfmt import make buf = cStringIO.StringIO() make(mpath+'.po', buf) diff --git a/src/calibre/web/feeds/recipes/model.py b/src/calibre/web/feeds/recipes/model.py index 5f8d906e61..40d246b450 100644 --- a/src/calibre/web/feeds/recipes/model.py +++ b/src/calibre/web/feeds/recipes/model.py @@ -217,6 +217,8 @@ def ok(urn): self.all_urns.add(urn) if ok(urn): lang = x.get('language', 'und') + if lang: + lang = lang.replace('-', '_') if lang not in lang_map: lang_map[lang] = factory(NewsCategory, new_root, lang) factory(NewsItem, lang_map[lang], urn, x.get('title'))