summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-05-02 19:48:17 +0000
committerJannis Leidel <jannis@leidel.info>2010-05-02 19:48:17 +0000
commit99a512300cd4e61d86269d3b28bf5a8add5980c1 (patch)
treeeace83db217add96737617c1603684b64a1eb75b /django
parentef0e10cccf7788948e7254a208b8477911e6cbb0 (diff)
[1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view.
Backport of r13069 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/views/i18n.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/views/i18n.py b/django/views/i18n.py
index 23d248a2bc..e151496bcd 100644
--- a/django/views/i18n.py
+++ b/django/views/i18n.py
@@ -169,7 +169,7 @@ def javascript_catalog(request, domain='djangojs', packages=None):
except IOError:
catalog = None
if catalog is not None:
- t.update(catalog._catalog)
+ t = catalog._catalog
src = [LibHead]
plural = None
if '' in t: