AFPy/PonyConf
AFPy
/
PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

suggest to add already known co-speaker

This commit is contained in:
Élie Bouttier 2017-11-04 20:11:50 +01:00
parent 38b850fe63
commit 5bab52981c
7 changed files with 131 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfp/models.py
View File

@ -129,6 +129,10 @@ class Participant(PonyConfModel):
def __str__(self): def __str__(self):
return str(self.name) return str(self.name)
@property
def co_speaker_set(self):
return Participant.objects.filter(site=self.site, talk__in=self.talk_set.values_list('pk')).exclude(pk=self.pk).order_by('name').distinct()
@property @property
def accepted_talk_set(self): def accepted_talk_set(self):
return self.talk_set.filter(accepted=True) return self.talk_set.filter(accepted=True)

22
cfp/templates/cfp/proposal_speaker_form.html
View File

@ -30,13 +30,23 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<form method="POST" class="form-horizontal col-md-8 col-md-offset-2"> {% if co_speaker_candidates %}
{% csrf_token %} <div class="col-md-8 col-md-offset-2 alert alert-info">
{{ form|crispy }} {% trans "You may want to add one of the following speakers:" %}
<div class="col-md-12 text-center"> {% for spkr in co_speaker_candidates %}
<button type="submit" class="btn btn-primary text-center">{% trans "Save" %} <i class="fa fa-check"></i></button> {% if forloop.first %}<ul>{% endif %}
<li><a href="{% url 'proposal-speaker-add-existing' speaker_token=speaker.token talk_id=talk.pk speaker_id=spkr.pk %}">{{ spkr }}</a></li>
{% if forloop.last %}</ul>{% endif %}
{% endfor %}
</div> </div>
</form> {% endif %}
<form method="POST" class="form-horizontal col-md-8 col-md-offset-2">
{% csrf_token %}
{{ form|crispy }}
<div class="col-md-12 text-center">
<button type="submit" class="btn btn-primary text-center">{% trans "Save" %} <i class="fa fa-check"></i></button>
</div>
</form>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

8
cfp/templates/cfp/proposal_talk_details.html
View File

@ -55,7 +55,13 @@
{% if forloop.first %}<ul>{% endif %} {% if forloop.first %}<ul>{% endif %}
<li> <li>
<a href="{% url 'proposal-speaker-edit' speaker_token=speaker.token talk_id=talk.pk co_speaker_id=spkr.pk %}">{{ spkr }}</a> <a href="{% url 'proposal-speaker-edit' speaker_token=speaker.token talk_id=talk.pk co_speaker_id=spkr.pk %}">{{ spkr }}</a>
{% if spkr.pk == speaker.pk %} ({% trans "you!" %}){% endif %} {% if spkr.pk == speaker.pk %}
({% trans "you!" %})
{% else %}
<a href="{% url 'proposal-speaker-remove' speaker_token=speaker.token talk_id=talk.pk co_speaker_id=spkr.pk %}" class="btn btn-xs btn-danger">
<span class=" glyphicon glyphicon-remove"></span>&nbsp;{% trans "remove" %}
</a>
{% endif %}
</li> </li>
{% if forloop.last %}</ul>{% endif %} {% if forloop.last %}</ul>{% endif %}
{% endfor %} {% endfor %}

17
cfp/urls.py
View File

@ -10,14 +10,15 @@ urlpatterns = [
url(r'^cfp/(?P<speaker_token>[\w\-]+)/$', views.proposal_dashboard, name='proposal-dashboard'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/$', views.proposal_dashboard, name='proposal-dashboard'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/profile/$', views.proposal_speaker_edit, name='proposal-profile-edit'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/profile/$', views.proposal_speaker_edit, name='proposal-profile-edit'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/add/$', views.proposal_talk_edit, name='proposal-talk-add'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/add/$', views.proposal_talk_edit, name='proposal-talk-add'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/$', views.proposal_talk_details, name='proposal-talk-details'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/$', views.proposal_talk_details, name='proposal-talk-details'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/edit/$', views.proposal_talk_edit, name='proposal-talk-edit'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/edit/$', views.proposal_talk_edit, name='proposal-talk-edit'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/speaker/add/$', views.proposal_speaker_edit, name='proposal-speaker-add'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/speaker/add/$', views.proposal_speaker_edit, name='proposal-speaker-add'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/confirm/$', views.proposal_talk_acknowledgment, {'confirm': True}, name='proposal-talk-confirm'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/speaker/add/(?P<speaker_id>[0-9]+)/$', views.proposal_speaker_add, name='proposal-speaker-add-existing'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/desist/$', views.proposal_talk_acknowledgment, {'confirm': False}, name='proposal-talk-desist'), #url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/speaker/(?P<co_speaker_id>[0-9]+)/$', views.proposal_speaker_details, name='proposal-speaker-details'),
#url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/speaker/(?P<co_speaker_id>[\w\-]+)/$', views.proposal_speaker_details, name='proposal-speaker-details'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/speaker/(?P<co_speaker_id>[0-9]+)/edit/$', views.proposal_speaker_edit, name='proposal-speaker-edit'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/speaker/(?P<co_speaker_id>[\w\-]+)/edit/$', views.proposal_speaker_edit, name='proposal-speaker-edit'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/speaker/(?P<co_speaker_id>[0-9]+)/remove/$', views.proposal_speaker_remove, name='proposal-speaker-remove'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[\w\-]+)/speaker/(?P<co_speaker_id>[\w\-]+)/remove/$', views.proposal_speaker_remove, name='proposal-speaker-remove'), url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/confirm/$', views.proposal_talk_acknowledgment, {'confirm': True}, name='proposal-talk-confirm'),
url(r'^cfp/(?P<speaker_token>[\w\-]+)/talk/(?P<talk_id>[0-9]+)/desist/$', views.proposal_talk_acknowledgment, {'confirm': False}, name='proposal-talk-desist'),
# Backward compatibility # Backward compatibility
url(r'^cfp/(?P<talk_id>[\w\-]+)/speaker/add/$', views.talk_proposal_speaker_edit, name='talk-proposal-speaker-add'), url(r'^cfp/(?P<talk_id>[\w\-]+)/speaker/add/$', views.talk_proposal_speaker_edit, name='talk-proposal-speaker-add'),
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\-]+)/speaker/(?P<participant_id>[\w\-]+)/$', views.talk_proposal_speaker_edit, name='talk-proposal-speaker-edit'),

30
cfp/views.py
View File

@ -319,21 +319,15 @@ def proposal_talk_acknowledgment(request, speaker, talk_id, confirm):
@speaker_required @speaker_required
def proposal_speaker_edit(request, speaker, talk_id=None, co_speaker_id=None): def proposal_speaker_edit(request, speaker, talk_id=None, co_speaker_id=None):
talk, co_speaker, co_speaker_candidates = None, None, None
if talk_id: if talk_id:
talk = get_object_or_404(Talk, site=request.conference.site, speakers__pk=speaker.pk, pk=talk_id) talk = get_object_or_404(Talk, site=request.conference.site, speakers__pk=speaker.pk, pk=talk_id)
if co_speaker_id: if co_speaker_id:
co_speaker = get_object_or_404(Participant, site=request.conference.site, talk__pk=talk.pk, pk=co_speaker_id) co_speaker = get_object_or_404(Participant, site=request.conference.site, talk__pk=talk.pk, pk=co_speaker_id)
else: else:
co_speaker = None co_speaker_candidates = speaker.co_speaker_set.exclude(pk__in=talk.speakers.values_list('pk'))
else:
talk = None
co_speaker = None
form = ParticipantForm(request.POST or None, conference=request.conference, instance=co_speaker if talk else speaker) form = ParticipantForm(request.POST or None, conference=request.conference, instance=co_speaker if talk else speaker)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
# TODO: Allow to add a co-speaker which already exists.
# This should be automatically allowed if the speaker already have a talk in common with the co-speaker.
# Otherwise, we should send an speaker request to the other user OR allow the other user to join the talk with his token.
# This last requirements in planned for v3.
edited_speaker = form.save() edited_speaker = form.save()
if talk: if talk:
talk.speakers.add(edited_speaker) talk.speakers.add(edited_speaker)
@ -345,15 +339,31 @@ def proposal_speaker_edit(request, speaker, talk_id=None, co_speaker_id=None):
'speaker': speaker, 'speaker': speaker,
'talk': talk, 'talk': talk,
'co_speaker': co_speaker, 'co_speaker': co_speaker,
'co_speaker_candidates': co_speaker_candidates,
'form': form, 'form': form,
}) })
@speaker_required
def proposal_speaker_add(request, speaker, talk_id, speaker_id):
talk = get_object_or_404(Talk, site=request.conference.site, speakers__pk=speaker.pk, pk=talk_id)
co_speaker = get_object_or_404(Participant, pk__in=speaker.co_speaker_set.values_list('pk'))
talk.speakers.add(co_speaker)
messages.success(request, _('Co-speaker successfully added to the talk.'))
return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk_id)))
# TODO: ask for confirmation (with POST request needed)
@speaker_required @speaker_required
def proposal_speaker_remove(request, speaker, talk_id, co_speaker_id): def proposal_speaker_remove(request, speaker, talk_id, co_speaker_id):
talk = get_object_or_404(Talk, site=request.conference.site, speakers__pk=speaker.pk, pk=talk_id) talk = get_object_or_404(Talk, site=request.conference.site, speakers__pk=speaker.pk, pk=talk_id)
co_speaker = get_object_or_404(Participant, site=request.conference.site, talk_set__pk=talk.pk, pk=co_speaker_id) co_speaker = get_object_or_404(Participant, site=request.conference.site, talk__pk=talk.pk, pk=co_speaker_id)
return redirect(reverse('proposal-speaker-details', kwargs=dict())) # prevent speaker from removing his/her self
if co_speaker.pk == speaker.pk:
raise PermissionDenied
talk.speakers.remove(co_speaker)
messages.success(request, _('Co-speaker successfully removed from the talk.'))
return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk_id)))
# BACKWARD COMPATIBILITY # BACKWARD COMPATIBILITY

