Context Navigation

Ticket #18700: 18700b.diff

File 18700b.diff, 2.0 KB (added by Simon Meers, 12 years ago)
Forgot quotes

diff --git a/django/conf/urls/i18n.py b/django/conf/urls/i18n.py
index 6e56af8..7f2fc23 100644

-              a
 from django.conf import settings
 from django.conf.urls import patterns
+from django.conf.urls import patterns, url
 from django.core.urlresolvers import LocaleRegexURLResolver
 def i18n_patterns(prefix, *args):
-…
+               def i18n_patterns(prefix, *args):
 urlpatterns = patterns('',
     (r'^setlang/$', 'django.views.i18n.set_language'),
+    url(r'^setlang/$', 'django.views.i18n.set_language', name='setlang'),
+)

diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 988948e..40ba93c 100644

                Here's example HTML template code:
 .. code-block:: html+django
     <form action="/i18n/setlang/" method="post">
+    <form action="{% url 'setlang' %}" method="post">
     {% csrf_token %}
     <input name="next" type="hidden" value="{{ redirect_to }}" />
     <select name="language">

diff --git a/tests/regressiontests/views/tests/i18n.py b/tests/regressiontests/views/tests/i18n.py
index 9993ae9..c5b45b8 100644

                import gettext
 from os import path
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.utils.translation import override, activate, get_language
 from django.utils.text import javascript_quote
-…
+               class I18NTests(TestCase):
             self.assertRedirects(response, 'http://testserver/views/')
             self.assertEqual(self.client.session['django_language'], lang_code)
+    def test_setlang_reversal(self):
+        self.assertEqual(reverse('setlang'), '/views/i18n/setlang/')
     def test_jsi18n(self):
         """The javascript_catalog can be deployed with language settings"""
         saved_lang = get_language()