locale

diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo
index c5d14fdaadbc8f6ad9d27937b2e11065523a4f4d..25024dc78e578765354574378554d3eeb53e9495 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 51cc0f658c0bd723dfc8ae35ed405f153cc53d66..f416eff2bdbbf5de1f10fbee92fb462f95ed6acf 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:10+0100\n"
+"POT-Creation-Date: 2016-02-04 10:37+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"
@@ -371,7 +371,7 @@ msgstr "Nouvelle note"
 
 #: exam/templates/exam/score_form.html:60
 #: exam/templates/exam/script_form.html:78
-#: templates/registration/registration_form.html:21
+#: templates/registration/registration_form.html:22
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -710,11 +710,11 @@ msgstr "spécialité écrit"
 msgid "oral speciality"
 msgstr "spécialité orale"
 
-#: models/crfpa.py:82 models/crfpa.py:133
+#: models/crfpa.py:82
 msgid "oral 1"
 msgstr ""
 
-#: models/crfpa.py:85 models/crfpa.py:136
+#: models/crfpa.py:85
 msgid "oral 2"
 msgstr ""
 
@@ -738,6 +738,14 @@ msgstr "formation"
 msgid "trainings"
 msgstr "formations"
 
+#: models/crfpa.py:133
+msgid "oral 1 (option)"
+msgstr ""
+
+#: models/crfpa.py:136
+msgid "oral 2 (option)"
+msgstr ""
+
 #: models/crfpa.py:143
 #, fuzzy
 #| msgid "platform only"
@@ -884,31 +892,41 @@ msgstr "Frais optionnels"
 msgid "students"
 msgstr "étudiant"
 
-#: models/messages.py:27
+#: models/messages.py:18
+#, fuzzy
+#| msgid "Student"
+msgid "Student group"
+msgstr "Etudiant"
+
+#: models/messages.py:28
 msgid "group"
 msgstr ""
 
-#: models/messages.py:30
+#: models/messages.py:31
 msgid "sender"
 msgstr ""
 
-#: models/messages.py:32
+#: models/messages.py:33
 #, fuzzy
 #| msgid "Reject"
 msgid "subject"
 msgstr "Rejeter"
 
-#: models/messages.py:33
+#: models/messages.py:34
 #, fuzzy
 msgid "message"
 msgstr "Messages"
 
-#: models/messages.py:36
+#: models/messages.py:37
 #, fuzzy
 #| msgid "date end"
 msgid "date sent"
 msgstr "date de fin"
 
+#: models/messages.py:41 templates/telemeta/users.html:55
+msgid "Grouped message"
+msgstr "Message groupé"
+
 #: models/pro.py:47
 msgid "price"
 msgstr "prix"
@@ -1460,7 +1478,7 @@ msgid ""
 msgstr ""
 
 #: templates/registration/registration_complete.html:6
-#: templates/registration/registration_pdf.html:13 views/crfpa.py:469
+#: templates/registration/registration_pdf.html:13 views/crfpa.py:471
 msgid "Registration"
 msgstr "Inscription"
 
@@ -1965,10 +1983,6 @@ msgstr ""
 msgid "Courses"
 msgstr "Matières"
 
-#: templates/telemeta/users.html:55
-msgid "Grouped message"
-msgstr "Message groupé"
-
 #: templates/telemeta/users.html:74
 msgid "No users"
 msgstr "Pas d'utilisateurs"
@@ -2016,6 +2030,11 @@ msgstr "Une nouvelle conférence en direct a commencé : "
 msgid "You have successfully register your account."
 msgstr ""
 
+#, fuzzy
+#~| msgid "Grouped message"
+#~ msgid "Group messages"
+#~ msgstr "Message groupé"
+
 #~ msgid "Testimonials"
 #~ msgstr "Attestations"
 

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index fe0ba3eef5d3718b5a569dd8d6042ea5ecc541dc..0363bfd63567516eb2b1b907fa8e673f1f6c9d27 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 057449ef34b394c29b5f64e8c41587982f68e8d7..8ee3c4db0664be9685c1ed8f0c051bdb5c071f1b 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:10+0100\n"
+"POT-Creation-Date: 2016-02-04 10:37+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"
@@ -25,7 +25,7 @@ msgstr "période"
 
 #: admin.py:62
 msgid "Group"