BIN
locale/fr/LC_MESSAGES/django.mo
View File

Binary file not shown.

134
locale/fr/LC_MESSAGES/django.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-04 14:58+0000\n" "POT-Creation-Date: 2017-11-04 19:09+0000\n"
"PO-Revision-Date: 2017-11-04 15:58+0100\n" "PO-Revision-Date: 2017-11-04 20:11+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: fr\n" "Language: fr\n"
@ -34,15 +34,15 @@ msgstr "Décliné"
msgid "Waiting" msgid "Waiting"
msgstr "En attente" msgstr "En attente"
#: cfp/forms.py:29 cfp/forms.py:130 cfp/forms.py:237 cfp/models.py:353 #: cfp/forms.py:29 cfp/forms.py:130 cfp/forms.py:237 cfp/models.py:357
msgid "Confirmed" msgid "Confirmed"
msgstr "Confirmé" msgstr "Confirmé"
#: cfp/forms.py:30 cfp/models.py:355 #: cfp/forms.py:30 cfp/models.py:359
msgid "Cancelled" msgid "Cancelled"
msgstr "Annulé" msgstr "Annulé"
#: cfp/forms.py:62 cfp/models.py:448 #: cfp/forms.py:62 cfp/models.py:452
msgid "Activity" msgid "Activity"
msgstr "Activité" msgstr "Activité"
@ -65,13 +65,13 @@ msgstr "Catégorie"
msgid "Title" msgid "Title"
msgstr "Titre" msgstr "Titre"
#: cfp/forms.py:108 cfp/models.py:147 cfp/models.py:443 #: cfp/forms.py:108 cfp/models.py:151 cfp/models.py:447
#: cfp/templates/cfp/proposal_talk_details.html:67 #: cfp/templates/cfp/proposal_talk_details.html:73
#: cfp/templates/cfp/staff/talk_details.html:64 #: cfp/templates/cfp/staff/talk_details.html:64
msgid "Description" msgid "Description"
msgstr "Description" msgstr "Description"
#: cfp/forms.py:109 cfp/models.py:111 cfp/models.py:424 #: cfp/forms.py:109 cfp/models.py:111 cfp/models.py:428
#: cfp/templates/cfp/staff/participant_details.html:19 #: cfp/templates/cfp/staff/participant_details.html:19
#: cfp/templates/cfp/staff/talk_details.html:78 #: cfp/templates/cfp/staff/talk_details.html:78
#: cfp/templates/cfp/staff/volunteer_details.html:20 #: cfp/templates/cfp/staff/volunteer_details.html:20
@ -82,7 +82,7 @@ msgstr "Notes"
msgid "Visible by speakers" msgid "Visible by speakers"
msgstr "Visible par les orateurs" msgstr "Visible par les orateurs"
#: cfp/forms.py:136 cfp/forms.py:243 cfp/models.py:310 #: cfp/forms.py:136 cfp/forms.py:243 cfp/models.py:314
#: cfp/templates/cfp/staff/talk_details.html:21 #: cfp/templates/cfp/staff/talk_details.html:21
#: cfp/templates/cfp/staff/talk_list.html:46 #: cfp/templates/cfp/staff/talk_list.html:46
#: cfp/templates/cfp/staff/track_form.html:14 #: cfp/templates/cfp/staff/track_form.html:14
@ -120,7 +120,7 @@ msgstr "Programmé"
msgid "Filter talks already / not yet scheduled" msgid "Filter talks already / not yet scheduled"
msgstr "Filtrer les exposés déjà / pas encore planifiées" msgstr "Filtrer les exposés déjà / pas encore planifiées"
#: cfp/forms.py:160 cfp/models.py:327 #: cfp/forms.py:160 cfp/models.py:331
#: cfp/templates/cfp/staff/talk_details.html:54 #: cfp/templates/cfp/staff/talk_details.html:54
msgid "Materials" msgid "Materials"
msgstr "Supports" msgstr "Supports"
@ -157,7 +157,7 @@ msgstr "Ajouter une étiquette"
msgid "Put in a room" msgid "Put in a room"
msgstr "Assigner à une salle" msgstr "Assigner à une salle"
#: cfp/forms.py:259 cfp/models.py:419 #: cfp/forms.py:259 cfp/models.py:423
#: cfp/templates/cfp/staff/volunteer_details.html:11 #: cfp/templates/cfp/staff/volunteer_details.html:11
#: cfp/templates/cfp/staff/volunteer_list.html:30 #: cfp/templates/cfp/staff/volunteer_list.html:30
msgid "Email" msgid "Email"
@ -242,7 +242,7 @@ msgstr ""
"L’adresse de réponse doit être une chaine de texte formatable avec un " "L’adresse de réponse doit être une chaine de texte formatable avec un "
"argument « token » (e.g. ponyconf+{token}@exemple.com)." "argument « token » (e.g. ponyconf+{token}@exemple.com)."
#: cfp/models.py:99 cfp/models.py:145 cfp/models.py:197 cfp/models.py:441 #: cfp/models.py:99 cfp/models.py:149 cfp/models.py:201 cfp/models.py:445
#: cfp/templates/cfp/staff/participant_list.html:35 #: cfp/templates/cfp/staff/participant_list.html:35
#: cfp/templates/cfp/staff/volunteer_list.html:29 #: cfp/templates/cfp/staff/volunteer_list.html:29
msgid "Name" msgid "Name"
@ -277,12 +277,12 @@ msgstr "Facebook"
msgid "Mastodon" msgid "Mastodon"
msgstr "Mastodon" msgstr "Mastodon"
#: cfp/models.py:109 cfp/models.py:421 #: cfp/models.py:109 cfp/models.py:425
#: cfp/templates/cfp/staff/volunteer_details.html:14 #: cfp/templates/cfp/staff/volunteer_details.html:14
msgid "Phone number" msgid "Phone number"
msgstr "Numéro de téléphone" msgstr "Numéro de téléphone"
#: cfp/models.py:112 cfp/models.py:309 #: cfp/models.py:112 cfp/models.py:313
msgid "This field is only visible by organizers." msgid "This field is only visible by organizers."
msgstr "Ce champs est uniquement visible par les organisateurs." msgstr "Ce champs est uniquement visible par les organisateurs."
@ -290,23 +290,23 @@ msgstr "Ce champs est uniquement visible par les organisateurs."
msgid "Invited speaker" msgid "Invited speaker"
msgstr "Orateur invité" msgstr "Orateur invité"
#: cfp/models.py:199 #: cfp/models.py:203
msgid "Color" msgid "Color"
msgstr "Couleur" msgstr "Couleur"
#: cfp/models.py:231 #: cfp/models.py:235
msgid "Default duration (min)" msgid "Default duration (min)"
msgstr "Durée par défaut (min)" msgstr "Durée par défaut (min)"
#: cfp/models.py:232 #: cfp/models.py:236
msgid "Color on program" msgid "Color on program"
msgstr "Couleur sur le programme" msgstr "Couleur sur le programme"
#: cfp/models.py:233 #: cfp/models.py:237
msgid "Label on program" msgid "Label on program"
msgstr "Label dans le xml du programme" msgstr "Label dans le xml du programme"
#: cfp/models.py:304 cfp/templates/cfp/proposal_talk_details.html:51 #: cfp/models.py:308 cfp/templates/cfp/proposal_talk_details.html:51
#: cfp/templates/cfp/staff/base.html:11 #: cfp/templates/cfp/staff/base.html:11
#: cfp/templates/cfp/staff/participant_list.html:8 #: cfp/templates/cfp/staff/participant_list.html:8
#: cfp/templates/cfp/staff/talk_details.html:68 #: cfp/templates/cfp/staff/talk_details.html:68
@ -314,19 +314,19 @@ msgstr "Label dans le xml du programme"
msgid "Speakers" msgid "Speakers"
msgstr "Orateurs" msgstr "Orateurs"
#: cfp/models.py:305 #: cfp/models.py:309
msgid "Talk Title" msgid "Talk Title"
msgstr "Titre de la proposition" msgstr "Titre de la proposition"
#: cfp/models.py:308 #: cfp/models.py:312
msgid "Description of your talk" msgid "Description of your talk"
msgstr "Description de votre proposition" msgstr "Description de votre proposition"
#: cfp/models.py:312 cfp/templates/cfp/proposal_talk_details.html:77 #: cfp/models.py:316 cfp/templates/cfp/proposal_talk_details.html:83
msgid "Message to organizers" msgid "Message to organizers"
msgstr "Message aux organisateurs" msgstr "Message aux organisateurs"
#: cfp/models.py:313 #: cfp/models.py:317
msgid "" msgid ""
"If you have any constraint or if you have anything that may help you to " "If you have any constraint or if you have anything that may help you to "
"select your talk, like a video or slides of your talk, please write it down " "select your talk, like a video or slides of your talk, please write it down "
@ -336,67 +336,67 @@ msgstr ""
"votre proposition, comme une vidéo, des slides, n'hésitez pas à les ajouter " "votre proposition, comme une vidéo, des slides, n'hésitez pas à les ajouter "
"ici." "ici."
#: cfp/models.py:316 #: cfp/models.py:320
msgid "Talk Category" msgid "Talk Category"
msgstr "Catégorie de proposition" msgstr "Catégorie de proposition"
#: cfp/models.py:317 #: cfp/models.py:321
msgid "I'm ok to be recorded on video" msgid "I'm ok to be recorded on video"
msgstr "J’accepte d’être enregistré en vidéo" msgstr "J’accepte d’être enregistré en vidéo"
#: cfp/models.py:319 #: cfp/models.py:323
msgid "Video licence" msgid "Video licence"
msgstr "Licence vidéo" msgstr "Licence vidéo"
#: cfp/models.py:320 #: cfp/models.py:324
msgid "I need sound" msgid "I need sound"
msgstr "J’ai besoin de son" msgstr "J’ai besoin de son"
#: cfp/models.py:323 #: cfp/models.py:327
msgid "Beginning date and time" msgid "Beginning date and time"
msgstr "Date et heure de début" msgstr "Date et heure de début"
#: cfp/models.py:324 #: cfp/models.py:328
msgid "Duration (min)" msgid "Duration (min)"
msgstr "Durée (min)" msgstr "Durée (min)"
#: cfp/models.py:328 #: cfp/models.py:332
msgid "" msgid ""
"You can use this field to share some materials related to your intervention." "You can use this field to share some materials related to your intervention."
msgstr "" msgstr ""
"Vous pouvez utiliser ce champs pour partager les supports de votre " "Vous pouvez utiliser ce champs pour partager les supports de votre "
"intervention." "intervention."
#: cfp/models.py:357 #: cfp/models.py:361
msgid "Waiting confirmation" msgid "Waiting confirmation"
msgstr "En attente de confirmation" msgstr "En attente de confirmation"
#: cfp/models.py:359 #: cfp/models.py:363
msgid "Refused" msgid "Refused"
msgstr "Refusé" msgstr "Refusé"
#: cfp/models.py:361 #: cfp/models.py:365
#, python-format #, python-format
msgid "Pending decision, score: %(score).1f" msgid "Pending decision, score: %(score).1f"
msgstr "En cours, score : %(score).1f" msgstr "En cours, score : %(score).1f"
#: cfp/models.py:418 #: cfp/models.py:422
msgid "Your Name" msgid "Your Name"
msgstr "Votre Nom" msgstr "Votre Nom"
#: cfp/models.py:422 #: cfp/models.py:426
msgid "SMS prefered" msgid "SMS prefered"
msgstr "SMS préférés" msgstr "SMS préférés"
#: cfp/models.py:425 #: cfp/models.py:429
msgid "If you have some constraints, you can indicate them here." msgid "If you have some constraints, you can indicate them here."
msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici." msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici."
#: cfp/models.py:444 cfp/templates/cfp/staff/volunteer_details.html:8 #: cfp/models.py:448 cfp/templates/cfp/staff/volunteer_details.html:8
msgid "Volunteer" msgid "Volunteer"
msgstr "Bénévole" msgstr "Bénévole"
#: cfp/models.py:449 cfp/templates/cfp/staff/volunteer_details.html:25 #: cfp/models.py:453 cfp/templates/cfp/staff/volunteer_details.html:25
#: cfp/templates/cfp/staff/volunteer_list.html:32 #: cfp/templates/cfp/staff/volunteer_list.html:32
msgid "Activities" msgid "Activities"
msgstr "Activités" msgstr "Activités"
@ -433,7 +433,7 @@ msgstr "Ajouter un nouvel utilisateur"
#: cfp/templates/cfp/admin/conference.html:14 #: cfp/templates/cfp/admin/conference.html:14
#: cfp/templates/cfp/proposal_home.html:28 #: cfp/templates/cfp/proposal_home.html:28
#: cfp/templates/cfp/proposal_mail_token.html:25 #: cfp/templates/cfp/proposal_mail_token.html:25
#: cfp/templates/cfp/proposal_speaker_form.html:38 #: cfp/templates/cfp/proposal_speaker_form.html:48
#: cfp/templates/cfp/proposal_talk_form.html:28 #: cfp/templates/cfp/proposal_talk_form.html:28
#: cfp/templates/cfp/staff/create_user.html:13 #: cfp/templates/cfp/staff/create_user.html:13
msgid "Save" msgid "Save"
@ -565,14 +565,18 @@ msgid "Edit a speaker"
msgstr "Éditer un orateur" msgstr "Éditer un orateur"
#: cfp/templates/cfp/proposal_speaker_form.html:15 #: cfp/templates/cfp/proposal_speaker_form.html:15
#: cfp/templates/cfp/proposal_talk_details.html:63 #: cfp/templates/cfp/proposal_talk_details.html:69
msgid "Add a co-speaker" msgid "Add a co-speaker"
msgstr "Ajouter un co-orateur" msgstr "Ajouter un co-intervenant"
#: cfp/templates/cfp/proposal_speaker_form.html:17 #: cfp/templates/cfp/proposal_speaker_form.html:17
msgid "Go back to the talk" msgid "Go back to the talk"
msgstr "Retourner à l’exposé" msgstr "Retourner à l’exposé"
#: cfp/templates/cfp/proposal_speaker_form.html:36
msgid "You may want to add one of the following speakers:"
msgstr "Vous souhaitez peut-être ajouter un des intervenants suivants :"
#: cfp/templates/cfp/proposal_talk_details.html:14 #: cfp/templates/cfp/proposal_talk_details.html:14
msgid "My profile" msgid "My profile"
msgstr "Mon profil" msgstr "Mon profil"
@ -619,12 +623,16 @@ msgstr "Bonne nouvelle, je peux finalement être présent !"
msgid "Sorry, refused :-(" msgid "Sorry, refused :-("
msgstr "Désolé, refusé :-(" msgstr "Désolé, refusé :-("
#: cfp/templates/cfp/proposal_talk_details.html:58 #: cfp/templates/cfp/proposal_talk_details.html:59
msgid "you!" msgid "you!"
msgstr "vous !" msgstr "vous !"
#: cfp/templates/cfp/proposal_talk_details.html:73 #: cfp/templates/cfp/proposal_talk_details.html:62
#: cfp/templates/cfp/proposal_talk_details.html:83 msgid "remove"
msgstr "supprimer"
#: cfp/templates/cfp/proposal_talk_details.html:79
#: cfp/templates/cfp/proposal_talk_details.html:89
#: cfp/templates/cfp/staff/talk_details.html:66 #: cfp/templates/cfp/staff/talk_details.html:66
msgid "No description provided." msgid "No description provided."
msgstr "Aucune description fournie." msgstr "Aucune description fournie."
@ -1154,51 +1162,59 @@ msgstr "Nous avons enregistré votre indisponibilité."
msgid "Speaker %(speaker)s CANCELLED his/her participation." msgid "Speaker %(speaker)s CANCELLED his/her participation."
msgstr "L’intervenant %(speaker)s a ANNULÉ sa participation." msgstr "L’intervenant %(speaker)s a ANNULÉ sa participation."
#: cfp/views.py:397 #: cfp/views.py:352
msgid "Co-speaker successfully added to the talk."
msgstr "Co-intervenant ajouté à l’exposé avec succès."
#: cfp/views.py:365
msgid "Co-speaker successfully removed from the talk."
msgstr "Co-intervenant supprimé de l’exposé avec succès."
#: cfp/views.py:407
msgid "The speaker confirmation have been noted." msgid "The speaker confirmation have been noted."
msgstr "La confirmation de l’orateur a été notée." msgstr "La confirmation de l’orateur a été notée."
#: cfp/views.py:398 #: cfp/views.py:408
msgid "The talk have been confirmed." msgid "The talk have been confirmed."
msgstr "L’exposé a été confirmé." msgstr "L’exposé a été confirmé."
#: cfp/views.py:400 #: cfp/views.py:410
msgid "The speaker unavailability have been noted." msgid "The speaker unavailability have been noted."
msgstr "L’indisponibilité de l’intervenant a été notée." msgstr "L’indisponibilité de l’intervenant a été notée."
#: cfp/views.py:401 #: cfp/views.py:411
msgid "The talk have been cancelled." msgid "The talk have been cancelled."
msgstr "L’exposé a été annulé." msgstr "L’exposé a été annulé."
#: cfp/views.py:476 cfp/views.py:578 #: cfp/views.py:486 cfp/views.py:588
msgid "The talk has been accepted." msgid "The talk has been accepted."
msgstr "L’exposé a été accepté." msgstr "L’exposé a été accepté."
#: cfp/views.py:478 cfp/views.py:580 #: cfp/views.py:488 cfp/views.py:590
msgid "The talk has been declined." msgid "The talk has been declined."
msgstr "L’exposé a été décliné." msgstr "L’exposé a été décliné."
#: cfp/views.py:547 cfp/views.py:640 #: cfp/views.py:557 cfp/views.py:650
msgid "Message sent!" msgid "Message sent!"
msgstr "Message envoyé !" msgstr "Message envoyé !"
#: cfp/views.py:561 #: cfp/views.py:571
msgid "Vote successfully created" msgid "Vote successfully created"
msgstr "A voté !" msgstr "A voté !"
#: cfp/views.py:561 #: cfp/views.py:571
msgid "Vote successfully updated" msgid "Vote successfully updated"
msgstr "Vote mis à jour" msgstr "Vote mis à jour"
#: cfp/views.py:582 #: cfp/views.py:592
msgid "Decision taken in account" msgid "Decision taken in account"
msgstr "Décision enregistrée" msgstr "Décision enregistrée"
#: cfp/views.py:668 #: cfp/views.py:678
msgid "[{}] You have been added to the staff team" msgid "[{}] You have been added to the staff team"
msgstr "[{}] Vous avez été ajouté aux membres du staff" msgstr "[{}] Vous avez été ajouté aux membres du staff"
#: cfp/views.py:669 #: cfp/views.py:679
msgid "" msgid ""
"Hi {},\n" "Hi {},\n"
"\n" "\n"
@ -1222,15 +1238,15 @@ msgstr ""
"{}\n" "{}\n"
"\n" "\n"
#: cfp/views.py:690 #: cfp/views.py:700
msgid "Modifications successfully saved." msgid "Modifications successfully saved."
msgstr "Modification enregistrée avec succès." msgstr "Modification enregistrée avec succès."
#: cfp/views.py:767 #: cfp/views.py:777
msgid "User created successfully." msgid "User created successfully."
msgstr "Utilisateur créé avec succès." msgstr "Utilisateur créé avec succès."
#: cfp/views.py:788 #: cfp/views.py:798
#, python-format #, python-format
msgid "Format '%s' not available" msgid "Format '%s' not available"
msgstr "Format '%s' non disponible" msgstr "Format '%s' non disponible"