diff --git a/djangopeople/settings.py b/djangopeople/settings.py index 8090607..4fa581e 100644 --- a/djangopeople/settings.py +++ b/djangopeople/settings.py @@ -73,6 +73,9 @@ def gettext(s): 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'APP_DIRS': True, 'OPTIONS': { + 'builtins': [ + 'django.templatetags.i18n', + ], 'context_processors': [ 'django.contrib.auth.context_processors.auth', 'django.template.context_processors.debug', diff --git a/djangopeople/urls.py b/djangopeople/urls.py index 12e1e36..57d1ff3 100644 --- a/djangopeople/urls.py +++ b/djangopeople/urls.py @@ -6,14 +6,11 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.http import HttpResponse, HttpResponseGone from django.shortcuts import redirect -from django.template.base import add_to_builtins from .django_openidauth import views as django_openidauth_views from .django_openidconsumer import views as django_openidconsumer_views from .djangopeople import views, api -add_to_builtins('django.templatetags.i18n') - def perm_redirect(url): return lambda req: redirect(url, permanent=True) @@ -31,7 +28,7 @@ def gone(request): return HttpResponseGone() urlpatterns = [ - url(r'^admin/', include(admin.site.urls), name='admin'), + url(r'^admin/', admin.site.urls), url(r'^$', views.index, name='index'), url(r'^login/$', auth_views.login, {'template_name': 'login.html'}, name='login'), diff --git a/requirements.txt b/requirements.txt index f222b7a..8dbd091 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.8.14 +Django==1.9.8 boto==2.42.0 dj-database-url==0.4.1 django-classy-tags==0.7.2