From 96a7d49006d05c6c2e7927c8ce795ebfe26c8155 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 25 Jul 2012 21:10:31 +0200 Subject: [PATCH] fix media buttons and trans --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 5923 -> 5826 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 33 +++++++++--------- .../templates/teleforma/course_media.html | 6 ++-- .../templates/teleforma/inc/media_list.html | 4 +-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 59ed2d36ef553af9bf1c5ac7ed3bb04c5538aca3..cc63bfc5d9917c20f358412e0067da3dff513089 100644 GIT binary patch delta 2533 zcmX|?X>6566o!XV$|AHZU2s8J1VP(MQ9z3Vl|_NFsGzN&fGuKKq_T*Tz>Oim4_wfz z#28DWHYQEb9~MK55melQ@`FT71O=C%1SJq-G=xZep4%gn@BN-RGxMD}b7tn=H!DA> z$QE#~dO718k|WRA2Ec7xj>F{K@0zXXf0TcD2L4*R{}XV3tTK>Z$r zPWT(t&mT~~=W^|tl+IJ>O~Xal3l{N}0|vkXI1Cz4MQ|)+XsUsZtA&Md9^^@l(cT>P zQ_w)SMEkR_FZNDY%>1d1iVpTc12_by!DEmo4JE$@P!${pbvOm~fis~CSQ!1y&=qfh zj>|y(Zwq@TG()>!#*S7hPS745A3|4lAlknU`&(#0C*b|?cW8zt5w#AdLo+i68o>Op z7lpkXI=&g|XMHdB-v~F;Ah$yuWFb%574~lE2YaLa05rhE(20&h_x1#I+%GT>o{j!L zqy3*~@64(Vq@a-eJ8>@>JX9r+MWvz8_E9mg8uD$bfo5uUupT)?AIVqYBm3+u00ywhhDQUp^mS#Z7q65K$uoU|+biz}xKl~f&sEBlUX3C%o7z`a( z9(FY>#-0ofpg#JWU?KCT^;C4U73$zQcsYCpI?=mu5c~@2=nPy0^Vla>+yD(=Rd54z z0b5`hdT6W);paFdo`~e!! zuh5KK2o`W~TzMa;pZ>vt&;<`Kjr(6ogAT?(S3Con(s?m(DRgBkq2o3|$7P|ZY=JJ| z4an}LcObVjO+X{j)o2D9f-H;B6=MGqrS^MlAh zEcbOFRR!n6ax@$bMmM8n=utEmSq3$CF!!F$djxtc+T4m;vNhexj54g8dHXZI1kFSDqSa_Qvecrx+s}00k(YhG zXJz}Lo)0O)MTH5j-J3GwO delta 2634 zcmYk7e@vBC7{`wY1%cf7aiL7f@<%xF3K3>1k!T_cp%My}dc}J~gz^WVt6^_VZEMk} zZmzB27WPN7DQVST>uebzd=-}iH#=RNOpp7We@ zcF!*UDCAwwOg!#r2hl7vI^DSwu=7qHw8<3bR>I$577X3xToNpY{M!JTS(__93eOZmf3)6cn9_tsD!o|n;>(z{ZN5AVLChp`MLMZ z|DoA^P>Bwie;8(Be*?3b-;L2xfZw1Jn1YosmAcY(bx;ZHG`2tm>@XfS|1p?>zZ+^n zz2+Z)TF94B36DTkWE6S|bd`=07=yBZfhyso`Tv4SAc^ec4?qP9LizK|&WB342yTU? zP!k`A`mP76awnk@=%2y<%Q0Y%VW zpuQh6dl+iI^X4D*=xDFLGsgtv=YHj(lKpLV0<-J-Wk9WLK2)HPu^8%5ErZR|oZA3( zZHEXRgg2oQP3C|oegJAAULGAyv>jCRh)(q8hUs?EQAA@hwn+4?!*D6{t#d zLzVml)VN;A&-L@r0=|mdp1VMYWZe%?rMdwX;HKGHmI5V1O_XNLf;reTp~e@%dtez< zoO-CU5{6np3)Hv{vyZ@R&YydWjuJR&0|uZUkHm-o$s?}y!LUM4M%#J`! z&~l~P&*S7MU;$J`ilNR#IaJ^ZsKB*Q zd)feX1{$FzYBT>~sDxgJgmy8rPX(#J0uABNhhIb4-$EsD9cu4?w)Z#8zGeIeYW#E# zg6?y`m~bjWuiC8G8W^1m(e&G_CI(9cH?qDRmRs0Gy{wYE6?=Tkfv zqW!1|X$w}yGLmz>-Skv=)j~}dPi+}mfK(eD`2(m7sVzmNe$TlTuo69n)}u8@Z9aO) z?{UwJs^{ZKS7sgJZZ2@;bZXI~h+4a6(f^w+?v~gkQhkozY@`Fe2kk{mP&Lw-X-5yE zT}W+P9REG%(c6xmG>?vp&RB)nLdg1Sp>FtMvsY;oIKwWC=AcEW1LA-0N?Vd1-4or_?l${~Mh0I> yo0=B$(#I1EmzNX|h64qO0e^h-K>WLrzSx^tH35xp$LDjTZ*VNDA|aNa^TEIGspE_Q diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 7a137a74..ebe37e35 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-07-25 20:53+0200\n" +"POT-Creation-Date: 2012-07-25 21:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -171,7 +171,9 @@ msgstr "crédits" msgid "date added" msgstr "date d'ajout" -#: models.py:356 +#: models.py:356 templates/teleforma/course_media.html:27 +#: templates/teleforma/course_media.html:79 +#: templates/teleforma/inc/media_list.html:43 msgid "published" msgstr "publié" @@ -542,10 +544,10 @@ msgstr "" msgid "Message" msgstr "Messages" -#: templates/postman/view.html:25 templates/teleforma/course_media.html:79 -#: templates/teleforma/inc/media_list.html:45 +#: templates/postman/view.html:25 +#, fuzzy msgid "Rejected" -msgstr "Rejeté" +msgstr "rejeté" #: templates/postman/view.html:25 msgid ":" @@ -661,13 +663,11 @@ msgstr "Nouvelle conférence" msgid "Record and stream" msgstr "Enregistrer et diffuser" -#: templates/teleforma/course_media.html:27 -msgid "Reject" -msgstr "Rejeter" - #: templates/teleforma/course_media.html:34 -msgid "Publish" -msgstr "Publier" +#: templates/teleforma/course_media.html:79 +#: templates/teleforma/inc/media_list.html:45 +msgid "rejected" +msgstr "rejeté" #: templates/teleforma/course_media.html:62 #: templates/teleforma/inc/document_list.html:22 @@ -675,11 +675,6 @@ msgstr "Publier" msgid "Download" msgstr "Télécharger" -#: templates/teleforma/course_media.html:79 -#: templates/teleforma/inc/media_list.html:43 -msgid "Published" -msgstr "Publié" - #: templates/teleforma/course_media.html:123 msgid "Begin date" msgstr "Date de début" @@ -1016,6 +1011,12 @@ msgstr "" msgid "No" msgstr "" +#~ msgid "Reject" +#~ msgstr "Rejeter" + +#~ msgid "Publish" +#~ msgstr "Publier" + #~ msgid "is live" #~ msgstr "en direct" diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index 39eff58e..6690b8fb 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -24,14 +24,14 @@ $(document).ready(function(){ var p = jQuery('#publish'); json([id],'teleforma.publish_media',function(){ p.removeClass('icon_delete').addClass('icon_ok') - p.html('{% trans "Published" %}') + p.html('{% trans "published" %}') }); }, unpublish : function(id){ var p = jQuery('#publish'); json([id],'teleforma.unpublish_media',function(){ p.removeClass('icon_ok').addClass('icon_delete') - p.html('{% trans "Rejected" %}') + p.html('{% trans "rejected" %}') }); } } @@ -76,7 +76,7 @@ $(document).ready(function(){  {% trans "Video" %} {% endif %} {% if user.is_staff %} - {% if media.is_published %}{% trans "Published" %}{% else %}{% trans "Rejected" %}{% endif %} + {% if media.is_published %}{% trans "published" %}{% else %}{% trans "rejected" %}{% endif %} {% endif %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 8f4b1172..121793af 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -40,9 +40,9 @@ {% if media.is_published and user.is_staff %} - + {% elif not media.is_published and user.is_staff %} - + {% endif %} {% if media.item.file %} -- 2.39.5