Kaydet (Commit) 8d29fabe authored tarafından Malcolm Tredinnick's avatar Malcolm Tredinnick

Fixed #5853 -- Added handling for a missing 'en' PO file in translation support

(this file being missing is essentially harmless). Thanks, miracle2k.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
üst 6044ce98
......@@ -120,8 +120,12 @@ def javascript_catalog(request, domain='djangojs', packages=None):
p = __import__(package, {}, {}, [''])
path = os.path.join(os.path.dirname(p.__file__), 'locale')
paths.append(path)
catalog = gettext_module.translation(domain, path, ['en'])
t.update(catalog._catalog)
try:
catalog = gettext_module.translation(domain, path, ['en'])
t.update(catalog._catalog)
except IOError:
# 'en' catalog was missing. This is harmless.
pass
# next load the settings.LANGUAGE_CODE translations if it isn't english
if default_locale != 'en':
for path in paths:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment