Ticket #2106: admin-js-logout-i18n.diff

django/contrib/auth/views.py

@@ -36 +36 @@
     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)

django/contrib/admin/media/js/admin/CollapsedFieldsets.js

@@ -31 +31 @@
                                 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 +60 @@
                 // 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 +69 @@
                 // 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() {