From 55fdd08b8c9f0886fd97780d0b230a9989142c18 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 22 Aug 2012 10:58:43 +0200 Subject: [PATCH] fix conf infos --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 6213 -> 6284 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 28 +++++++++--------- teleforma/models.py | 8 ++--- .../teleforma/course_conference.html | 3 +- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index fff2ac47293f23dbca2ce6284b01a038cdc39d5c..d37159db45daadec1a6b523b17df1ecf2a0f730a 100644 GIT binary patch delta 2825 zcmZ9NeQ4EH7{|{xt+m#C+bpN)%%-ho?apjw=G0}{O4m%YvZYSV=6p>}YpW}mh7b#p zND8DOSb@FJrLw}9U`|BJNDV1RLT`{6MWybK>hrnx45GvR{yyjJ_nhZ>&hy(ot$03> z?CRg^#Xw713WH+N8to`5)Oa^E)StM90lDs8s@`s5L01l zoUetKGM)pkfDMpeGBn494e$~cl5xBhYM>2jcn9>wU65bc%ft13P{;N|eeQ%g@K_ul zhkY2IhC1*|9RHanVfV&eBPfCz91K|tC2?F1HJE@NFgDIlgnb#;KpmSM*Bc|7p#iOf zI@l7q1sc!`FxRxdOs4?uh93N`3-A+|4Ljrf5oiP_<9ZkD&-h1J2)m(n`rwTY4dr1# z_=8a5prv_n_;CpoWe?_nm+qbUKdDLNoXWG~({Kp2a5L z?+aZoh6Yv==gSJXe<#K;;Q!F6SJMsM z_cyet^9Wn}L!jeQ*vCJ6Rdh`0G^itWP(!ohd?VE0GU$OTBiF-$j9a1mcfhM)J2Zfg zpmq;JYwBp6{|dVQjAOt5U+EaxMaXr90tRjv3O%?Snz9P0!D{FM)8HUj4?VaU4u{V| zeqj#}1Ns;)fF00`4Cmf-Xf#aP8Ar#+YT%Wy7HYT=4u-AJyW9zNU>78-VNV=?2z~!R z?NCqOiu?fTPzN+4CnCRvX5eRNgug=#UV!em z5R9-0n%QB{eF@1o7H_Mx(%5=Be4$5 z$Qon-wt48v=;TW zIy(2G(P)0pBwUCdi{n-BYP0}ZKfOKZ0o2px#Lf*p6OmIR$3g4mRjP3 zS)3N4Z78y~Y}aKlE0oZgnHi*?kMn#6ZTQdJBKqr*U&zyFC0dOd&?vMFO-IvEc4|vr zes-!Ye@j;OlC`OR1&gwCD=SM9730TNrCR&0$;p|yYGvx|fWNYG>ee@<&J-=q{ui+Z B+-Lv* delta 2758 zcmXw*d2Cfh6o;p!ma>&vp(?Utkwu^dL5oFJMUX|1O{&sGb{DG1Dm;ThA)-Vh2~?B> z#r}aNU_&C124bTBD3TBfCIm=Ci9vA-7)&tn`<|yK_jkWJbLXBpb7t<#+gAQ%S>}9k z-j0NAKwVK@UP_Jd*Vf#yEp1ccN?WLfK zA-lm2uoQA-(y(|i8s_t0V))ab0p>shR6$={1i8{mZa#knn%HJo0JpC$JMd27UiKXd)M(3;7dHf`3Ef zj^Uw+ObO0`83R|-xEU^iu4r8hcmo<}2XtHmbfUfCAB0x!Fm$EI;`vw5iB8A!3(y7q z6#c)2f4u|y?*utSHN$*37ZyVUE`v@`4=veh==e?0gkF#S?a|)=eQysm-p9~!p9POV z<9q?hA)P3s{&t+D!xt{agTJ5|dvctx4fG5YLdO-uT-ZIH_lo|$(LWTL$Z%)^m5?h< z;KpvGSW36?+vgsJOfSm3UtD&&=s{Jh!YnnQsnKYe-E1nk*YM}!cLr?cgXuz$|iFZJ9OuL~K`xLr0N1@}6L2^o8Ll%GoJfyjDC+UM`p$eo8 zL4%S1CtRGrA7x0Jf>vZ(*;^((3a3TKOK?@R#{^xa<{uPGI9dl=hq9*`_O&C7qm(WA zS~vprM>9|<(ng~D&>Zx#-~atI9zxo)=q@x)2b=ys(lc;Lw1s;+6fH;fXcW?BqQ}q+ z=uYI;3_^9t-+&fdNn^GS^Ji^r&^??S?ONCkEe`))_#pCN)}X2AMO2Qo;b;+>k0zmk z=xMYX`I%QC?J4vyT8}aVxM|B!5A-;yM%~d|^dwq?G!K%t06l>o&T>@BZOqZ4 diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index f99c7189..e78cf1bf 100644 --- 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 \n" "Language-Team: LANGUAGE \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 a04145a7..ca97430d 100755 --- 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 eceee20d..70c4787a 100644 --- a/teleforma/templates/teleforma/course_conference.html +++ b/teleforma/templates/teleforma/course_conference.html @@ -75,10 +75,9 @@ {% if conference.comment %}
{% trans "Comment" %}
{{ conference.comment }}
{% endif %}
{% trans "Begin date" %}
{{ conference.date_begin }}
{% if conference.date_end %}
{% trans "End date" %}
{{ conference.date_end|yes_no }}
{% endif %} -
{% trans "Live" %}
{{ conference.streaming|yes_no }}
+
{% trans "Live" %}
{% trans "Yes" %}
{% if conference.room %}
{% trans "Room" %}
{{ conference.room }}
{% endif %} {% if user.is_staff or user.is_superuser %} -
{% trans "Mime type" %}
{{ media.mime_type }}
{% trans "Conference ID" %}
{{ conference.public_id }}
{% endif %} -- 2.39.5