mirror of https://github.com/django/django.git
[1.5.x] Fixed #19092 -- Completed Lithuanian date/time formats
Thanks Tadas Dailyda for the report and the patch.
Backport of 2f8ab2f1b0
from master.
This commit is contained in:
parent
9d4f906d47
commit
5a53f1043c
|
@ -1,23 +1,42 @@
|
||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
# This file is distributed under the same license as the Django package.
|
# This file is distributed under the same license as the Django package.
|
||||||
#
|
#
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
# 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'Y \m. F j \d.'
|
DATE_FORMAT = r'Y \m. E j \d.'
|
||||||
TIME_FORMAT = 'H:i:s'
|
TIME_FORMAT = 'H:i:s'
|
||||||
# DATETIME_FORMAT =
|
DATETIME_FORMAT = r'Y \m. E j \d., H:i:s'
|
||||||
# YEAR_MONTH_FORMAT =
|
YEAR_MONTH_FORMAT = r'Y \m. F'
|
||||||
# MONTH_DAY_FORMAT =
|
MONTH_DAY_FORMAT = r'E j \d.'
|
||||||
SHORT_DATE_FORMAT = 'Y.m.d'
|
SHORT_DATE_FORMAT = 'Y-m-d'
|
||||||
# SHORT_DATETIME_FORMAT =
|
SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
|
||||||
# FIRST_DAY_OF_WEEK =
|
FIRST_DAY_OF_WEEK = 1 # Monday
|
||||||
|
|
||||||
# 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 = (
|
||||||
# TIME_INPUT_FORMATS =
|
'%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
|
||||||
# DATETIME_INPUT_FORMATS =
|
)
|
||||||
|
TIME_INPUT_FORMATS = (
|
||||||
|
'%H:%M:%S', # '14:30:59'
|
||||||
|
'%H:%M', # '14:30'
|
||||||
|
'%H.%M.%S', # '14.30.59'
|
||||||
|
'%H.%M', # '14.30'
|
||||||
|
)
|
||||||
|
DATETIME_INPUT_FORMATS = (
|
||||||
|
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
|
||||||
|
'%Y-%m-%d %H:%M', # '2006-10-25 14:30'
|
||||||
|
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
|
||||||
|
'%d.%m.%Y %H:%M', # '25.10.2006 14:30'
|
||||||
|
'%d.%m.%Y', # '25.10.2006'
|
||||||
|
'%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
|
||||||
|
'%d.%m.%y %H:%M', # '25.10.06 14:30'
|
||||||
|
'%d.%m.%y %H.%M.%S', # '25.10.06 14.30.59'
|
||||||
|
'%d.%m.%y %H.%M', # '25.10.06 14.30'
|
||||||
|
'%d.%m.%y', # '25.10.06'
|
||||||
|
)
|
||||||
DECIMAL_SEPARATOR = ','
|
DECIMAL_SEPARATOR = ','
|
||||||
THOUSAND_SEPARATOR = '.'
|
THOUSAND_SEPARATOR = '.'
|
||||||
# NUMBER_GROUPING =
|
NUMBER_GROUPING = 3
|
||||||
|
|
Loading…
Reference in New Issue