diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-29 17:29:54 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-29 17:29:54 +0000 |
| commit | 8d29fabe31107b627be01be7350a72b33573ba9d (patch) | |
| tree | 9f2d26526907b0ee2206cf9a25f13a380cf05204 | |
| parent | 6044ce9898c0f56090ce2f6b4e0c1ecc1d6a7f94 (diff) | |
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
| -rw-r--r-- | django/views/i18n.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/django/views/i18n.py b/django/views/i18n.py index cccec13941..cd23ff8777 100644 --- a/django/views/i18n.py +++ b/django/views/i18n.py @@ -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: |