From 6d50ff7b618c97d6bc6966024214ca1b9707f519 Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Mon, 27 Jan 2014 16:25:13 -0500 Subject: [PATCH] Set the html language to the browser's specified language --- cms/envs/common.py | 4 ++- cms/templates/base.html | 10 ++++---- lms/djangoapps/courseware/tests/test_i18n.py | 25 +++++++++++++++++++ lms/envs/common.py | 5 ++-- lms/envs/test.py | 1 + lms/static/maintenance/index.html | 2 +- lms/templates/course_groups/debug.html | 2 +- lms/templates/extauth_failure.html | 2 +- lms/templates/main.html | 10 ++++---- lms/templates/main_django.html | 4 +-- lms/templates/mktg_iframe.html | 8 +++--- .../registration/password_reset_complete.html | 2 +- .../registration/password_reset_confirm.html | 2 +- lms/templates/wiki/preview_inline.html | 2 +- 14 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 lms/djangoapps/courseware/tests/test_i18n.py diff --git a/cms/envs/common.py b/cms/envs/common.py index c96b171959..4dc75f87e9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -113,6 +113,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', 'django.core.context_processors.static', 'django.contrib.messages.context_processors.messages', + 'django.core.context_processors.i18n', 'django.contrib.auth.context_processors.auth', # this is required for admin 'django.core.context_processors.csrf', 'dealer.contrib.django.staff.context_processor', # access git revision @@ -165,12 +166,13 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', 'track.middleware.TrackMiddleware', - 'edxmako.middleware.MakoMiddleware', # Detects user-requested locale from 'accept-language' header in http request 'django.middleware.locale.LocaleMiddleware', 'django.middleware.transaction.TransactionMiddleware', + # needs to run after locale middleware (or anything that modifies the request context) + 'edxmako.middleware.MakoMiddleware', # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 'ratelimitbackend.middleware.RateLimitMiddleware', diff --git a/cms/templates/base.html b/cms/templates/base.html index 6f87c4c5a9..625777fe23 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -3,10 +3,10 @@ <%namespace name='static' file='static_content.html'/> - - - - + + + + @@ -32,7 +32,7 @@ <%block name="header_extras"> - + ${_("Skip to this view's content")}