Merge branch 'master' into Kerl/clean_staticfiles

cof/locale/fr/formats.py

@@ -6,4 +6,4 @@ Formats français.
 
 from __future__ import unicode_literals
 
-DATETIME_FORMAT = r'j F Y \à H:i'
+DATETIME_FORMAT = r'l j F Y \à H:i'

cof/urls.py

@@ -1,24 +1,27 @@
 # -*- coding: utf-8 -*-
 
+"""
+Fichier principal de configuration des urls du projet GestioCOF
+"""
+
 from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import autocomplete_light
+
 from django.conf import settings
 from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import TemplateView
-
-import autocomplete_light
-
 from django.contrib.auth import views as django_views
 from django_cas_ng import views as django_cas_views
+
 from gestioncof import views as gestioncof_views, csv_views
 from gestioncof.urls import export_patterns, petitcours_patterns, \
     surveys_patterns, events_patterns, calendar_patterns, \
     clubs_patterns
-
 from gestioncof.autocomplete import autocomplete
 
 autocomplete_light.autodiscover()
@@ -92,4 +95,5 @@ if settings.DEBUG:
 
     # Si on est en production, MEDIA_ROOT est servi par Apache.
     # Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += static(settings.MEDIA_URL,
+                          document_root=settings.MEDIA_ROOT)