Commit 4d70df8b authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed #12650 -- Don't generate invalid XHTML in the admin, databrowse apps when 

the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.

Backport of [14104] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a92da6e8

django/contrib/admin/templates/admin/base.html

+1 −1
Original line number Diff line number Diff line 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" xml:lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<head>

<title>{% block title %}{% endblock %}</title>

<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />

django/contrib/databrowse/templates/databrowse/base.html

+1 −1
Original line number Diff line number Diff line 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" xml:lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<head>

<title>{% block title %}{% endblock %}</title>

{% block style %}

tests/regressiontests/admin_views/tests.py

+30 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ from django.utils.cache import get_max_age 
from django.utils.encoding import iri_to_uri

from django.utils.html import escape

from django.utils.translation import get_date_formats, activate, deactivate

import django.template.context



# local test models

from models import Article, BarAccount, CustomArticle, EmptyModel, \
@@ -2232,3 +2233,32 @@ try: 


except ImportError:

    pass



class ValidXHTMLTests(TestCase):

    fixtures = ['admin-views-users.xml']

    urlbit = 'admin'



    def setUp(self):

        self._context_processors = None

        self._use_i18n, settings.USE_I18N = settings.USE_I18N, False

        if 'django.core.context_processors.i18n' in settings.TEMPLATE_CONTEXT_PROCESSORS:

            self._context_processors = settings.TEMPLATE_CONTEXT_PROCESSORS

            cp = list(settings.TEMPLATE_CONTEXT_PROCESSORS)

            cp.remove('django.core.context_processors.i18n')

            settings.TEMPLATE_CONTEXT_PROCESSORS = tuple(cp)

            # Force re-evaluation of the contex processor list

            django.template.context._standard_context_processors = None

        self.client.login(username='super', password='secret')



    def tearDown(self):

        self.client.logout()

        if self._context_processors is not None:

            settings.TEMPLATE_CONTEXT_PROCESSORS = self._context_processors

            # Force re-evaluation of the contex processor list

            django.template.context._standard_context_processors = None

        settings.USE_I18N = self._use_i18n



    def testLangNamePresent(self):

        response = self.client.get('/test_admin/%s/admin_views/' % self.urlbit)

        self.failIf(' lang=""' in response.content)

        self.failIf(' xml:lang=""' in response.content)