From c6066ce7e3dd9441a8903996a252806319cb1653 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 15 May 2011 10:21:48 -0600 Subject: [PATCH] Fix #782742 (Download metadata never finds anything) --- src/calibre/utils/titlecase.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/calibre/utils/titlecase.py b/src/calibre/utils/titlecase.py index ff5b446268..12f3079a10 100755 --- a/src/calibre/utils/titlecase.py +++ b/src/calibre/utils/titlecase.py @@ -10,7 +10,6 @@ License: http://www.opensource.org/licenses/mit-license.php import re from calibre.utils.icu import capitalize -from calibre.utils.config import prefs __all__ = ['titlecase'] __version__ = '0.5' @@ -31,6 +30,17 @@ ALL_CAPS = re.compile(r'^[A-Z\s%s]+$' % PUNCT) UC_INITIALS = re.compile(r"^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$") MAC_MC = re.compile(r"^([Mm]a?c)(.+)") + +_lang = None + +def lang(): + global _lang + if _lang is None: + from calibre.utils.localization import get_lang + _lang = get_lang().lower() + return _lang + + def titlecase(text): """ @@ -68,7 +78,7 @@ def titlecase(text): line.append(icu_lower(word)) continue - if prefs['language'].lower().startswith('en'): + if lang().startswith('en'): match = MAC_MC.match(word) if match and not match.group(2)[:3] in ('hin', 'ht'): line.append("%s%s" % (capitalize(match.group(1)),