Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.4.X] Fixed #16941 - Clarified naturaltime output when the time is …

…more than a day old.

Thanks antoviaque for the patch.
Backport of 07e10fb from master
  • Loading branch information...
commit d1ae3c899f9284beba43ae2c82c42a5feeabdda1 1 parent 445b966
Tim Graham authored August 02, 2012

Showing 1 changed file with 5 additions and 4 deletions. Show diff stats Hide diff stats

  1. 9  docs/ref/contrib/humanize.txt
9  docs/ref/contrib/humanize.txt
@@ -103,9 +103,9 @@ naturaltime
103 103
 .. versionadded:: 1.4
104 104
 
105 105
 For datetime values, returns a string representing how many seconds,
106  
-minutes or hours ago it was -- falling back to a longer date format if the
107  
-value is more than a day old. In case the datetime value is in the future
108  
-the return value will automatically use an appropriate phrase.
  106
+minutes or hours ago it was -- falling back to the :tfilter:`timesince` 
  107
+format if the value is more than a day old. In case the datetime value is in
  108
+the future the return value will automatically use an appropriate phrase.
109 109
 
110 110
 Examples (when 'now' is 17 Feb 2007 16:30:00):
111 111
 
@@ -115,13 +115,14 @@ Examples (when 'now' is 17 Feb 2007 16:30:00):
115 115
 * ``17 Feb 2007 16:25:35`` becomes ``4 minutes ago``.
116 116
 * ``17 Feb 2007 15:30:29`` becomes ``an hour ago``.
117 117
 * ``17 Feb 2007 13:31:29`` becomes ``2 hours ago``.
118  
-* ``16 Feb 2007 13:31:29`` becomes ``1 day ago``.
  118
+* ``16 Feb 2007 13:31:29`` becomes ``1 day, 3 hours ago``.
119 119
 * ``17 Feb 2007 16:30:30`` becomes ``29 seconds from now``.
120 120
 * ``17 Feb 2007 16:31:00`` becomes ``a minute from now``.
121 121
 * ``17 Feb 2007 16:34:35`` becomes ``4 minutes from now``.
122 122
 * ``17 Feb 2007 16:30:29`` becomes ``an hour from now``.
123 123
 * ``17 Feb 2007 18:31:29`` becomes ``2 hours from now``.
124 124
 * ``18 Feb 2007 16:31:29`` becomes ``1 day from now``.
  125
+* ``26 Feb 2007 18:31:29`` becomes ``1 week, 2 days from now``.
125 126
 
126 127
 .. templatefilter:: ordinal
127 128
 

0 notes on commit d1ae3c8

Please sign in to comment.
Something went wrong with that request. Please try again.