From: Guillaume Pellerin Date: Thu, 4 Feb 2016 11:16:32 +0000 (+0100) Subject: locale, fix null options X-Git-Tag: 1.1~83 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a39f9cf57e37dca14e9b8e1efc28c087cbb6478;p=teleforma.git locale, fix null options --- diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo index cd29817f..a0a167ab 100644 Binary files a/teleforma/locale/en/LC_MESSAGES/django.mo and b/teleforma/locale/en/LC_MESSAGES/django.mo differ 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 f2f79a8b..7664b5af 100644 Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 8f87884d..e06bc480 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/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" @@ -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()