Index: regressiontests/humanize/__init__.py
===================================================================
Index: regressiontests/humanize/tests.py
===================================================================
--- regressiontests/humanize/tests.py	(revision 0)
+++ regressiontests/humanize/tests.py	(revision 0)
@@ -0,0 +1,45 @@
+# Quick tests for the humanize templatefilters (django.contrib.humanize)
+
+from django.template import Template, Context, add_to_builtins
+from django.conf import settings
+from django.utils.dateformat import DateFormat
+from django.utils.translation import gettext as _
+from datetime import timedelta, date
+import unittest
+
+add_to_builtins('django.contrib.humanize.templatetags.humanize')
+
+class TemplateTest(unittest.TestCase):
+    def test_naturalday(self):
+        
+        today = date.today()
+        yesterday = today - timedelta(days=1)
+        tomorrow = today + timedelta(days=1)
+        someday = today - timedelta(days=10)
+        notdate = "I'm not a date value"
+
+        t_today = Template('{{ today|naturalday }}')
+        t_tomorrow = Template('{{ tomorrow|naturalday }}')
+        t_yesterday = Template('{{ yesterday|naturalday }}')
+        t_someday = Template('{{ someday|naturalday }}')
+        t_someday_custom = Template('{{ someday|naturalday:"d.m.Y" }}')
+        t_notdate = Template('{{ notdate|naturalday }}')
+
+        rendered_today = t_today.render(Context(locals())).strip()
+        self.assertEqual(rendered_today, _('today'))
+
+        rendered_yesterday = t_yesterday.render(Context(locals())).strip()
+        self.assertEqual(rendered_yesterday, _('yesterday'))
+
+        rendered_tomorrow = t_tomorrow.render(Context(locals())).strip()
+        self.assertEqual(rendered_tomorrow, _('tomorrow'))
+
+        rendered_someday = t_someday.render(Context(locals())).strip()
+        self.assertEqual(rendered_someday, DateFormat(someday).format(settings.DATE_FORMAT))
+
+        rendered_someday_custom = t_someday_custom.render(Context(locals())).strip()
+        self.assertEqual(rendered_someday_custom, DateFormat(someday).format('d.m.Y'))
+
+        rendered_notdate = t_notdate.render(Context(locals())).strip()
+        self.assertEqual(rendered_notdate, "I'm not a date value")
+        
Index: regressiontests/humanize/models.py
===================================================================
--- regressiontests/humanize/models.py	(revision 0)
+++ regressiontests/humanize/models.py	(revision 0)
@@ -0,0 +1 @@
+