fix conf infos

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index fff2ac47293f23dbca2ce6284b01a038cdc39d5c..d37159db45daadec1a6b523b17df1ecf2a0f730a 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 f99c718966eceb1814db595769f03e298634acd5..e78cf1bf7a42183f379b225a0aaf79ad2525a3a6 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/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: 2012-08-19 00:05+0200\n"
+"POT-Creation-Date: 2012-08-22 10:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -582,7 +582,7 @@ msgstr "Description"
 
 #: templates/teleforma/course.html:20 templates/teleforma/course.html.py:36
 #: templates/teleforma/course.html:53
-#: templates/teleforma/course_media.html:141
+#: templates/teleforma/course_media.html:142
 #: templates/telemeta/profile_detail.html:86
 msgid "Date added"
 msgstr "Date d'ajout"
@@ -652,6 +652,11 @@ msgstr "Date de fin"
 msgid "Live"
 msgstr "Direct"
 
+#: templates/teleforma/course_conference.html:78
+#: templatetags/teleforma_tags.py:132
+msgid "Yes"
+msgstr "Oui"
+
 #: templates/teleforma/course_conference.html:79
 #: templates/teleforma/course_conference_audio.html:69
 #: templates/teleforma/course_media.html:139
@@ -659,15 +664,10 @@ msgid "Room"
 msgstr "Salle"
 
 #: templates/teleforma/course_conference.html:81
-#: templates/teleforma/course_media.html:143
+#: templates/teleforma/course_media.html:145
 msgid "Conference ID"
 msgstr "ID Conférence"
 
-#: templates/teleforma/course_conference.html:83
-#: templates/teleforma/course_media.html:148
-msgid "Mime type"
-msgstr "Type mime"
-
 #: templates/teleforma/course_conference_audio.html:36
 #: templates/teleforma/course_media.html:76
 msgid "Video"
@@ -710,7 +710,11 @@ msgstr " rejeté"
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/teleforma/course_media.html:142
+#: templates/teleforma/course_media.html:141
+msgid "Mime type"
+msgstr "Type mime"
+
+#: templates/teleforma/course_media.html:143
 msgid "Date modified"
 msgstr "Date de modification"
 
@@ -1039,13 +1043,9 @@ msgstr "Tweeter local"
 msgid "me"
 msgstr "moi"
 
-#: templatetags/teleforma_tags.py:132
-msgid "Yes"
-msgstr ""
-
 #: templatetags/teleforma_tags.py:134
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #~ msgid "Reject"
 #~ msgstr "Rejeter"

diff --git a/teleforma/models.py b/teleforma/models.py
index a04145a7224b5b6be401e0b2da2762ef75c27f31..ca97430d8bf4a2e8fe3eca266ad245981ac2ab84 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -298,14 +298,14 @@ class LiveStream(Model):
 
     element_type = 'livestream'
 
-    conference      = ForeignKey('Conference', related_name='livestream',
+    conference   = ForeignKey('Conference', related_name='livestream',
                                 verbose_name=_('conference'),
                                 blank=True, null=True, on_delete=models.SET_NULL)
-    server     = ForeignKey('StreamingServer', related_name='livestream',
+    server       = ForeignKey('StreamingServer', related_name='livestream',
                                 verbose_name=_('streaming server'))
-    stream_type = CharField(_('Streaming type'),
+    stream_type  = CharField(_('Streaming type'),
                             choices=streaming_choices, max_length=32)
-    streaming       = BooleanField(_('streaming'))
+    streaming    = BooleanField(_('streaming'))
 
     @property
     def slug(self):

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index eceee20df1fd24a18eb2912b825148d9c2132c80..70c4787a7633da9f1680445b61311b6bfeaefa33 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -75,10 +75,9 @@
 {% if conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ conference.comment }}</dd>{% endif %}
 <dt>{% trans "Begin date" %}</dt><dd>{{ conference.date_begin }}</dd>
 {% if conference.date_end %}<dt>{% trans "End date" %}</dt><dd>{{ conference.date_end|yes_no }}</dd>{% endif %}
-<dt>{% trans "Live" %}</dt><dd>{{ conference.streaming|yes_no }}</dd>
+<dt>{% trans "Live" %}</dt><dd>{% trans "Yes" %}</dd>
 {% if conference.room %}<dt>{% trans "Room" %}</dt><dd>{{ conference.room }}</dd>{% endif %}
 {% if user.is_staff or user.is_superuser %}
-<dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
 <dt>{% trans "Conference ID" %}</dt><dd>{{ conference.public_id }}</dd>
 {% endif %}