From 7ebc34d5aa933d5c8d9c9c19ce26e05478c7a660 Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Wed, 22 Aug 2018 14:04:42 +0200
Subject: [PATCH] date behaviour is correct

---
 event/admin.py            | 6 +-----
 poulpe/settings/common.py | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/event/admin.py b/event/admin.py
index 0902645..9f6a4a8 100644
--- a/event/admin.py
+++ b/event/admin.py
@@ -62,13 +62,9 @@ class ActivityAdmin(admin.ModelAdmin):
     filter_horizontal = ['tags', 'places', ]
     fieldsets = (
             ('Général', {
-                'fields': ('event', 'parent', 'title', 'is_public', 'places', ),
+                'fields': ('event', 'parent', 'title', 'is_public', ('beginning', 'end', ), 'places', ),
                 'description': "Tous ces champs sont héritables (sauf parent et Évènement)",
                 }),
-            ('Champs non-héritables', {
-                'fields': ('parent', ),
-                'description': "Tous ces champs doivent être spécifiés",
-                }),
             ('Permanences', {
                 'fields': ('has_perm', ('min_perm', 'max_perm', ), ),
                 'classes': ('collapse',),
diff --git a/poulpe/settings/common.py b/poulpe/settings/common.py
index 9b982d9..852f5bf 100644
--- a/poulpe/settings/common.py
+++ b/poulpe/settings/common.py
@@ -166,9 +166,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'fr-fr'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Paris'
 
 USE_I18N = True