diff --git a/cfp/templates/cfp/volunteer_enrole.html b/cfp/templates/cfp/volunteer_enrole.html
index 2be1f15..340d423 100644
--- a/cfp/templates/cfp/volunteer_enrole.html
+++ b/cfp/templates/cfp/volunteer_enrole.html
@@ -9,7 +9,7 @@
diff --git a/cfp/views.py b/cfp/views.py
index cb78971..d688fbf 100644
--- a/cfp/views.py
+++ b/cfp/views.py
@@ -120,7 +120,7 @@ def volunteer_mail_token(request):
subject=_("[%(conference)s] Someone asked to access your profil") % {'conference': request.conference},
content=body,
)
- messages.success(request, _('A email have been sent with a link to access to your profil.'))
+ messages.success(request, _('An email has been sent with a link to access to your profil.'))
return redirect(reverse('volunteer-mail-token'))
return render(request, 'cfp/volunteer_mail_token.html', {
'form': form,
@@ -331,7 +331,7 @@ Thanks!
},
content=body,
)
- messages.success(request, _('Your proposition have been successfully submitted!'))
+ messages.success(request, _('Your proposition has been successfully submitted!'))
return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk.pk)))
return render(request, 'cfp/proposal_home.html', {
'speaker_form': speaker_form,
@@ -372,7 +372,7 @@ Sincerely,
},
content=body,
)
- messages.success(request, _('A email have been sent with a link to access to your profil.'))
+ messages.success(request, _('An email has been sent with a link to access to your profil.'))
return redirect(reverse('proposal-mail-token'))
return render(request, 'cfp/proposal_mail_token.html', {
'form': form,
@@ -414,7 +414,7 @@ def proposal_talk_edit(request, speaker, talk_id=None):
else:
# TODO: it could be great to receive the proposition by mail
# but this is not crucial as the speaker already have a link in its mailbox
- messages.success(request, _('Your proposition have been successfully submitted!'))
+ messages.success(request, _('Your proposition has been successfully submitted!'))
return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk.pk)))
return render(request, 'cfp/proposal_talk_form.html', {
'speaker': speaker,
@@ -584,17 +584,17 @@ def talk_acknowledgment(request, talk_id, confirm):
talk.confirmed = confirm
talk.save()
if confirm:
- confirmation_message= _('The speaker confirmation have been noted.')
+ confirmation_message= _('The speaker confirmation has been noted.')
action = _('confirmed')
- thread_note = _('The talk have been confirmed.')
+ thread_note = _('The talk has been confirmed.')
else:
- confirmation_message = _('The speaker unavailability have been noted.')
+ confirmation_message = _('The speaker unavailability has been noted.')
action = _('cancelled')
- thread_note = _('The talk have been %(action)s.') % {'action': action}
+ thread_note = _('The talk has been %(action)s.') % {'action': action}
send_message(
thread=talk.conversation,
author=request.user,
- subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s.") % {
+ subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s.") % {
'conference': request.conference,
'talk': talk,
'action': action,
@@ -695,7 +695,7 @@ def talk_list(request):
send_message(
thread=talk.conversation,
author=request.user,
- subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s") % {
+ subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s") % {
'conference': request.conference,
'talk': talk,
'action': action,
@@ -830,7 +830,7 @@ def talk_decide(request, talk_id, accept):
send_message(
thread=participant.conversation,
author=request.conference,
- subject=_("[%(conference)s] Your talk '%(talk)s' have been %(action)s") % {
+ subject=_("[%(conference)s] Your talk '%(talk)s' has been %(action)s") % {
'conference': request.conference,
'talk': talk,
'action': action,
@@ -841,7 +841,7 @@ def talk_decide(request, talk_id, accept):
send_message(
thread=talk.conversation,
author=request.user,
- subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s") % {
+ subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s") % {
'conference': request.conference,
'talk': talk,
'action': action,
diff --git a/doc/installation-guide.rst b/doc/installation-guide.rst
index 572f39e..845355f 100644
--- a/doc/installation-guide.rst
+++ b/doc/installation-guide.rst
@@ -12,7 +12,7 @@ Commands starting with ``$`` must be run as ``ponyconf`` user.
Requirements
------------
-PonyConf have been tested with python 3.5 and 3.6.
+PonyConf has been tested with python 3.5 and 3.6.
Preparation
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index c836570..36a19cf 100644
Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index ac9efc9..d1f8c41 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-02 12:00+0000\n"
+"POT-Creation-Date: 2023-01-30 13:44+0000\n"
"PO-Revision-Date: 2019-11-02 13:06+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -22,11 +22,11 @@ msgstr ""
msgid "Email address"
msgstr "Adresse e-mail"
-#: accounts/models.py:10 cfp/models.py:120 cfp/models.py:493
+#: accounts/models.py:10 cfp/models.py:120 cfp/models.py:491
msgid "Phone number"
msgstr "Numéro de téléphone"
-#: accounts/models.py:11 cfp/models.py:494
+#: accounts/models.py:11 cfp/models.py:492
msgid "SMS prefered"
msgstr "SMS préférés"
@@ -136,15 +136,15 @@ msgstr "Décliné"
msgid "Waiting"
msgstr "En attente"
-#: cfp/forms.py:30 cfp/forms.py:132 cfp/forms.py:258 cfp/models.py:384
+#: cfp/forms.py:30 cfp/forms.py:132 cfp/forms.py:258 cfp/models.py:382
msgid "Confirmed"
msgstr "Confirmé"
-#: cfp/forms.py:31 cfp/models.py:386
+#: cfp/forms.py:31 cfp/models.py:384
msgid "Cancelled"
msgstr "Annulé"
-#: cfp/forms.py:63 cfp/models.py:475
+#: cfp/forms.py:63 cfp/models.py:473
msgid "Activity"
msgstr "Activité"
@@ -167,13 +167,13 @@ msgstr "Catégorie"
msgid "Title"
msgstr "Titre"
-#: cfp/forms.py:110 cfp/models.py:168 cfp/models.py:471
+#: cfp/forms.py:110 cfp/models.py:168 cfp/models.py:469
#: cfp/templates/cfp/proposal_talk_details.html:75
#: cfp/templates/cfp/staff/talk_details.html:64
msgid "Description"
msgstr "Description"
-#: cfp/forms.py:111 cfp/models.py:122 cfp/models.py:496
+#: cfp/forms.py:111 cfp/models.py:122 cfp/models.py:494
#: cfp/templates/cfp/staff/participant_details.html:24
#: cfp/templates/cfp/staff/talk_details.html:83
#: cfp/templates/cfp/staff/volunteer_details.html:22
@@ -184,7 +184,7 @@ msgstr "Notes"
msgid "Visible by speakers"
msgstr "Visible par les orateurs"
-#: cfp/forms.py:138 cfp/forms.py:264 cfp/models.py:340
+#: cfp/forms.py:138 cfp/forms.py:264 cfp/models.py:338
#: cfp/templates/cfp/staff/talk_details.html:21
#: cfp/templates/cfp/staff/talk_list.html:58
#: cfp/templates/cfp/staff/track_form.html:14
@@ -222,7 +222,7 @@ msgstr "Programmé"
msgid "Filter talks already / not yet scheduled"
msgstr "Filtrer les exposés déjà / pas encore planifiées"
-#: cfp/forms.py:162 cfp/models.py:358
+#: cfp/forms.py:162 cfp/models.py:356
#: cfp/templates/cfp/proposal_talk_details.html:89
#: cfp/templates/cfp/staff/talk_details.html:54
msgid "Materials"
@@ -277,7 +277,7 @@ msgstr "Envoyer un e-mail"
msgid "Notify by mail?"
msgstr "Notifier par e-mail ?"
-#: cfp/forms.py:280 cfp/models.py:491
+#: cfp/forms.py:280 cfp/models.py:489
#: cfp/templates/cfp/staff/volunteer_list.html:43
msgid "Email"
msgstr "E-mail"
@@ -403,8 +403,8 @@ msgstr ""
"L’adresse de réponse doit être une chaine de texte formatable avec un "
"argument « token » (e.g. ponyconf+{token}@exemple.com)."
-#: cfp/models.py:110 cfp/models.py:166 cfp/models.py:188 cfp/models.py:218
-#: cfp/models.py:469 cfp/templates/cfp/staff/participant_list.html:54
+#: cfp/models.py:110 cfp/models.py:166 cfp/models.py:186 cfp/models.py:216
+#: cfp/models.py:467 cfp/templates/cfp/staff/participant_list.html:54
#: cfp/templates/cfp/staff/volunteer_list.html:42
msgid "Name"
msgstr "Nom"
@@ -417,39 +417,39 @@ msgstr "Ce champ est uniquement visible par les organisateurs."
msgid "Invited speaker"
msgstr "Orateur invité"
-#: cfp/models.py:190
+#: cfp/models.py:188
msgid "Label"
msgstr "Étiquette"
-#: cfp/models.py:191
+#: cfp/models.py:189
msgid "Capacity"
msgstr "Capacité"
-#: cfp/models.py:220
+#: cfp/models.py:218
msgid "Color"
msgstr "Couleur"
-#: cfp/models.py:222
+#: cfp/models.py:220
msgid "Show the tag on the public program"
msgstr "Afficher l’étiquette sur le programme public"
-#: cfp/models.py:223
+#: cfp/models.py:221
msgid "Show the tag on the staff program"
msgstr "Afficher l’étiquette sur le programme organisateur"
-#: cfp/models.py:259
+#: cfp/models.py:257
msgid "Default duration (min)"
msgstr "Durée par défaut (min)"
-#: cfp/models.py:260
+#: cfp/models.py:258
msgid "Color on program"
msgstr "Couleur sur le programme"
-#: cfp/models.py:261
+#: cfp/models.py:259
msgid "Label on program"
msgstr "Label dans le xml du programme"
-#: cfp/models.py:335 cfp/templates/cfp/proposal_talk_details.html:53
+#: cfp/models.py:333 cfp/templates/cfp/proposal_talk_details.html:53
#: cfp/templates/cfp/staff/base.html:10
#: cfp/templates/cfp/staff/participant_list.html:16
#: cfp/templates/cfp/staff/talk_details.html:68
@@ -457,23 +457,23 @@ msgstr "Label dans le xml du programme"
msgid "Speakers"
msgstr "Orateurs"
-#: cfp/models.py:336
+#: cfp/models.py:334
msgid "Talk Title"
msgstr "Titre de la proposition"
-#: cfp/models.py:338
+#: cfp/models.py:336
msgid "Description of your talk"
msgstr "Description de votre proposition"
-#: cfp/models.py:339
+#: cfp/models.py:337
msgid "This description will be visible on the program."
msgstr "Cette description sera visible sur le programme."
-#: cfp/models.py:342 cfp/templates/cfp/proposal_talk_details.html:99
+#: cfp/models.py:340 cfp/templates/cfp/proposal_talk_details.html:99
msgid "Message to organizers"
msgstr "Message aux organisateurs"
-#: cfp/models.py:343
+#: cfp/models.py:341
msgid ""
"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 "
@@ -483,51 +483,51 @@ msgstr ""
"votre proposition, comme une vidéo, des slides, n'hésitez pas à les ajouter "
"ici. Ce champ ne sera visible que par les organisateurs."
-#: cfp/models.py:347
+#: cfp/models.py:345
msgid "Talk Category"
msgstr "Catégorie de proposition"
-#: cfp/models.py:348
+#: cfp/models.py:346
msgid "I'm ok to be recorded on video"
msgstr "J’accepte d’être enregistré en vidéo"
-#: cfp/models.py:350
+#: cfp/models.py:348
msgid "Video licence"
msgstr "Licence vidéo"
-#: cfp/models.py:351
+#: cfp/models.py:349
msgid "I need sound"
msgstr "J’ai besoin de son"
-#: cfp/models.py:354
+#: cfp/models.py:352
msgid "Beginning date and time"
msgstr "Date et heure de début"
-#: cfp/models.py:355
+#: cfp/models.py:353
msgid "Duration (min)"
msgstr "Durée (min)"
-#: cfp/models.py:359
+#: cfp/models.py:357
msgid ""
"You can use this field to share some materials related to your intervention."
msgstr ""
"Vous pouvez utiliser ce champ pour partager les supports de votre "
"intervention."
-#: cfp/models.py:388
+#: cfp/models.py:386
msgid "Waiting confirmation"
msgstr "En attente de confirmation"
-#: cfp/models.py:390
+#: cfp/models.py:388
msgid "Refused"
msgstr "Refusé"
-#: cfp/models.py:392
+#: cfp/models.py:390
#, python-format
msgid "Pending decision, score: %(score).1f"
msgstr "En cours, score : %(score).1f"
-#: cfp/models.py:476 cfp/models.py:498
+#: cfp/models.py:474 cfp/models.py:496
#: cfp/templates/cfp/admin/activity_list.html:9
#: cfp/templates/cfp/admin/base.html:14
#: cfp/templates/cfp/staff/volunteer_details.html:27
@@ -536,11 +536,11 @@ msgstr "En cours, score : %(score).1f"
msgid "Activities"
msgstr "Activités"
-#: cfp/models.py:490
+#: cfp/models.py:488
msgid "Your Name"
msgstr "Votre Nom"
-#: cfp/models.py:497
+#: cfp/models.py:495
msgid "If you have some constraints, you can indicate them here."
msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici."
@@ -734,7 +734,7 @@ msgstr "Éditer votre profil"
#: cfp/templates/cfp/proposal_dashboard.html:18
#: cfp/templates/cfp/volunteer_dashboard.html:20
-msgid "Your informations"
+msgid "Your information"
msgstr "Vos informations"
#: cfp/templates/cfp/proposal_dashboard.html:22
@@ -976,7 +976,8 @@ msgid "Remove"
msgstr "Supprimer"
#: cfp/templates/cfp/staff/participant_details.html:28
-msgid "Informations"
+#: cfp/templates/cfp/staff/talk_details.html:12
+msgid "Information"
msgstr "Informations"
#: cfp/templates/cfp/staff/participant_details.html:39
@@ -1222,10 +1223,6 @@ msgstr "Accepter la proposition"
msgid "Decline the proposal"
msgstr "Décliner la proposition"
-#: cfp/templates/cfp/staff/talk_details.html:12
-msgid "Information"
-msgstr "Informations"
-
#: cfp/templates/cfp/staff/talk_details.html:25
msgctxt "session"
msgid "not defined"
@@ -1341,11 +1338,11 @@ msgid "Email:"
msgstr "E-mail :"
#: cfp/templates/cfp/staff/volunteer_details.html:31
-msgid "The volunteer applied for following activities:"
+msgid "This volunteer applied for the following activities:"
msgstr "Le bénévole s'est proposé pour les activités suivantes :"
#: cfp/templates/cfp/staff/volunteer_details.html:41
-msgid "The volunteer does not applied for any activities."
+msgid "This volunteer hasn't applied for any activities."
msgstr "Le bénévole ne s’est proposé pour aucune activité."
#: cfp/templates/cfp/staff/volunteer_details.html:49
@@ -1392,7 +1389,7 @@ msgid "Sorry, I have a setback"
msgstr "Désolé, j’ai un contretemps"
#: cfp/templates/cfp/volunteer_enrole.html:12
-msgid "Become a volunteers!"
+msgid "Become a volunteer!"
msgstr "Devenez un bénévole !"
#: cfp/templates/cfp/volunteer_enrole.html:14
@@ -1463,7 +1460,7 @@ msgid "[%(conference)s] Someone asked to access your profil"
msgstr "[%(conference)s] Quelqu’un a demandé à accéder à votre profil"
#: cfp/views.py:123 cfp/views.py:375
-msgid "A email have been sent with a link to access to your profil."
+msgid "An email has been sent with a link to access to your profil."
msgstr "Un e-mail vous a été envoyé avec un lien pour accéder à votre profil."
#: cfp/views.py:143 cfp/views.py:413 cfp/views.py:500
@@ -1542,7 +1539,7 @@ msgid "[%(conference)s] Thank you for your proposition '%(talk)s'"
msgstr "[%(conference)s] Merci pour votre proposition « %(talk)s »"
#: cfp/views.py:334 cfp/views.py:417
-msgid "Your proposition have been successfully submitted!"
+msgid "Your proposition has been successfully submitted!"
msgstr "Votre proposition a été transmise avec succès !"
#: cfp/views.py:353
@@ -1661,39 +1658,32 @@ msgid "Co-speaker successfully removed from the talk."
msgstr "Co-intervenant supprimé de l’exposé avec succès."
#: cfp/views.py:587
-msgid "The speaker confirmation have been noted."
+msgid "The speaker confirmation has been noted."
msgstr "La confirmation de l’orateur a été notée."
#: cfp/views.py:589
-msgid "The talk have been confirmed."
+msgid "The talk has been confirmed."
msgstr "L’exposé a été confirmé."
#: cfp/views.py:591
-msgid "The speaker unavailability have been noted."
+msgid "The speaker unavailability has been noted."
msgstr "L’indisponibilité de l’intervenant a été notée."
-#: cfp/views.py:593
+#: cfp/views.py:593 cfp/views.py:694 cfp/views.py:849
#, python-format
-msgid "The talk have been %(action)s."
+msgid "The talk has been %(action)s."
msgstr "L’exposé a été %(action)s."
#: cfp/views.py:597
-#, python-format
-msgid "[%(conference)s] The talk '%(talk)s' have been %(action)s."
+msgid "[%(conference)s] The talk '%(talk)s' has been %(action)s."
msgstr "[%(conference)s] L’exposé « %(talk)s » a été %(action)s."
#: cfp/views.py:693 cfp/views.py:825
msgid "declined"
msgstr "décliné"
-#: cfp/views.py:694 cfp/views.py:849
-#, python-format
-msgid "The talk has been %(action)s."
-msgstr "L’exposé a été %(action)s."
-
#: cfp/views.py:698 cfp/views.py:844
-#, python-format
-msgid "[%(conference)s] The talk '%(talk)s' have been %(action)s"
+msgid "[%(conference)s] The talk '%(talk)s' has been %(action)s"
msgstr "[%(conference)s] L’exposé « %(talk)s » a été %(action)s"
#: cfp/views.py:782
@@ -1710,8 +1700,7 @@ msgid "Vote successfully updated"
msgstr "Vote mis à jour"
#: cfp/views.py:833
-#, python-format
-msgid "[%(conference)s] Your talk '%(talk)s' have been %(action)s"
+msgid "[%(conference)s] Your talk '%(talk)s' has been %(action)s"
msgstr "[%(conference)s] Votre exposé « %(talk)s » a été %(action)s"
#: cfp/views.py:851
@@ -1784,11 +1773,11 @@ msgstr "Envoyer"
msgid "No messages."
msgstr "Aucun message."
-#: ponyconf/settings.py:141
+#: ponyconf/settings.py:126
msgid "English"
msgstr "Anglais"
-#: ponyconf/settings.py:142
+#: ponyconf/settings.py:127
msgid "French"
msgstr "Français"
@@ -1840,6 +1829,12 @@ msgstr "Mot de passe oublié ?"
msgid "Password Change"
msgstr "Changement de mot de passe"
+#~ msgid "Informations"
+#~ msgstr "Informations"
+
+#~ msgid "The talk have been %(action)s."
+#~ msgstr "L’exposé a été %(action)s."
+
#~ msgid "Messages"
#~ msgstr "Messages"