Merge pull request django-cms#1606 from evildmp/language-related-fixes

language_chooser fix and docs
eliasp · Feb 8, 2013 · 3bf750f · 3bf750f
2 parents 956bd2e + 81769b5
commit 3bf750f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/docs/upgrade/2.4.rst b/docs/upgrade/2.4.rst
@@ -128,9 +128,11 @@ of the new functionality in django 1.4 and can be found here:
 
 What you need to do:
 
-- Remove the MultilingualMiddleware from your settings.
-- Be sure the LocaleMiddleware is in your settings and that it comes after the SessionMiddleware.
-- Be sure that the cms.urls is included in a i18n_patterns::
+- Remove ``cms.middleware.multilingual.MultilingualURLMiddleware`` from your
+  settings.
+- Be sure ``django.middleware.locale.LocaleMiddleware`` is in your settings,
+  and that it comes after the SessionMiddleware.
+- Be sure that the cms.urls is included in a ``i18n_patterns``::
 
         from django.conf.urls.defaults import *
         from django.conf.urls.i18n import i18n_patterns

diff --git a/menus/templates/menu/language_chooser.html b/menus/templates/menu/language_chooser.html
@@ -1,4 +1,4 @@
-{% load i18n_compat menu_tags %}
+{% load i18n menu_tags %}
 {% get_available_languages as languages %}
 {% for language in languages %}
     {% language language.0 %}