From 48f6ee11079d65f991597fead0e075358fc0dff6 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Mon, 4 Jun 2012 16:22:00 -0400
Subject: [PATCH] Django 1.4 and naturaltime

---
 blogs/templates/blogs/themes/default/snipt-list.html | 2 +-
 settings.py                                          | 5 ++---
 snipts/templates/snipts/snipt-list.html              | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/blogs/templates/blogs/themes/default/snipt-list.html b/blogs/templates/blogs/themes/default/snipt-list.html
index e0618c4..ff00687 100644
--- a/blogs/templates/blogs/themes/default/snipt-list.html
+++ b/blogs/templates/blogs/themes/default/snipt-list.html
@@ -5,5 +5,5 @@
 {% block author %}{% endblock %}
 
 {% block extra-snipt-header %}
-    <h3>{{ snipt.publish_date|naturalday }}</h3>
+    <h3>{{ snipt.publish_date|naturaltime }}</h3>
 {% endblock %}
diff --git a/settings.py b/settings.py
index aa6cb0a..5e04318 100644
--- a/settings.py
+++ b/settings.py
@@ -101,7 +101,7 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.Loader',
 )
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',
+    'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
@@ -110,10 +110,9 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 MIDDLEWARE_CLASSES = (
+    'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfResponseMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'pagination.middleware.PaginationMiddleware',
diff --git a/snipts/templates/snipts/snipt-list.html b/snipts/templates/snipts/snipt-list.html
index 33c8a8e..da828ed 100644
--- a/snipts/templates/snipts/snipt-list.html
+++ b/snipts/templates/snipts/snipt-list.html
@@ -81,9 +81,9 @@
                 </li>
             {% endblock %}
             {% if snipt.blog_post %}
-                <li class="created" title="{{ snipt.publish_date|date:"Y-m-d\TH:i:s" }}">{{ snipt.publish_date|naturalday }}</li>
+                <li class="created" title="{{ snipt.publish_date|date:"Y-m-d\TH:i:s" }}">{{ snipt.publish_date|naturaltime }}</li>
             {% else %}
-                <li class="created" title="{{ snipt.created|date:"Y-m-d\TH:i:s" }}">{{ snipt.created|naturalday }}</li>
+                <li class="created" title="{{ snipt.created|date:"Y-m-d\TH:i:s" }}">{{ snipt.created|naturaltime }}</li>
             {% endif %}
             <li class="comments"><a href="{{ snipt.get_full_absolute_url }}#disqus_thread" data-disqus-identifier="{{ snipt.pk }}"></a></li>
         </ul>