Skip to content

Commit 29d14a6

Browse files
committed
Prepare for django/django#399.
1 parent 7826c28 commit 29d14a6

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

example/settings.py

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
TEMPLATE_CONTEXT_PROCESSORS = ('locale_switcher.context_processors.locale_switcher',)
9999

100100
MIDDLEWARE_CLASSES = (
101-
'locale_switcher.middleware.LocaleSwitcherMiddleware',
102101
'django.middleware.locale.LocaleMiddleware',
103102
'django.middleware.common.CommonMiddleware',
104103
'django.contrib.sessions.middleware.SessionMiddleware',

locale_switcher/context_processors.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
locale_info = namedtuple('locale_info', ['language_code', 'language_name', 'url', 'active'])
88
def locale_switcher(request):
99
data = {'locale_switcher': []}
10-
info = request.resolver_info
10+
rm = request.resolver_match
1111
# Translate the lanuages first:
1212
lang_names = [translation.ugettext(i[1]) for i in settings.LANGUAGES]
1313
for (lang_code, _), lang_name in zip(settings.LANGUAGES, lang_names):
1414
with translation.override(lang_code):
15-
url = reverse(info[0], args=info[1], kwargs=info[2])
16-
data['locale_switcher'].append(locale_info(lang_code, lang_name, url, lang_code == request.LANGUAGE_CODE))
15+
url = reverse(rm.url_name or rm.func, args=rm.args, kwargs=rm.kwargs)
16+
data['locale_switcher'].append(locale_info(lang_code, lang_name, url,
17+
lang_code == request.LANGUAGE_CODE))
1718
return data

locale_switcher/middleware.py

-5
This file was deleted.

0 commit comments

Comments
 (0)