mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #109 -- Created DATE_FORMAT, DATETIME_FORMAT and TIME_FORMAT settings.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2005-11-06 23:49:03 +00:00
parent 72547994c1
commit d4df074d41
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/views/main.py
View File

@@ -10,7 +10,7 @@ from django.models.admin import log
from django.utils.html import strip_tags
from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect
from django.utils.text import capfirst, get_text_list
from django.conf.settings import ADMIN_MEDIA_PREFIX
from django.conf.settings import ADMIN_MEDIA_PREFIX, DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT
import operator
# Text to display within changelist table cells if the value is blank.
@@ -401,13 +401,15 @@ def change_list(request, app_label, module_name):
result_repr = getattr(result, 'get_%s' % f.name)()
else:
result_repr = EMPTY_CHANGELIST_VALUE
# Dates are special: They're formatted in a certain way.
elif isinstance(f, meta.DateField):
# Dates and times are special: They're formatted in a certain way.
elif isinstance(f, meta.DateField) or isinstance(f, meta.TimeField):
if field_val:
if isinstance(f, meta.DateTimeField):
result_repr = dateformat.format(field_val, 'N j, Y, P')
result_repr = capfirst(dateformat.format(field_val, DATETIME_FORMAT))
elif isinstance(f, meta.TimeField):
result_repr = capfirst(dateformat.time_format(field_val, TIME_FORMAT))
else:
result_repr = dateformat.format(field_val, 'N j, Y')
result_repr = capfirst(dateformat.format(field_val, DATE_FORMAT))
else:
result_repr = EMPTY_CHANGELIST_VALUE
row_class = ' class="nowrap"'