Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit b40f21e51c488a25c2374064ab5ebbe11ed4c3bc 1 parent eaa17e1
Jannis Leidel authored February 21, 2010

Showing 1 changed file with 25 additions and 7 deletions. Show diff stats Hide diff stats

  1. 32  django/conf/locale/fr/formats.py
32  django/conf/locale/fr/formats.py
@@ -7,12 +7,30 @@
7 7
 DATETIME_FORMAT = 'j F Y H:i:s'
8 8
 YEAR_MONTH_FORMAT = 'F Y'
9 9
 MONTH_DAY_FORMAT = 'j F'
10  
-SHORT_DATE_FORMAT = 'j M Y'
11  
-SHORT_DATETIME_FORMAT = 'j M Y H:i:s'
12  
-# FIRST_DAY_OF_WEEK = 
13  
-# DATE_INPUT_FORMATS = 
14  
-# TIME_INPUT_FORMATS = 
15  
-# DATETIME_INPUT_FORMATS = 
  10
+SHORT_DATE_FORMAT = 'j N Y'
  11
+SHORT_DATETIME_FORMAT = 'j N Y H:i:s'
  12
+FIRST_DAY_OF_WEEK = 1 # Monday
  13
+DATE_INPUT_FORMATS = (
  14
+    '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
  15
+    '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '25.10.2006', '25.10.06'
  16
+    '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25'
  17
+    '%d %B %Y', '%d %b %Y', # '25 octobre 2006', '25 oct. 2006'
  18
+)
  19
+TIME_INPUT_FORMATS = (
  20
+    '%H:%M:%S', # '14:30:59'
  21
+    '%H:%M',    # '14:30'
  22
+)
  23
+DATETIME_INPUT_FORMATS = (
  24
+    '%d/%m/%Y %H:%M:%S',    # '25/10/2006 14:30:59'
  25
+    '%d/%m/%Y %H:%M',       # '25/10/2006 14:30'
  26
+    '%d/%m/%Y',             # '25/10/2006'
  27
+    '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59'
  28
+    '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30'
  29
+    '%d.%m.%Y',             # Swiss (fr_CH), '25.10.2006'
  30
+    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
  31
+    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
  32
+    '%Y-%m-%d',             # '2006-10-25'
  33
+)
16 34
 DECIMAL_SEPARATOR = ','
17 35
 THOUSAND_SEPARATOR = ' '
18  
-# NUMBER_GROUPING = 
  36
+NUMBER_GROUPING = 3

0 notes on commit b40f21e

Please sign in to comment.
Something went wrong with that request. Please try again.