diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-11-06 23:53:13 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-11-06 23:53:13 +0000 |
| commit | 371f63c210ffd015cdaddba2dc5463f78051be4e (patch) | |
| tree | 3e2ae0152a35194d3fc22ff8528f31287739a3f5 | |
| parent | d4df074d418ce61b9fca3df7ce887e7a5f54b01f (diff) | |
Fixed #742 -- Implemented 't' dateformat. Thanks, radek.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/utils/dateformat.py | 8 | ||||
| -rw-r--r-- | docs/templates.txt | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index 9913c3f8c4..4e5f2bc8c0 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -13,7 +13,7 @@ Usage: from django.utils.dates import MONTHS, MONTHS_AP, WEEKDAYS from django.utils.tzinfo import LocalTimezone -from calendar import isleap +from calendar import isleap, monthrange import re, time re_formatchars = re.compile(r'(?<!\\)([aABdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])') @@ -124,10 +124,6 @@ class DateFormat(TimeFormat): def I(self): "'1' if Daylight Savings Time, '0' otherwise." - raise NotImplementedError - - def I(self): - "'1' if Daylight Savings Time, '0' otherwise." if self.timezone.dst(self.data): return '1' else: @@ -185,7 +181,7 @@ class DateFormat(TimeFormat): def t(self): "Number of days in the given month; i.e. '28' to '31'" - raise NotImplementedError + return '%02d' % monthrange(self.data.year, self.data.month)[1] def T(self): "Time zone of this machine; e.g. 'EST' or 'MDT'" diff --git a/docs/templates.txt b/docs/templates.txt index 955922811b..53bd431e96 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -552,7 +552,7 @@ Available format strings: s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` month, 2 characters. - t Not implemented. + t Number of days in the given month. ``28`` to ``31`` T Time zone of this machine. ``'EST'``, ``'MDT'`` U Not implemented. w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday) |