mirror of https://github.com/django/django.git
Fixed #16349 -- Fixed Brazilian localization formats. Thanks, Claude Paroz, semente and Guiljerme Gondim.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
16bb9c594c
commit
414c762c3a
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
# The *_FORMAT strings use the Django date format syntax,
|
# The *_FORMAT strings use the Django date format syntax,
|
||||||
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
|
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
|
||||||
DATE_FORMAT = r'j \de N \de Y'
|
DATE_FORMAT = r'j \de F \de Y'
|
||||||
TIME_FORMAT = 'H:i'
|
TIME_FORMAT = 'H:i'
|
||||||
DATETIME_FORMAT = r'j \de N \de Y à\s H:i'
|
DATETIME_FORMAT = r'j \de F \de Y à\s H:i'
|
||||||
YEAR_MONTH_FORMAT = r'F \de Y'
|
YEAR_MONTH_FORMAT = r'F \de Y'
|
||||||
MONTH_DAY_FORMAT = r'j \de F'
|
MONTH_DAY_FORMAT = r'j \de F'
|
||||||
SHORT_DATE_FORMAT = 'd/m/Y'
|
SHORT_DATE_FORMAT = 'd/m/Y'
|
||||||
|
@ -16,7 +16,7 @@ FIRST_DAY_OF_WEEK = 0 # Sunday
|
||||||
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
|
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
|
||||||
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
|
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
|
||||||
DATE_INPUT_FORMATS = (
|
DATE_INPUT_FORMATS = (
|
||||||
'%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
|
'%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d', # '25/10/2006', '25/10/06', '2006-10-25'
|
||||||
# '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006'
|
# '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006'
|
||||||
# '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006'
|
# '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006'
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue