Fixed #12868 - Updated French format file. Thanks stephaner and claudep.

Refs #11637.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12455 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 25 insertions, 7 deletions

diff --git a/django/conf/locale/fr/formats.py b/django/conf/locale/fr/formats.py
index 1d670d7f6a..ebd76466a2 100644
--- a/django/conf/locale/fr/formats.py
+++ b/django/conf/locale/fr/formats.py
@@ -7,12 +7,30 @@ TIME_FORMAT = 'H:i:s'
 DATETIME_FORMAT = 'j F Y H:i:s'
 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 = 
-# DATE_INPUT_FORMATS = 
-# TIME_INPUT_FORMATS = 
-# DATETIME_INPUT_FORMATS = 
+SHORT_DATE_FORMAT = 'j N Y'
+SHORT_DATETIME_FORMAT = 'j N Y H:i:s'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+    '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
+    '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '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 octobre 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'
+    '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30'
+    '%d.%m.%Y',             # Swiss (fr_CH), '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