innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2007-11-29 17:29:54 +00:00
parent 6044ce9898
commit 8d29fabe31
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/views/i18n.py
View File

@ -120,8 +120,12 @@ def javascript_catalog(request, domain='djangojs', packages=None):
p = __import__(package, {}, {}, ['']) p = __import__(package, {}, {}, [''])
path = os.path.join(os.path.dirname(p.__file__), 'locale') path = os.path.join(os.path.dirname(p.__file__), 'locale')
paths.append(path) paths.append(path)
try:
catalog = gettext_module.translation(domain, path, ['en']) catalog = gettext_module.translation(domain, path, ['en'])
t.update(catalog._catalog) 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 # next load the settings.LANGUAGE_CODE translations if it isn't english
if default_locale != 'en': if default_locale != 'en':
for path in paths: for path in paths: