Context Navigation

Ticket #18608: 18608.diff

File 18608.diff, 1.9 KB (added by Claude Paroz, 12 years ago)

diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
index 7a2e514..1398b43 100644

                def naturaltime(value):
         if delta.days != 0:
             return pgettext(
                 'naturaltime', '%(delta)s ago'
             ) % {'delta': defaultfilters.timesince(value)}
+            ) % {'delta': defaultfilters.timesince(value, now)}
         elif delta.seconds == 0:
             return _('now')
         elif delta.seconds < 60:
-…
+               def naturaltime(value):
         if delta.days != 0:
             return pgettext(
                 'naturaltime', '%(delta)s from now'
             ) % {'delta': defaultfilters.timeuntil(value)}
+            ) % {'delta': defaultfilters.timeuntil(value, now)}
         elif delta.seconds == 0:
             return _('now')
         elif delta.seconds < 60:

diff --git a/django/contrib/humanize/tests.py b/django/contrib/humanize/tests.py
index ecf4b83..a2b141e 100644

                class HumanizeTests(TestCase):
             def utcoffset(self, dt):
                 return None
         # we're going to mock datetime.datetime, so use a fixed datetime
         now = datetime.datetime(2011, 8, 15)
+        now = datetime.datetime(2011, 8, 15, 1, 23)
         test_list = [
             now,
             now - datetime.timedelta(seconds=1),
-…
+               class HumanizeTests(TestCase):
         orig_humanize_datetime = humanize.datetime
         orig_timesince_datetime = timesince.datetime
         humanize.datetime = MockDateTime
-        timesince.datetime = new.module(b"mock_datetime")
-        timesince.datetime.datetime = MockDateTime
         try:
             self.humanize_tester(test_list, result_list, 'naturaltime')