Skip to content

Commit

Permalink
Fixed #5869 -- Corrected documentation for now template tag's "r" f…
Browse files Browse the repository at this point in the history
…ormat character. Thanks, xavier.morel@masklinn.net.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
gdub committed Nov 4, 2007
1 parent 2a48fc5 commit 0e59bf4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion django/utils/dateformat.py
Expand Up @@ -170,7 +170,7 @@ def O(self):
return u"%+03d%02d" % (seconds // 3600, (seconds // 60) % 60) return u"%+03d%02d" % (seconds // 3600, (seconds // 60) % 60)


def r(self): def r(self):
"RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'" "RFC 2822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
return self.format('D, j M Y H:i:s O') return self.format('D, j M Y H:i:s O')


def S(self): def S(self):
Expand Down
2 changes: 1 addition & 1 deletion docs/templates.txt
Expand Up @@ -740,7 +740,7 @@ Available format strings:
if they're zero and the special-case if they're zero and the special-case
strings 'midnight' and 'noon' if strings 'midnight' and 'noon' if
appropriate. Proprietary extension. appropriate. Proprietary extension.
r RFC 822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'`` r RFC 2822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
month, 2 characters. month, 2 characters.
Expand Down

0 comments on commit 0e59bf4

Please sign in to comment.