diff options
| author | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-12 15:33:22 +0000 |
|---|---|---|
| committer | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-12 15:33:22 +0000 |
| commit | b34e844c2f8c694b03b3ab5879f413bcd9c10781 (patch) | |
| tree | 8861d894c30fe79e61c1970b6458cc7170e81990 /django/middleware | |
| parent | 18d0c31d51d52ca4515e3a16b20c75c3de229995 (diff) | |
i18n: fixed language code reporting - now the actually used language code is reported, not the requested language code (as before). Additionally explicit language codes requested in GET, P OST or otherwise are checked against availability, too.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/middleware')
| -rw-r--r-- | django/middleware/locale.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/django/middleware/locale.py b/django/middleware/locale.py index 76d026f9f7..a198aeecb8 100644 --- a/django/middleware/locale.py +++ b/django/middleware/locale.py @@ -18,9 +18,6 @@ class LocaleMiddleware: def process_view(self, request, view_func, param_dict): global _module_to_app - lang = translation.get_language_from_request(request) - - def findapp(module): app = _module_to_app.get(view_func.__module__, None) if app is not None: @@ -35,10 +32,12 @@ class LocaleMiddleware: app = findapp(view_func.__module__) - request.LANGUAGE_CODE = lang + lang = translation.get_language_from_request(request) translation.activate(app, lang) + request.LANGUAGE_CODE = translation.get_language() + def process_response(self, request, response): patch_vary_headers(response, ('Accept-Language',)) return response |