From 4538597dafc8420ff090eb1ba9ff93f0df2b1b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Sun, 30 Jul 2017 20:11:13 +0200
Subject: [PATCH] staff: conference configuration

---
 accounts/mixins.py                      |  12 +-
 cfp/forms.py                            |  14 +-
 cfp/mixins.py                           |   8 +
 cfp/models.py                           |  12 +-
 cfp/templates/cfp/staff/base.html       |   1 +
 cfp/templates/cfp/staff/conference.html |  26 +++
 cfp/urls.py                             |   2 +
 cfp/views.py                            |  23 ++-
 locale/fr/LC_MESSAGES/django.mo         | Bin 17629 -> 18100 bytes
 locale/fr/LC_MESSAGES/django.po         | 251 ++++++++++++++----------
 ponyconf/settings.py                    |  11 +-
 requirements.txt                        |   1 +
 12 files changed, 240 insertions(+), 121 deletions(-)
 create mode 100644 cfp/mixins.py
 create mode 100644 cfp/templates/cfp/staff/conference.html

diff --git a/accounts/mixins.py b/accounts/mixins.py
index d1a5689..bc70111 100644
--- a/accounts/mixins.py
+++ b/accounts/mixins.py
@@ -1,18 +1,8 @@
 from django.contrib.auth.mixins import UserPassesTestMixin
 
-from .utils import is_orga, is_staff
-
-
-class OrgaRequiredMixin(UserPassesTestMixin):
-    def test_func(self):
-        return is_orga(self.request, self.request.user)
+from .utils import is_staff
 
 
 class StaffRequiredMixin(UserPassesTestMixin):
     def test_func(self):
         return is_staff(self.request, self.request.user)
-
-
-class SuperuserRequiredMixin(UserPassesTestMixin):
-    def test_func(self):
-        return self.request.user.is_superuser
diff --git a/cfp/forms.py b/cfp/forms.py
index 39249af..ce36d02 100644
--- a/cfp/forms.py
+++ b/cfp/forms.py
@@ -1,7 +1,11 @@
 from django import forms
 from django.forms.models import modelform_factory
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
 
-from .models import Participant, Talk
+from django_select2.forms import ModelSelect2MultipleWidget
+
+from .models import Participant, Talk, Conference
 
 
 class TalkForm(forms.ModelForm):
@@ -19,3 +23,11 @@ class TalkForm(forms.ModelForm):
 
 
 ParticipantForm = modelform_factory(Participant, fields=('name','email', 'biography'))
+
+
+class UsersWidget(ModelSelect2MultipleWidget):
+    model = User
+    search_fields = [ '%s__icontains' % field for field in UserAdmin.search_fields ]
+
+
+ConferenceForm = modelform_factory(Conference, fields=['name', 'home', 'venue', 'city', 'contact_email', 'staff',], widgets={'staff': UsersWidget(),})
diff --git a/cfp/mixins.py b/cfp/mixins.py
new file mode 100644
index 0000000..bc70111
--- /dev/null
+++ b/cfp/mixins.py
@@ -0,0 +1,8 @@
+from django.contrib.auth.mixins import UserPassesTestMixin
+
+from .utils import is_staff
+
+
+class StaffRequiredMixin(UserPassesTestMixin):
+    def test_func(self):
+        return is_staff(self.request, self.request.user)
diff --git a/cfp/models.py b/cfp/models.py
index 514f49e..3edbcab 100644
--- a/cfp/models.py
+++ b/cfp/models.py
@@ -33,12 +33,12 @@ from django.utils.translation import ugettext
 class Conference(models.Model):
 
     site = models.OneToOneField(Site, on_delete=models.CASCADE)
