Commit cf6b26d7 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[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
parent cc1a41f3

django/conf/global_settings.py

+7 −7
Original line number Diff line number Diff line
@@ -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