From cf6b26d7a2e7fd3384e01a68102f6649e6ad6abc Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 11 Oct 2010 22:35:24 +0000 Subject: [PATCH] [1.2.X] Fixed links to the date formats choices in the global settings. Thanks, Russell. Backport from trunk (r14032). git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14158 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 2714bfb9ab..e86f1055f5 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -292,34 +292,34 @@ FILE_UPLOAD_PERMISSIONS = None FORMAT_MODULE_PATH = None # Default formatting for date objects. See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' # Default formatting for datetime objects. See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATETIME_FORMAT = 'N j, Y, P' # Default formatting for time objects. See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date TIME_FORMAT = 'P' # Default formatting for date objects when only the year and month are relevant. # See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date YEAR_MONTH_FORMAT = 'F Y' # Default formatting for date objects when only the month and day are relevant. # See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date MONTH_DAY_FORMAT = 'F j' # Default short formatting for date objects. See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date SHORT_DATE_FORMAT = 'm/d/Y' # Default short formatting for datetime objects. # See all available format strings here: -# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date SHORT_DATETIME_FORMAT = 'm/d/Y P' # Default formats to be used when parsing dates from input boxes, in order