remove all the i18n garbage not needed anymore.

Author: digi604

cms/middleware/multilingual.py

@@ -31,46 +31,5 @@ def validate_dependencies():
         if not hasattr(VersionAdmin, 'get_urls'):
             raise ImproperlyConfigured('django-cms requires never version of reversion (VersionAdmin must contain get_urls method)')
 
-
-def remove_current_root(url):
-    current_root = "/%s/" % get_language()
-    if url[:len(current_root)] == current_root:
-        url = url[len(current_root) - 1:]
-    return url
-
-
-def monkeypatch_reverse():
-    if hasattr(django.core.urlresolvers.reverse, 'cms_monkeypatched'):
-        return
-    django.core.urlresolvers.old_reverse = django.core.urlresolvers.reverse
-
-    def new_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current_app=None):
-        url = ''
-        i18n = 'cms.middleware.multilingual.MultilingualURLMiddleware' in settings.MIDDLEWARE_CLASSES
-        lang = None
-        if isinstance(viewname, basestring) and viewname.split(":")[0] in dict(settings.LANGUAGES).keys():
-            lang = viewname.split(":")[0]
-        try:
-            url = django.core.urlresolvers.old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, prefix=prefix, current_app=current_app)
-            if lang:
-                url = "/%s%s" % (lang, url)
-        except NoReverseMatch, e:
-            if i18n:
-                if not lang:
-                    try:
-                        lang = get_language()
-                        ml_viewname = "%s:%s" % (lang, viewname)
-                        url = django.core.urlresolvers.old_reverse(ml_viewname, urlconf=urlconf, args=args, kwargs=kwargs, prefix=prefix, current_app=current_app)
-                        return url
-                    except NoReverseMatch:
-                        pass
-            raise e
-        url = remove_current_root(url)
-        return url
-
-    new_reverse.cms_monkeypatched = True
-    django.core.urlresolvers.reverse = new_reverse
-
 validate_dependencies()
 validate_settings()
-monkeypatch_reverse()

cms/models/__init__.py

@@ -52,13 +52,13 @@ def configure(**extra):
             os.path.abspath(os.path.join(os.path.dirname(__file__), 'project', 'templates'))
         ],
         MIDDLEWARE_CLASSES = [
+            'django.middleware.common.CommonMiddleware',
             'django.contrib.sessions.middleware.SessionMiddleware',
-            'cms.middleware.multilingual.MultilingualURLMiddleware',
+            'django.middleware.csrf.CsrfViewMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
             'django.contrib.messages.middleware.MessageMiddleware',
-            'django.middleware.common.CommonMiddleware',
+            'django.middleware.locale.LocaleMiddleware',
             'django.middleware.doc.XViewMiddleware',
-            'django.middleware.csrf.CsrfViewMiddleware',
             'cms.middleware.user.CurrentUserMiddleware',
             'cms.middleware.page.CurrentPageMiddleware',
             'cms.middleware.toolbar.ToolbarMiddleware',

cms/test_utils/cli.py

@@ -2,17 +2,21 @@
 from django.conf.urls.defaults import handler500, handler404, patterns, include, \
     url
 from django.contrib import admin
+from django.conf.urls.i18n import i18n_patterns
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
+    (r'', include('django.contrib.staticfiles.urls')),
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
+            {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^media/cms/(?P<path>.*)$', 'django.views.static.serve',
+            {'document_root': settings.CMS_MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
+)
+
+urlpatterns += i18n_patterns('',
     url(r'^admin/', include(admin.site.urls)),
     url(r'^example/$', 'cms.test_utils.project.placeholderapp.views.example_view'),
-    url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
-    url(r'^media/cms/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': settings.CMS_MEDIA_ROOT, 'show_indexes': True}),
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-    (r'', include('django.contrib.staticfiles.urls')),
     url(r'^', include('cms.urls')),
 )

cms/test_utils/project/urls.py

@@ -9,7 +9,6 @@
 from cms.tests.mail import *
 from cms.tests.menu import *
 from cms.tests.menu_utils import *
-from cms.tests.middleware import *
 from cms.tests.multilingual import *
 from cms.tests.navextender import *
 from cms.tests.nonroot import *