From 1777ac48b6e11d68463362331e6f46e4ec0ee5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Wed, 18 Feb 2015 16:07:39 +0100
Subject: [PATCH] Cleaned up urls.py. Fixed #1472. Removed use of
 'django.views.i18n.javascript_catalog'.

---
 openslides/core/templates/base.html |  1 -
 openslides/urls.py                  | 18 +++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/openslides/core/templates/base.html b/openslides/core/templates/base.html
index 9e787bab5..d4e86f5e5 100644
--- a/openslides/core/templates/base.html
+++ b/openslides/core/templates/base.html
@@ -142,7 +142,6 @@
     <script src="{% static 'js/sockjs-0.3.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/utils.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/chatbox.js' %}" type="text/javascript"></script>
-    <script src="{% url 'django.views.i18n.javascript_catalog' %}" type="text/javascript"></script>
     <script type="text/javascript" src="{% static 'js/jquery/jquery.bsmselect.js' %}"></script>
     <script type="text/javascript">
         // use jquery-bsmselect for all <select multiple> form elements
diff --git a/openslides/urls.py b/openslides/urls.py
index b47facbaf..9e129d07a 100644
--- a/openslides/urls.py
+++ b/openslides/urls.py
@@ -1,8 +1,8 @@
 from django.conf.urls import include, patterns, url
 
 from openslides.core.views import IndexView, ErrorView
-from openslides.utils.rest_api import router
 from openslides.users.views import UserSettingsView, UserPasswordSettingsView
+from openslides.utils.rest_api import router
 
 handler403 = ErrorView.as_view(status_code=403)
 handler404 = ErrorView.as_view(status_code=404)
@@ -11,22 +11,17 @@ handler500 = ErrorView.as_view(status_code=500)
 urlpatterns = patterns(
     '',
     url(r'^rest/', include(router.urls)),
-    (r'^users/', include('openslides.users.urls')),
+    url(r'^users/', include('openslides.users.urls')),
 
     url(r'^users.*', IndexView.as_view()),
 
-    # activate next line go get more angular views
+    # Activate next lines to get more AngularJS views
     # url(r'^$', IndexView.as_view()),
     # url(r'^assignment.*', IndexView.as_view()),
     # url(r'^agenda.*', IndexView.as_view()),
-
 )
 
-
-# Deprecated.
-js_info_dict = {'packages': []}
-
-
+# Deprecated urls. Move them up when the apps are refactored.
 urlpatterns += patterns(
     '',
     (r'^agenda/', include('openslides.agenda.urls')),
@@ -39,15 +34,12 @@ urlpatterns += patterns(
     (r'^ckeditor/', include('ckeditor.urls')),
 )
 
-# TODO: move this patterns into core or the participant app
+# TODO: Move these patterns into core or the users app.
 urlpatterns += patterns(
     '',
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-
     url(r'^myusersettings/$',
         UserSettingsView.as_view(),
         name='user_settings'),
-
     url(r'^myusersettings/changepassword/$',
         UserPasswordSettingsView.as_view(),
         name='password_change'),