locale, fix null options

diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo
index cd29817f712f63b4f18a4c284f1382f918047b21..a0a167ab1acaacc9ccb266e0a15fe6856ac11660 100644 (file)
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 fa5db85f897726f4cf32a542c5448d709314754f..6ab8264b7991a04030b7801a6f7714d34ac1a219 100644 (file)
--- 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 <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\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 (file)
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 8f87884dcb4c56794b0c089aaaaccc8e1058a35d..e06bc48036badbe6ad95e3af94705c06236787e5 100644 (file)
--- 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 <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\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 7ae3a82fc3eeb7a02fdf46a4f2b13bd809b62c94..470570b469cf34f3d294c40190b954ff0ce8b4f4 100644 (file)
--- 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 3166b74719fe52d929a0dc5b977052d0ac9b5ac6..9dbea3e11faaa767ffe1bdd1a1f1dcd6991b402e 100644 (file)
--- a/teleforma/templates/registration/registration_pdf.html
+++ b/teleforma/templates/registration/registration_pdf.html
@@ -47,7 +47,7 @@
       <tr><td class="bold">{% trans "Studying level" %} : </td><td>{{ student.level }}</td></tr>
       <tr><td class="bold">{% trans "IEJ" %} : </td><td>{{ student.iej.name }}</td></tr>
       <tr><td class="bold">{% trans "Training" %} : </td><td>{{ student.training.name }}</td></tr>
-      <tr><td class="bold">{% trans "Training type" %} : </td><td>{% if student.platform_only %}E-learning seulement{% else %}Présentielle et E-learning{% endif %}</td></tr>
+      <tr><td class="bold">{% trans "Training type" %} : </td><td>{% if student.platform_only %}E-learning seulement{% else %}Présentielle{% endif %}</td></tr>
       <tr><td class="bold">{% trans "Matière de procédure" %} : </td><td>{{ student.procedure }}</td></tr>
       <tr><td class="bold">{% trans "Matière juridique de spécialité" %} : </td><td>{{ student.written_speciality }}</td></tr>
       <tr><td class="bold">{% trans "Matière d'oral de spécialité" %} : </td><td>{{ student.oral_speciality }}</td></tr>

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 6ba9f1026691332730f458e36ea7e025b0b63e02..82d88d4a71665d8911b39ae9a435716650413364 100644 (file)
--- 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()