diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 12 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index b8d4d06e58..a95a956234 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -154,6 +154,18 @@ MEDIA_ROOT = '' # Example: "http://media.lawrence.com" MEDIA_URL = '' +# Default formatting for date objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +DATE_FORMAT = 'N j, Y' + +# Default formatting for datetime objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +DATETIME_FORMAT = 'N j, Y, P' + +# Default formatting for time objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +TIME_FORMAT = 'P' + ############## # MIDDLEWARE # ############## diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index b188f58947..c4bbee633f 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -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"' |