-msgstr ""
+msgstr "Groupe"
 
 #: exam/models.py:62 exam/models.py:442
 msgid "rejected"
@@ -371,7 +371,7 @@ msgstr "Nouvelle note"
 
 #: exam/templates/exam/score_form.html:60
 #: exam/templates/exam/script_form.html:78
-#: templates/registration/registration_form.html:21
+#: templates/registration/registration_form.html:22
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -706,11 +706,11 @@ msgstr "spécialité écrit"
 msgid "oral speciality"
 msgstr "spécialité orale"
 
-#: models/crfpa.py:82 models/crfpa.py:133
+#: models/crfpa.py:82
 msgid "oral 1"
 msgstr ""
 
-#: models/crfpa.py:85 models/crfpa.py:136
+#: models/crfpa.py:85
 msgid "oral 2"
 msgstr ""
 
@@ -734,6 +734,14 @@ msgstr "formation"
 msgid "trainings"
 msgstr "formations"
 
+#: models/crfpa.py:133
+msgid "oral 1 (option)"
+msgstr ""
+
+#: models/crfpa.py:136
+msgid "oral 2 (option)"
+msgstr ""
+
 #: models/crfpa.py:143
 msgid "e-learning platform only"
 msgstr "formation e-learning uniquement"
@@ -872,31 +880,41 @@ msgstr "Frais optionnels"
 msgid "students"
 msgstr "étudiants"
 
-#: models/messages.py:27
+#: models/messages.py:18
+#, fuzzy
+#| msgid "Student"
+msgid "Student group"
+msgstr "Etudiant groupe"
+
+#: models/messages.py:28
 msgid "group"
-msgstr ""
+msgstr "group"
 
-#: models/messages.py:30
+#: models/messages.py:31
 msgid "sender"
 msgstr ""
 
-#: models/messages.py:32
+#: models/messages.py:33
 #, fuzzy
 #| msgid "Reject"
 msgid "subject"
 msgstr "Rejeter"
 
-#: models/messages.py:33
+#: models/messages.py:34
 #, fuzzy
 msgid "message"
 msgstr "Messages"
 
-#: models/messages.py:36
+#: models/messages.py:37
 #, fuzzy
 #| msgid "date end"
 msgid "date sent"
 msgstr "date de fin"
 
+#: models/messages.py:41 templates/telemeta/users.html:55
+msgid "Grouped message"
+msgstr "Message groupé"
+
 #: models/pro.py:47
 msgid "price"
 msgstr "prix"
@@ -1448,7 +1466,7 @@ msgid ""
 msgstr ""
 
 #: templates/registration/registration_complete.html:6
-#: templates/registration/registration_pdf.html:13 views/crfpa.py:469
+#: templates/registration/registration_pdf.html:13 views/crfpa.py:471
 msgid "Registration"
 msgstr "Inscription"
 
@@ -1943,10 +1961,6 @@ msgstr ""
 msgid "Courses"
 msgstr "Matières"
 
-#: templates/telemeta/users.html:55
-msgid "Grouped message"
-msgstr "Message groupé"
-
 #: templates/telemeta/users.html:74
 msgid "No users"
 msgstr "Pas d'utilisateurs"
@@ -1994,6 +2008,11 @@ msgstr "Une nouvelle conférence en direct a commencé : "
 msgid "You have successfully register your account."
 msgstr ""
 
+#, fuzzy
+#~| msgid "Grouped message"
+#~ msgid "Group messages"
+#~ msgstr "Message groupé"
+
 #~ msgid "Testimonials"
 #~ msgstr "Attestations"
 

diff --git a/teleforma/models/messages.py b/teleforma/models/messages.py
index f362249654ee5d707e6ecb447cc87d6c0fe4e46a..e0fb88aee8751ce1188383235dba0095029819e3 100644 (file)
--- a/teleforma/models/messages.py
+++ b/teleforma/models/messages.py
@@ -15,6 +15,7 @@ class StudentGroup(models.Model):
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'student_groups'
+        verbose_name = _('Student group')
 
     def __unicode__(self):
         return self.name
@@ -37,6 +38,7 @@ class GroupedMessage(models.Model):
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'grouped_messages'
+        verbose_name = _('Grouped message')
 
     def __unicode__(self):
         return self.group.name + ' ' + self.subject