-    name = models.CharField(blank=True, max_length=100)
-    home = models.TextField(blank=True, default="")
-    venue = models.TextField(blank=True, default="")
-    city = models.CharField(max_length=64, blank=True, default="")
-    contact_email = models.CharField(max_length=100, blank=True)
-    staff = models.ManyToManyField(User, verbose_name=_('Staff'), blank=True)
+    name = models.CharField(blank=True, max_length=100, verbose_name=_('Conference name'))
+    home = models.TextField(blank=True, default="", verbose_name=_('Homepage (markdown)'))
+    venue = models.TextField(blank=True, default="", verbose_name=_('Venue information'))
+    city = models.CharField(max_length=64, blank=True, default="", verbose_name=_('City'))
+    contact_email = models.CharField(max_length=100, blank=True, verbose_name=_('Contact email'))
+    staff = models.ManyToManyField(User, blank=True, verbose_name=_('Staff members'))
 
     custom_css = models.TextField(blank=True)
     external_css_link = models.URLField(blank=True)
diff --git a/cfp/templates/cfp/staff/base.html b/cfp/templates/cfp/staff/base.html
index e16abdc..dcf58f2 100644
--- a/cfp/templates/cfp/staff/base.html
+++ b/cfp/templates/cfp/staff/base.html
@@ -17,6 +17,7 @@
       {% endcomment %}
       <li{% block talkstab %}{% endblock %}><a href="{% url 'talk-list' %}"><span class="glyphicon glyphicon-blackboard"></span>&nbsp;{% trans "Talks" %}</a></li>
       <li{% block speakerstab %}{% endblock %}><a href="{% url 'participant-list' %}"><span class="glyphicon glyphicon-bullhorn"></span>&nbsp;{% trans "Speakers" %}</a></li>
+      <li{% block conferencetab %}{% endblock %}><a href="{% url 'conference' %}"><span class="glyphicon glyphicon-asterisk"></span>&nbsp;{% trans "Conference" %}</a></li>
       {% if request.user.is_staff %}
       <li><a href="{% url 'admin:index' %}"><span class="glyphicon glyphicon-dashboard"></span>&nbsp;Django-Admin</a></li>
       {% endif %}
