summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-15 13:39:41 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-15 13:49:21 +0100
commit5a53f1043cc86feef82864e4f5a57de78d57664b (patch)
tree76f0129d905996b40d4d856ed1588319c4a60ed4
parent9d4f906d47d9e0a589cf21c63b9a1f2bcdfd54b5 (diff)
[1.5.x] Fixed #19092 -- Completed Lithuanian date/time formats
Thanks Tadas Dailyda for the report and the patch. Backport of 2f8ab2f1b0 from master.
-rw-r--r--django/conf/locale/lt/formats.py41
1 files changed, 30 insertions, 11 deletions
diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py
index c28600b6d6..d5b01abea2 100644
--- a/django/conf/locale/lt/formats.py
+++ b/django/conf/locale/lt/formats.py
@@ -1,23 +1,42 @@
# -*- encoding: utf-8 -*-
# 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,
# 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'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
-# MONTH_DAY_FORMAT =
-SHORT_DATE_FORMAT = 'Y.m.d'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+DATETIME_FORMAT = r'Y \m. E j \d., H:i:s'
+YEAR_MONTH_FORMAT = r'Y \m. F'
+MONTH_DAY_FORMAT = r'E j \d.'
+SHORT_DATE_FORMAT = 'Y-m-d'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
+FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
+)
+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 = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3