From 0a39f9cf57e37dca14e9b8e1efc28c087cbb6478 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 4 Feb 2016 12:16:32 +0100 Subject: [PATCH] locale, fix null options --- teleforma/locale/en/LC_MESSAGES/django.mo | Bin 13187 -> 13187 bytes teleforma/locale/en/LC_MESSAGES/django.po | 16 +++++++++++++-- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 14540 -> 14703 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 19 ++++++++++++------ teleforma/models/messages.py | 4 ++-- .../registration/registration_pdf.html | 2 +- teleforma/views/crfpa.py | 6 +++++- 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo index cd29817f712f63b4f18a4c284f1382f918047b21..a0a167ab1acaacc9ccb266e0a15fe6856ac11660 100644 GIT binary patch delta 17 YcmZopZ%*IPtjuC$WoWj!UHK0`06TaFY5)KL delta 17 YcmZopZ%*IPtjuCyWoo#&UHK0`06Sy`X8-^I diff --git a/teleforma/locale/en/LC_MESSAGES/django.po b/teleforma/locale/en/LC_MESSAGES/django.po index fa5db85f..6ab8264b 100644 --- a/teleforma/locale/en/LC_MESSAGES/django.po +++ b/teleforma/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-04 10:51+0100\n" +"POT-Creation-Date: 2016-02-04 12:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -917,6 +917,18 @@ msgstr "Rejeter" msgid "message" msgstr "Messages" +#: models/messages.py:35 +#, fuzzy +#| msgid "date end" +msgid "to send" +msgstr "date de fin" + +#: models/messages.py:36 +#, fuzzy +#| msgid "date end" +msgid "sent" +msgstr "date de fin" + #: models/messages.py:37 #, fuzzy #| msgid "date end" @@ -1478,7 +1490,7 @@ msgid "" msgstr "" #: templates/registration/registration_complete.html:6 -#: templates/registration/registration_pdf.html:13 views/crfpa.py:471 +#: templates/registration/registration_pdf.html:13 views/crfpa.py:475 msgid "Registration" msgstr "Inscription" diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index f2f79a8be7ad6b179cbe8c6e0db1ca8a5dae20bc..7664b5afbe953eca2c5ebca5c5ac653129c2056c 100644 GIT binary patch delta 6451 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\n" "Language-Team: LANGUAGE \n" @@ -421,7 +421,7 @@ msgstr "Note" #: templates/postman/base_write.html:63 #: templates/teleforma/inc/chat_room.html:13 msgid "Send" -msgstr "Envoyer" +msgstr "Envoyé" #: exam/templates/exam/script_form.html:32 exam/templates/exam/scripts.html:36 msgid "New script" @@ -890,7 +890,7 @@ msgstr "group" #: models/messages.py:31 msgid "sender" -msgstr "" +msgstr "expéditeur" #: models/messages.py:33 #, fuzzy @@ -899,9 +899,16 @@ msgid "subject" msgstr "Rejeter" #: models/messages.py:34 -#, fuzzy msgid "message" -msgstr "Messages" +msgstr "message" + +#: models/messages.py:35 +msgid "to send" +msgstr "à envoyer" + +#: models/messages.py:36 +msgid "sent" +msgstr "envoyé" #: models/messages.py:37 #, fuzzy @@ -1464,7 +1471,7 @@ msgid "" msgstr "" #: templates/registration/registration_complete.html:6 -#: templates/registration/registration_pdf.html:13 views/crfpa.py:471 +#: templates/registration/registration_pdf.html:13 views/crfpa.py:475 msgid "Registration" msgstr "Inscription" diff --git a/teleforma/models/messages.py b/teleforma/models/messages.py index 7ae3a82f..470570b4 100644 --- a/teleforma/models/messages.py +++ b/teleforma/models/messages.py @@ -32,8 +32,8 @@ class GroupedMessage(models.Model): blank=True, null=True, on_delete=models.SET_NULL) subject = models.CharField(_('subject'), max_length=119) message = models.TextField(_('message')) - to_send = models.BooleanField(default=False) - sent = models.BooleanField(default=False) + to_send = models.BooleanField(_('to send'), default=False) + sent = models.BooleanField(_('sent'), default=False) date_sent = models.DateTimeField(_('date sent'), null=True, blank=True) class Meta(MetaCore): diff --git a/teleforma/templates/registration/registration_pdf.html b/teleforma/templates/registration/registration_pdf.html index 3166b747..9dbea3e1 100644 --- a/teleforma/templates/registration/registration_pdf.html +++ b/teleforma/templates/registration/registration_pdf.html @@ -47,7 +47,7 @@ {% trans "Studying level" %} : {{ student.level }} {% trans "IEJ" %} : {{ student.iej.name }} {% trans "Training" %} : {{ student.training.name }} - {% trans "Training type" %} : {% if student.platform_only %}E-learning seulement{% else %}Présentielle et E-learning{% endif %} + {% trans "Training type" %} : {% if student.platform_only %}E-learning seulement{% else %}Présentielle{% endif %} {% trans "Matière de procédure" %} : {{ student.procedure }} {% trans "Matière juridique de spécialité" %} : {{ student.written_speciality }} {% trans "Matière d'oral de spécialité" %} : {{ student.oral_speciality }} diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py index 6ba9f102..82d88d4a 100644 --- a/teleforma/views/crfpa.py +++ b/teleforma/views/crfpa.py @@ -450,7 +450,11 @@ class RegistrationPDFView(PDFTemplateResponseMixin, TemplateView): student.trainings.add(student.training) if not student.training and student.trainings.all(): student.training = student.trainings.all()[0] - student.save() + if not student.oral_1: + student.oral_1 = Course.object.get(code='X') + if not student.oral_2: + student.oral_2 = Course.object.get(code='X') + student.save() profile = user.profile.all()[0] if profile.city: profile.city = profile.city.upper() -- 2.39.5