diff --git a/cfp/templates/cfp/staff/conference.html b/cfp/templates/cfp/staff/conference.html
new file mode 100644
index 0000000..a336cb9
--- /dev/null
+++ b/cfp/templates/cfp/staff/conference.html
@@ -0,0 +1,26 @@
+{% extends 'cfp/staff/base.html' %}
+{% load i18n crispy_forms_tags %}
+
+{% block conferencetab %} class="active"{% endblock %}
+
+{% block content %}
+
+<h1>{% trans "Conference" %}</h1>
+
+<form method="POST">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+</form>
+
+{% endblock %}
+
+{% block js_end %}
+{{ block.super }}
+{{ form.media.js }}
+{% endblock %}
+
+{% block css %}
+{{ block.super }}
+{{ form.media.css }}
+{% endblock %}
diff --git a/cfp/urls.py b/cfp/urls.py
index 418d1dd..5cad1d3 100644
--- a/cfp/urls.py
+++ b/cfp/urls.py
@@ -9,6 +9,7 @@ urlpatterns = [
     url(r'^cfp/(?P<talk_id>[\w\-]+)/speaker/(?P<participant_id>[\w\-]+)/$', views.talk_proposal_speaker_edit, name='talk-proposal-speaker-edit'),
     url(r'^cfp/(?P<talk_id>[\w\-]+)/(?P<participant_id>[\w\-]+)/$', views.talk_proposal, name='talk-proposal-edit'),
     url(r'^staff/$', views.staff, name='staff'),
+    url(r'^staff/conference/$', views.conference, name='conference'),
     url(r'^staff/talks/$', views.talk_list, name='talk-list'),
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/$', views.talk_details, name='talk-details'),
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/vote/(?P<score>[-+0-2]+)/$', views.talk_vote, name='talk-vote'),
@@ -16,6 +17,7 @@ urlpatterns = [
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/decline/$', views.talk_decide, {'accept': False}, name='talk-decline'),
     url(r'^staff/speakers/$', views.participant_list, name='participant-list'),
     url(r'^staff/speakers/(?P<participant_id>[\w\-]+)/$', views.participant_details, name='participant-details'),
+    url(r'^staff/select2/$', views.Select2View.as_view(), name='django_select2-json'),
 
     #url(r'^markdown/$', views.markdown_preview, name='markdown'),
     #url(r'^$', views.home, name='home'),
diff --git a/cfp/views.py b/cfp/views.py
index 181504e..22f0fab 100644
--- a/cfp/views.py
+++ b/cfp/views.py
@@ -6,10 +6,13 @@ from django.utils.translation import ugettext_lazy as _
 from django.views.generic import FormView, TemplateView
 from django.contrib import messages
 
+from django_select2.views import AutoResponseView
+
 from cfp.decorators import staff_required
+from .mixins import StaffRequiredMixin
 from .utils import is_staff
 from .models import Participant, Talk, TalkCategory, Vote
-from .forms import TalkForm, ParticipantForm
+from .forms import TalkForm, ParticipantForm, ConferenceForm
 
 
 def home(request, conference):
@@ -193,3 +196,21 @@ def participant_details(request, conference, participant_id):
     return render(request, 'cfp/staff/participant_details.html', {
         'participant': participant,
     })
+
+
+@staff_required
+def conference(request, conference):
+    form = ConferenceForm(request.POST or None, instance=conference)
+
+    if request.method == 'POST' and form.is_valid():
+        form.save()
+        messages.success(request, _('Modifications successfully saved.'))
+        return redirect(reverse('conference'))
+
+    return render(request, 'cfp/staff/conference.html', {
+        'form': form,
+    })
+
+
+class Select2View(StaffRequiredMixin, AutoResponseView):
+    pass
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index f5350e0b11b689720cc6e4cba097425d2b1c8241..5d68ec277ba6b061597ad2459638740505d2da5f 100644
GIT binary patch
delta 6001
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
XZo5z@x4X;buKjSt?9h~vOI*JJ6sWs<

delta 5634
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
Ik9n^D0=sErv;Y7A

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index e89780a..e8c8006 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-30 14:00+0000\n"
+"POT-Creation-Date: 2017-07-30 18:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgstr "Biographie"
 
 #: accounts/templates/accounts/participant_details.html:27
 #: cfp/templates/cfp/staff/base.html:20
-#: cfp/templates/cfp/staff/participant_details.html:32
+#: cfp/templates/cfp/staff/participant_details.html:31
 #: cfp/templates/cfp/staff/talk_list.html:8
 #: proposals/templates/proposals/talk_list.html:9
 msgid "Talks"
@@ -173,7 +173,7 @@ msgid "Constraints"
 msgstr "Contraintes"
 
 #: accounts/templates/accounts/participant_details.html:71 cfp/models.py:87
-#: cfp/templates/cfp/staff/participant_details.html:27
+#: cfp/templates/cfp/staff/participant_details.html:14
 #: cfp/templates/cfp/staff/talk_details.html:92 proposals/models.py:161
 #: proposals/templates/proposals/talk_detail.html:102
 msgid "Notes"
@@ -214,7 +214,8 @@ msgstr "Changer d’avatar"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: accounts/templates/accounts/profile.html:36 ponyconf/templates/_form.html:16
+#: accounts/templates/accounts/profile.html:36
+#: cfp/templates/cfp/staff/talk_decide.html:27 ponyconf/templates/_form.html:16
 #: proposals/templates/proposals/talk_decide.html:23
 msgid "Cancel"
 msgstr "Annuler"
@@ -286,15 +287,35 @@ msgstr "%(name)s a été ajouté aux participants"
 msgid "%(name)s is already a participant"
 msgstr "%(name)s est déjà participant"
 
-#: cfp/models.py:41 ponyconf/templates/base.html:36
-msgid "Staff"
-msgstr ""
+#: cfp/models.py:36
+msgid "Conference name"
+msgstr "Nom de la conférence"
+
+#: cfp/models.py:37
+msgid "Homepage (markdown)"
+msgstr "Page d’accueil (markdown)"
+
+#: cfp/models.py:38
+msgid "Venue information"
+msgstr "Informations sur le lieu"
+
+#: cfp/models.py:39
+msgid "City"
+msgstr "Ville"
+
+#: cfp/models.py:40
+msgid "Contact email"
+msgstr "Email de contact"
+
+#: cfp/models.py:41
+msgid "Staff members"
+msgstr "Membres du staff"
 
 #: cfp/models.py:70
 msgid "Your Name"
 msgstr "Votre Nom"
 
-#: cfp/models.py:87 cfp/templates/cfp/staff/participant_details.html:28
+#: cfp/models.py:87
 msgid "This field is only visible by organizers."
 msgstr "Ce champs est uniquement visible par les organisateurs."
 
@@ -383,9 +404,19 @@ msgstr "J’ai besoin de son"
 msgid "Duration (min)"
 msgstr "Durée (min)"
 
+#: cfp/templates/cfp/closed.html:9 cfp/templates/cfp/propose.html:11
+#: cfp/templates/cfp/speaker.html:11
+#: proposals/templates/proposals/participate.html:9
+msgid "Participate"
+msgstr "Participer"
+
+#: cfp/templates/cfp/closed.html:13
+msgid "Sorry, the Call for Participation is closed!"
+msgstr "Désolé, l’appel à participation est fermé."
+
 #: cfp/templates/cfp/complete.html:10
 msgid "Your proposition have been successfully submitted!"
-msgstr "Votre proposition a été transmise avec succès!"
+msgstr "Votre proposition a été transmise avec succès !"
 
 #: cfp/templates/cfp/complete.html:16
 msgid "Thanks for your proposal"
@@ -393,83 +424,84 @@ msgstr "Merci pour votre proposition"
 
 #: cfp/templates/cfp/complete.html:17
 msgid "You can at anytime:"
-msgstr "Vous pouvez à tout moment:"
+msgstr "Vous pouvez à tout moment :"
 
 #: cfp/templates/cfp/complete.html:19
 msgid "Edit your talk:"
 msgstr "Éditer un exposé"
 
 #: cfp/templates/cfp/complete.html:20
-msgid "add an additionnal speaker:"
-msgstr "ajouter un co-speaker:"
+msgid "Add an additionnal speaker:"
+msgstr "Ajouter un co-speaker :"
 
 #: cfp/templates/cfp/complete.html:21
-msgid "You can edit your profile:"
-msgstr "Vous pouvez éditer votre profil:"
+msgid "Edit your profile:"
+msgstr "Éditer votre profil :"
 
 #: cfp/templates/cfp/complete.html:24
 msgid "An email has been sent to you with those URLs"
 msgstr "Un mail vous a été envoyé avec toutes les URLs"
 
-#: cfp/templates/cfp/propose.html:11 cfp/templates/cfp/speaker.html:11
-#: proposals/templates/proposals/participate.html:9
-msgid "Participate"
-msgstr "Participer"
-
 #: cfp/templates/cfp/propose.html:22 cfp/templates/cfp/speaker.html:21
+#: cfp/templates/cfp/staff/conference.html:13
 msgid "Save"
 msgstr "Envoyer"
 
+#: cfp/templates/cfp/staff/base.html:19
+#: cfp/templates/cfp/staff/conference.html:8
+msgid "Conference"
+msgstr "Conférence"
+
 #: cfp/templates/cfp/staff/base.html:29
 msgid "Please select a category."
 msgstr "Veuillez sélectionner une catégorie."
 
-#: cfp/templates/cfp/staff/participant_details.html:13
+#: cfp/templates/cfp/staff/participant_details.html:18
 msgid "Informations"
 msgstr "Informations"
 
-#: cfp/templates/cfp/staff/participant_details.html:15
+#: cfp/templates/cfp/staff/participant_details.html:20
 msgid "E-mail:"
 msgstr "E-mail :"
 
-#: cfp/templates/cfp/staff/participant_details.html:16
+#: cfp/templates/cfp/staff/participant_details.html:21
 msgid "Twitter:"
 msgstr "Twitter :"
 
-#: cfp/templates/cfp/staff/participant_details.html:17
+#: cfp/templates/cfp/staff/participant_details.html:22
 msgid "LinkedIn:"
 msgstr "LinkedIn :"
 
-#: cfp/templates/cfp/staff/participant_details.html:18
+#: cfp/templates/cfp/staff/participant_details.html:23
 msgid "Github:"
 msgstr "Github :"
 
-#: cfp/templates/cfp/staff/participant_details.html:19
+#: cfp/templates/cfp/staff/participant_details.html:24
 msgid "Website:"
 msgstr "Website :"
 
-#: cfp/templates/cfp/staff/participant_details.html:20
+#: cfp/templates/cfp/staff/participant_details.html:25
 msgid "Facebook:"
 msgstr "Facebook :"
 
-#: cfp/templates/cfp/staff/participant_details.html:21
+#: cfp/templates/cfp/staff/participant_details.html:26
 msgid "Mastodon:"
 msgstr "Mastodon :"
 
-#: cfp/templates/cfp/staff/participant_details.html:22
+#: cfp/templates/cfp/staff/participant_details.html:27
 msgid "Phone number:"
 msgstr "Numéro de téléphone :"
 
-#: cfp/templates/cfp/staff/participant_details.html:23
+#: cfp/templates/cfp/staff/participant_details.html:28
 msgid "Language:"
 msgstr "Langue :"
 
-#: cfp/templates/cfp/staff/participant_details.html:39
+#: cfp/templates/cfp/staff/participant_details.html:38
 #: proposals/templates/proposals/_talk_list.html:8
 msgid "by"
 msgstr "par"
 
-#: cfp/templates/cfp/staff/participant_details.html:42
+#: cfp/templates/cfp/staff/participant_details.html:41
 #: cfp/templates/cfp/staff/talk_list.html:35
 #: proposals/templates/proposals/_talk_list.html:11
 #: proposals/templates/proposals/_talk_list.html:17
@@ -477,12 +509,12 @@ msgstr "par"
 msgid "and"
 msgstr "et"
 
-#: cfp/templates/cfp/staff/participant_details.html:45
+#: cfp/templates/cfp/staff/participant_details.html:44
 #: proposals/templates/proposals/_talk_list.html:14
 msgid "in"
 msgstr "dans la session"
 
-#: cfp/templates/cfp/staff/participant_details.html:51
+#: cfp/templates/cfp/staff/participant_details.html:50
 #: proposals/templates/proposals/_talk_list.html:23
 msgid "No talks"
 msgstr "Aucun exposé"
@@ -526,6 +558,41 @@ msgid_plural "refused: %(refused)s"
 msgstr[0] "refusé : %(refused)s"
 msgstr[1] "refusés : %(refused)s"
 
+#: cfp/templates/cfp/staff/talk_decide.html:8
+#: proposals/templates/proposals/talk_decide.html:9
+msgid "Are you sure to accept this proposals?"
+msgstr "Êtes-vous sûr d’accepter cette propositon d’intervention ?"
+
+#: cfp/templates/cfp/staff/talk_decide.html:8
+#: proposals/templates/proposals/talk_decide.html:9
+msgid "Are you sure to decline this proposals?"
+msgstr "Êtes-vous sûr de décliner cette propositon d’intervention ?"
+
+#: cfp/templates/cfp/staff/talk_decide.html:10
+#: proposals/templates/proposals/talk_decide.html:11
+msgid "Information about the proposals"
+msgstr "Information sur la propositon d’intervention"
+
+#: cfp/templates/cfp/staff/talk_decide.html:11
+#: proposals/templates/proposals/talk_decide.html:12
+msgid "Title:"
+msgstr "Titre :"
+
+#: cfp/templates/cfp/staff/talk_decide.html:12
+#: proposals/templates/proposals/talk_decide.html:13
+msgid "Kind:"
+msgstr "Type d’intervention :"
+
+#: cfp/templates/cfp/staff/talk_decide.html:26
+#: proposals/templates/proposals/talk_decide.html:22
+msgid "Accept the proposal"
+msgstr "Accepter la proposition"
+
+#: cfp/templates/cfp/staff/talk_decide.html:26
+#: proposals/templates/proposals/talk_decide.html:22
+msgid "Decline the proposal"
+msgstr "Décliner la proposition"
+
 #: cfp/templates/cfp/staff/talk_details.html:16
 #: proposals/templates/proposals/talk_detail.html:19
 msgid "No abstract provided."
@@ -551,6 +618,33 @@ msgstr "Pas encore assignée."
 msgid "No notes."
 msgstr "Aucune note."
 
+#: cfp/templates/cfp/staff/talk_details.html:96
+#: proposals/templates/proposals/talk_detail.html:108
+msgid "Moderation"
+msgstr "Modération"
+
+#: cfp/templates/cfp/staff/talk_details.html:98
+#: cfp/templates/cfp/staff/talk_list.html:20
+#: proposals/templates/proposals/talk_detail.html:110
+#: proposals/templates/proposals/talk_list.html:52
+msgid "Status"
+msgstr "Statut"
+
+#: cfp/templates/cfp/staff/talk_details.html:103
+#: proposals/templates/proposals/talk_detail.html:115
+msgid "Vote"
+msgstr "Vote"
+
+#: cfp/templates/cfp/staff/talk_details.html:112
+#: proposals/templates/proposals/talk_detail.html:124
+msgid "vote"
+msgstr "vote"
+
+#: cfp/templates/cfp/staff/talk_details.html:112
+#: proposals/templates/proposals/talk_detail.html:124
+msgid "average:"
+msgstr "moyenne :"
+
 #: cfp/templates/cfp/staff/talk_list.html:11
 #: planning/templates/planning/room_list.html:28
 #: proposals/templates/proposals/talk_list.html:43
@@ -569,12 +663,6 @@ msgstr "Titre"
 msgid "Intervention kind"
 msgstr "Type d’intervention"
 
-#: cfp/templates/cfp/staff/talk_list.html:20
-#: proposals/templates/proposals/talk_detail.html:110
-#: proposals/templates/proposals/talk_list.html:52
-msgid "Status"
-msgstr "Statut"
-
 #: cfp/templates/cfp/staff/talk_list.html:42
 #: proposals/templates/proposals/talk_list.html:78
 msgid "Accepted"
@@ -591,11 +679,11 @@ msgstr "Décliné"
 msgid "Pending, score: %(score)s"
 msgstr "En cours, score : %(score)s"
 
-#: cfp/views.py:53
+#: cfp/views.py:62
 msgid "Your talk \"{}\" has been submitted for {}"
 msgstr "Votre proposition \"{}\" a été transmise à {}"
 
-#: cfp/views.py:54
+#: cfp/views.py:63
 msgid ""
 "Hi {},\n"
 "\n"
@@ -635,6 +723,24 @@ msgstr ""
 "{}\n"
 "\n"
 
+#: cfp/views.py:154 proposals/views.py:321
+msgid "Vote successfully created"
+msgstr "A voté !"
+
+#: cfp/views.py:154 proposals/views.py:321
+msgid "Vote successfully updated"
+msgstr "Vote mis à jour"
+
+#: cfp/views.py:177 proposals/views.py:347
+msgid "Decision taken in account"
+msgstr "Décision enregistrée"
+
+#: cfp/views.py:207
+#, fuzzy
+#| msgid "Vote successfully created"
+msgid "Modifications successfully saved."
+msgstr "A voté !"
+
 #: conversations/templates/conversations/_message_form.html:4
 msgid "Send a message"
 msgstr "Envoyer un message"
@@ -728,6 +834,10 @@ msgstr "Accueil"
 msgid "Call for participation"
 msgstr "Appel à participation"
 
+#: ponyconf/templates/base.html:36
+msgid "Staff"
+msgstr ""
+
 #: ponyconf/templates/base.html:50
 #: ponyconf/templates/registration/login.html:10
 msgid "Login"
@@ -950,26 +1060,6 @@ msgstr "Contacter :"
 msgid "link"
 msgstr "lien"
 
-#: proposals/templates/proposals/talk_decide.html:9
-msgid "Are you sure to accept this proposals?"
-msgstr "Êtes-vous sûr d’accepter cette propositon d’intervention ?"
-
-#: proposals/templates/proposals/talk_decide.html:9
-msgid "Are you sure to decline this proposals?"
-msgstr "Êtes-vous sûr de décliner cette propositon d’intervention ?"
-
-#: proposals/templates/proposals/talk_decide.html:11
-msgid "Information about the proposals"
-msgstr "Information sur la propositon d’intervention"
-
-#: proposals/templates/proposals/talk_decide.html:12
-msgid "Title:"
-msgstr "Titre :"
-
-#: proposals/templates/proposals/talk_decide.html:13
-msgid "Kind:"
-msgstr "Type d’intervention :"
-
 #: proposals/templates/proposals/talk_decide.html:15
 msgid "Information for the proposer"
 msgstr "Information à destination de l’auteur de la proposition"
@@ -983,14 +1073,6 @@ msgstr ""
 "le ci-dessous. N’oubliez pas de spécifier à quelle proposition "
 "d’intervention votre message fait référence."
 
-#: proposals/templates/proposals/talk_decide.html:22
-msgid "Accept the proposal"
-msgstr "Accepter la proposition"
-
-#: proposals/templates/proposals/talk_decide.html:22
-msgid "Decline the proposal"
-msgstr "Décliner la proposition"
-
 #: proposals/templates/proposals/talk_detail.html:24
 msgid "Format"
 msgstr "Format"
@@ -1030,22 +1112,6 @@ msgstr "Télécharger"
 msgid "Assign to"
 msgstr "Assigner à"
 
-#: proposals/templates/proposals/talk_detail.html:108
-msgid "Moderation"
-msgstr "Modération"
-
-#: proposals/templates/proposals/talk_detail.html:115
-msgid "Vote"
-msgstr "Vote"
-
-#: proposals/templates/proposals/talk_detail.html:124
-msgid "vote"
-msgstr "vote"
-
-#: proposals/templates/proposals/talk_detail.html:124
-msgid "average:"
-msgstr "moyenne :"
-
 #: proposals/templates/proposals/talk_detail.html:138
 msgid "No attendees yet."
 msgstr "Il n’y a pas encore d’inscrit."
@@ -1151,18 +1217,6 @@ msgstr "Exposé proposé avec succès !"
 msgid "Talk assigned to track successfully!"
 msgstr "Exposé assigné à la session avec succès !"
 
-#: proposals/views.py:321
-msgid "Vote successfully created"
-msgstr "A voté !"
-
-#: proposals/views.py:321
-msgid "Vote successfully updated"
-msgstr "Vote mis à jour"
-
-#: proposals/views.py:347
-msgid "Decision taken in account"
-msgstr "Décision enregistrée"
-
 #: proposals/views.py:445
 msgid "Unregistered :-("
 msgstr "Vous avez été désinscrit :-("
@@ -1209,6 +1263,3 @@ msgstr "Bénévoles"
 #: volunteers/templates/volunteers/volunteer_list.html:25
 msgid "volunteer"
 msgstr "bénévole"
-
-#~ msgid "Conference"
-#~ msgstr "Conférence"
diff --git a/ponyconf/settings.py b/ponyconf/settings.py
index 3df5e05..9f546e3 100644
--- a/ponyconf/settings.py
+++ b/ponyconf/settings.py
@@ -49,7 +49,7 @@ INSTALLED_APPS = [
     'djangobower',
     'bootstrap3',
     #'registration',
-    #'django_select2',
+    'django_select2',
     #'avatar',
     'crispy_forms',
 
@@ -208,6 +208,7 @@ BOOTSTRAP3 = {
 
 SELECT2_JS = 'select2/dist/js/select2.min.js'
 SELECT2_CSS = 'select2/dist/css/select2.min.css'
+SELECT2_I18N_PATH = 'select2/dist/js/i18n'
 
 #AUTHENTICATION_BACKENDS = ['yeouia.backends.YummyEmailOrUsernameInsensitiveAuth']
 LOGOUT_REDIRECT_URL = 'home'
@@ -221,9 +222,15 @@ INCLUDE_REGISTER_URL = True
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-    }
+    },
+    'select2': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'select2',
+    },
 }
 
+SELECT2_CACHE_BACKEND = 'select2'
+
 SERVER_EMAIL = 'ponyconf@example.com'
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'localhost'
diff --git a/requirements.txt b/requirements.txt
index 7a35780..c26ab7c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@ django<1.12
 django-autoslug
 django-bootstrap3
 django-bower
+django-crispy-forms
 django-select2
 django-colorful