Commit a4a997c6 authored by Michal Čihař's avatar Michal Čihař

Use simple list of url()s instead of patterns()

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent f3807d68
...@@ -18,13 +18,12 @@ ...@@ -18,13 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
import weblate.accounts.views import weblate.accounts.views
urlpatterns = patterns( urlpatterns = [
'',
url( url(
r'^email-sent/$', r'^email-sent/$',
weblate.accounts.views.RegistrationTemplateView.as_view( weblate.accounts.views.RegistrationTemplateView.as_view(
...@@ -44,4 +43,4 @@ urlpatterns = patterns( ...@@ -44,4 +43,4 @@ urlpatterns = patterns(
url(r'^register/$', weblate.accounts.views.register, name='register'), url(r'^register/$', weblate.accounts.views.register, name='register'),
url(r'^email/$', weblate.accounts.views.email_login, name='email_login'), url(r'^email/$', weblate.accounts.views.email_login, name='email_login'),
url(r'', include('social.apps.django_app.urls', namespace='social')), url(r'', include('social.apps.django_app.urls', namespace='social')),
) ]
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
from django.conf.urls import patterns, include, url from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.views.generic import RedirectView from django.views.generic import RedirectView
import django.contrib.sitemaps.views import django.contrib.sitemaps.views
...@@ -80,8 +80,7 @@ handler500 = weblate.trans.views.basic.server_error ...@@ -80,8 +80,7 @@ handler500 = weblate.trans.views.basic.server_error
admin.site.index_template = 'admin/custom-index.html' admin.site.index_template = 'admin/custom-index.html'
urlpatterns = patterns( urlpatterns = [
'',
url( url(
r'^$', r'^$',
weblate.trans.views.basic.home, weblate.trans.views.basic.home,
...@@ -821,4 +820,4 @@ urlpatterns = patterns( ...@@ -821,4 +820,4 @@ urlpatterns = patterns(
weblate.trans.views.basic.search, weblate.trans.views.basic.search,
name="search" name="search"
), ),
) ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment