diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-06-08 05:04:10 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-06-08 05:04:10 +0000 |
| commit | 29f55c8dbb298bcaa5af0b3949cd1a1c39620b8d (patch) | |
| tree | 1b010d3df8395a0600ed1fdc158bbd42e4fcc53d | |
| parent | 2abfd5dd586c4f6fb619de561b2194687021e256 (diff) | |
Fixed #2106 -- Made collapse-block JavaScript translatable. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/media/js/admin/CollapsedFieldsets.js | 8 | ||||
| -rw-r--r-- | django/contrib/auth/views.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/admin/media/js/admin/CollapsedFieldsets.js b/django/contrib/admin/media/js/admin/CollapsedFieldsets.js index 0b3ad9e421..97f0a68d04 100644 --- a/django/contrib/admin/media/js/admin/CollapsedFieldsets.js +++ b/django/contrib/admin/media/js/admin/CollapsedFieldsets.js @@ -31,7 +31,7 @@ var CollapsedFieldsets = { collapse_link.id = 'fieldsetcollapser' + i; collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;'); collapse_link.href = '#'; - collapse_link.innerHTML = 'Show'; + collapse_link.innerHTML = gettext('Show'); var h2 = fs.getElementsByTagName('h2')[0]; h2.appendChild(document.createTextNode(' (')); h2.appendChild(collapse_link); @@ -60,7 +60,7 @@ var CollapsedFieldsets = { // Toggle the "Show" link to a "Hide" link var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index); collapse_link.onclick = new Function('CollapsedFieldsets.hide('+fieldset_index+'); return false;'); - collapse_link.innerHTML = 'Hide'; + collapse_link.innerHTML = gettext('Hide'); }, hide: function(fieldset_index) { var fs = document.getElementsByTagName('fieldset')[fieldset_index]; @@ -69,9 +69,9 @@ var CollapsedFieldsets = { // Toggle the "Hide" link to a "Show" link var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index); collapse_link.onclick = new Function('CollapsedFieldsets.show('+fieldset_index+'); return false;'); - collapse_link.innerHTML = 'Show'; + collapse_link.innerHTML = gettext('Show'); }, - + uncollapse_all: function() { var fieldsets = document.getElementsByTagName('fieldset'); for (var i=0; i<fieldsets.length; i++) { diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py index f917bab952..6d908ee025 100644 --- a/django/contrib/auth/views.py +++ b/django/contrib/auth/views.py @@ -36,7 +36,7 @@ def logout(request, next_page=None, template_name='registration/logged_out.html' try: del request.session[SESSION_KEY] except KeyError: - return render_to_response(template_name, {'title': 'Logged out'}, context_instance=RequestContext(request)) + return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request)) else: # Redirect to this page until the session has been cleared. return HttpResponseRedirect(next_page or request.path) |
