summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Garcia <garcia.marc@gmail.com>2009-08-16 19:57:19 +0000
committerMarc Garcia <garcia.marc@gmail.com>2009-08-16 19:57:19 +0000
commit1d5aad87f4cd4ccffd24fffe25d6fa6be0bfbdf4 (patch)
tree169a3cc0c0bb13788e70c790d10ec6d14d0371b8
parenta7beb20bf02b93b3beb6d694d888c904be9bc9ea (diff)
[soc2009/i18n] locales updated for da, de, nl, ka and ko.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/locale/da/formats.py28
-rw-r--r--django/conf/locale/de/formats.py24
-rw-r--r--django/conf/locale/ka/formats.py52
-rw-r--r--django/conf/locale/ko/formats.py44
-rw-r--r--django/conf/locale/nl/formats.py54
5 files changed, 152 insertions, 50 deletions
diff --git a/django/conf/locale/da/formats.py b/django/conf/locale/da/formats.py
index bc80c6d6dd..9982014cba 100644
--- a/django/conf/locale/da/formats.py
+++ b/django/conf/locale/da/formats.py
@@ -2,17 +2,25 @@
# This file is distributed under the same license as the Django package.
#
-DATE_FORMAT = 'j. M Y'
-TIME_FORMAT = 'H.i.s'
-# DATETIME_FORMAT =
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'H:i'
+DATETIME_FORMAT = 'j. F Y H:i'
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F'
-SHORT_DATE_FORMAT = 'd/m/Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+FIRST_DAY_OF_WEEK = 1
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', # '25.10.2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
+ '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
+)
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/de/formats.py b/django/conf/locale/de/formats.py
index aab1c86167..89b57846b6 100644
--- a/django/conf/locale/de/formats.py
+++ b/django/conf/locale/de/formats.py
@@ -9,10 +9,24 @@ YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'd.m.Y'
SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
-# FIRST_DAY_OF_WEEK =
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06'
+ '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25'
+ '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%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'
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+)
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/ka/formats.py b/django/conf/locale/ka/formats.py
index da37b4d06f..665a73fcfc 100644
--- a/django/conf/locale/ka/formats.py
+++ b/django/conf/locale/ka/formats.py
@@ -2,17 +2,41 @@
# This file is distributed under the same license as the Django package.
#
-DATE_FORMAT = 'Y F j'
-TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
-# MONTH_DAY_FORMAT =
-SHORT_DATE_FORMAT = 'Y M j'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
-DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+DATE_FORMAT = 'l, j F, Y'
+TIME_FORMAT = 'h:i:s a'
+DATETIME_FORMAT = 'j F, Y h:i:s a'
+YEAR_MONTH_FORMAT = 'F, Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j.M.Y'
+SHORT_DATETIME_FORMAT = 'j.M.Y H:i:s'
+FIRST_DAY_OF_WEEK = 1 # (Monday)
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%d %b %Y', '%d %b, %Y', '%d %b. %Y', # '25 Oct 2006', '25 Oct, 2006', '25 Oct. 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+ '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06'
+)
+TIME_INPUT_FORMATS = (
+ '%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'
+ '%Y-%m-%d', # '2006-10-25'
+ '%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', # '25.10.06'
+ '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
+ '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
+ '%m/%d/%y %H:%M', # '10/25/06 14:30'
+ '%m/%d/%y', # '10/25/06'
+)
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = " "
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/ko/formats.py b/django/conf/locale/ko/formats.py
index 51986c7910..619047dae0 100644
--- a/django/conf/locale/ko/formats.py
+++ b/django/conf/locale/ko/formats.py
@@ -4,15 +4,41 @@
DATE_FORMAT = 'Y년 n월 j일'
TIME_FORMAT = 'A g:i:s'
-DATETIME_FORMAT = 'Y년 n월 j일A g:i:s'
-YEAR_MONTH_FORMAT = 'Y년 F'
-MONTH_DAY_FORMAT = 'F j일'
-SHORT_DATE_FORMAT = 'Y. n. j.'
-SHORT_DATETIME_FORMAT = 'Y. n. j. A g:i:s'
+DATETIME_FORMAT = 'Y년 n월 j일 g:i:s A'
+YEAR_MONTH_FORMAT = 'Y년 F월'
+MONTH_DAY_FORMAT = 'F월 j일'
+SHORT_DATE_FORMAT = 'Y-n-j.'
+SHORT_DATETIME_FORMAT = 'Y-n-j H:i'
# FIRST_DAY_OF_WEEK =
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+ '%Y년 %m월 %d일', # '2006년 10월 25일', with localized suffix.
+)
+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'
+ '%Y-%m-%d', # '2006-10-25'
+ '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
+ '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
+ '%m/%d/%y %H:%M', # '10/25/06 14:30'
+ '%m/%d/%y', # '10/25/06'
+
+ '%Y년 %m월 %d일 %H시 %M분 %S초', # '2006년 10월 25일 14시 30분 59초'
+ '%Y년 %m월 %d일 %H시 %M분', # '2006년 10월 25일 14시 30분'
+)
+
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/nl/formats.py b/django/conf/locale/nl/formats.py
index 3fdf4d631a..dcef8c1eb7 100644
--- a/django/conf/locale/nl/formats.py
+++ b/django/conf/locale/nl/formats.py
@@ -2,17 +2,47 @@
# This file is distributed under the same license as the Django package.
#
-DATE_FORMAT = 'j F Y'
-TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-YEAR_MONTH_FORMAT = 'F Y'
-MONTH_DAY_FORMAT = 'j F'
-SHORT_DATE_FORMAT = 'j M Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
-# DATE_INPUT_FORMATS =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_FORMAT = 'j F Y' # '20 januari 2009'
+TIME_FORMAT = 'H:i' # '15:23'
+DATETIME_FORMAT = 'j F Y H:i' # '20 januari 2009 15:23'
+YEAR_MONTH_FORMAT = 'F Y' # 'januari 2009'
+MONTH_DAY_FORMAT = 'j F' # '20 januari'
+SHORT_DATE_FORMAT = 'j-n-Y' # '20-1-2009'
+SHORT_DATETIME_FORMAT = 'j-n-Y H:i' # '20-1-2009 15:23'
+FIRST_DAY_OF_WEEK = 1 # Monday (in Dutch 'maandag')
+DATE_INPUT_FORMATS = (
+ '%d-%m-%Y', '%d-%m-%y', '%Y-%m-%d', # '20-01-2009', '20-01-09', '2009-01-20'
+ '%d %b %Y', '%d %b %y', # '20 jan 2009', '20 jan 09'
+ '%d %B %Y', '%d %B %y', # '20 januari 2009', '20 januari 09'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '15:23:35'
+ '%H.%M:%S', # '15.23:35'
+ '%H.%M', # '15.23'
+ '%H:%M', # '15:23'
+)
+DATETIME_INPUT_FORMATS = (
+ # With time in %H:%M:%S :
+ '%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S', # '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35'
+ '%d %b %Y %H:%M:%S', '%d %b %y %H:%M:%S', # '20 jan 2009 15:23:35', '20 jan 09 15:23:35'
+ '%d %B %Y %H:%M:%S', '%d %B %y %H:%M:%S', # '20 januari 2009 15:23:35', '20 januari 2009 15:23:35'
+ # With time in %H.%M:%S :
+ '%d-%m-%Y %H.%M:%S', '%d-%m-%y %H.%M:%S', # '20-01-2009 15.23:35', '20-01-09 15.23:35'
+ '%d %b %Y %H.%M:%S', '%d %b %y %H.%M:%S', # '20 jan 2009 15.23:35', '20 jan 09 15.23:35'
+ '%d %B %Y %H.%M:%S', '%d %B %y %H.%M:%S', # '20 januari 2009 15.23:35', '20 januari 2009 15.23:35'
+ # With time in %H:%M :
+ '%d-%m-%Y %H:%M', '%d-%m-%y %H:%M', '%Y-%m-%d %H:%M', # '20-01-2009 15:23', '20-01-09 15:23', '2009-01-20 15:23'
+ '%d %b %Y %H:%M', '%d %b %y %H:%M', # '20 jan 2009 15:23', '20 jan 09 15:23'
+ '%d %B %Y %H:%M', '%d %B %y %H:%M', # '20 januari 2009 15:23', '20 januari 2009 15:23'
+ # With time in %H.%M :
+ '%d-%m-%Y %H.%M', '%d-%m-%y %H.%M', # '20-01-2009 15.23', '20-01-09 15.23'
+ '%d %b %Y %H.%M', '%d %b %y %H.%M', # '20 jan 2009 15.23', '20 jan 09 15.23'
+ '%d %B %Y %H.%M', '%d %B %y %H.%M', # '20 januari 2009 15.23', '20 januari 2009 15.23'
+ # Without time :
+ '%d-%m-%Y', '%d-%m-%y', '%Y-%m-%d', # '20-01-2009', '20-01-09', '2009-01-20'
+ '%d %b %Y', '%d %b %y', # '20 jan 2009', '20 jan 09'
+ '%d %B %Y', '%d %B %y', # '20 januari 2009', '20 januari 2009'
+)
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3