diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-02-18 13:37:30 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-02-18 13:37:30 +0000 |
| commit | 7dd0ceba2e8413d79c2aaff62733f4631cd3c1e7 (patch) | |
| tree | 3e3cf3d88531a6fca68ee79978d398d6e1c52062 /django/middleware | |
| parent | 52b06e29c76dc9a5184edf3bbea64f0d4d5442b1 (diff) | |
Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/middleware')
| -rw-r--r-- | django/middleware/locale.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/middleware/locale.py b/django/middleware/locale.py index d42a615b04..2a71f3d150 100644 --- a/django/middleware/locale.py +++ b/django/middleware/locale.py @@ -15,7 +15,9 @@ class LocaleMiddleware(object): """ def process_request(self, request): - language = translation.get_language_from_request(request) + check_path = self.is_language_prefix_patterns_used() + language = translation.get_language_from_request( + request, check_path=check_path) translation.activate(language) request.LANGUAGE_CODE = translation.get_language() |