Merge branch 'masse-salariale' into dev

[auf_rh_dae.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 6be7ea5..f0601e9 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -19,13 +19,12 @@ TIME_ZONE = 'America/Montreal'
 DATE_FORMAT = 'd-m-Y'
 DATE_INPUT_FORMATS = (
     '%d-%m-%Y', '%d/%m/%Y', '%d %m %Y',
 DATE_FORMAT = 'd-m-Y'
 DATE_INPUT_FORMATS = (
     '%d-%m-%Y', '%d/%m/%Y', '%d %m %Y',

-    '%d-%m-%y', '%d/%m/%y', '%d %m %y',

 )
 )

+SHORT_DATE_FORMAT = 'd-m-Y'

 
 SESSION_SAVE_EVERY_REQUEST = True
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 
 
 SESSION_SAVE_EVERY_REQUEST = True
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 

-SHORT_DATE_FORMAT = 'd-m-Y'

 LANGUAGE_CODE = 'fr-ca'
 USE_L10N = True
 USE_THOUSAND_SEPARATOR = True
 LANGUAGE_CODE = 'fr-ca'
 USE_L10N = True
 USE_THOUSAND_SEPARATOR = True