Mercurial > babel > mirror
diff babel/catalog/__init__.py @ 4:5a7f2bc6b114 trunk
Fixes for the extended translations class.
author | cmlenz |
---|---|
date | Wed, 30 May 2007 08:43:51 +0000 |
parents | 7870274479f5 |
children |
line wrap: on
line diff
--- a/babel/catalog/__init__.py +++ b/babel/catalog/__init__.py @@ -29,7 +29,7 @@ :param fileobj: the file-like object the translation should be read from """ - GNUTranslations.__init__(self, fp=fileobj) + gettext.GNUTranslations.__init__(self, fp=fileobj) self.files = [getattr(fileobj, 'name')] def load(cls, dirname=None, locales=None, domain=DEFAULT_DOMAIN): @@ -44,11 +44,13 @@ matching translations were found :rtype: `Translations` """ + if not isinstance(locales, (list, tuple)): + locales = [locales] locales = [str(locale) for locale in locales] filename = gettext.find(domain, dirname, locales) if not filename: - return NullTranslations() - return cls(open(filename, 'rb')) + return gettext.NullTranslations() + return cls(fileobj=open(filename, 'rb')) load = classmethod(load) def merge(self, translations):