diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 8cbce2b..e359dd1 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 18e2cde..a359c21 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-31 21:53+0000\n" +"POT-Creation-Date: 2016-09-03 22:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -138,6 +138,7 @@ msgid "Submit" msgstr "Envoyer" #: accounts/templates/accounts/profile.html:30 ponyconf/templates/_form.html:16 +#: proposals/templates/proposals/talk_decide.html:23 msgid "Cancel" msgstr "Annuler" @@ -284,11 +285,11 @@ msgstr "S’inscrire" msgid "Powered by" msgstr "Propulsé par" -#: proposals/forms.py:22 +#: proposals/forms.py:23 msgid "Should be less than 255 characters" msgstr "Texte court, moins de 255 caractères" -#: proposals/forms.py:23 +#: proposals/forms.py:24 msgid "If you want to add some precisions for the organizers." msgstr "Si vous souhaitez apporter des précisions à l'équipe d'organisation." @@ -312,6 +313,10 @@ msgstr "Titre" msgid "Abstract" msgstr "Résumé" +#: proposals/models.py:72 +msgid "Intervention kind" +msgstr "Type d’intervention" + #: proposals/signals.py:25 msgid "conference (short)" msgstr "conférence (courte)" @@ -412,7 +417,7 @@ msgstr "Somme :" msgid "Status:" msgstr "Statut :" -#: proposals/templates/proposals/talk_detail.html:69 +#: proposals/templates/proposals/talk_detail.html:75 msgid "Messages:" msgstr "Messages :" @@ -461,3 +466,7 @@ msgstr "A voté !" #: proposals/views.py:155 msgid "Vote successfully updated" msgstr "Vote mis à jour" + +#: proposals/views.py:167 +msgid "Decision taken in account" +msgstr "Décision enregistrée" diff --git a/proposals/models.py b/proposals/models.py index 8999d37..558c1cc 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -69,7 +69,7 @@ class Talk(PonyConfModel): description = models.TextField(blank=True, verbose_name=_('Description')) topics = models.ManyToManyField(Topic, blank=True, verbose_name=_('Topics')) notes = models.TextField(blank=True, verbose_name=_('Notes')) - event = models.ForeignKey(Event) + event = models.ForeignKey(Event, verbose_name=_('Intervention kind')) accepted = models.NullBooleanField(default=None) def __str__(self):