From: yomguy Date: Wed, 25 Jul 2012 19:10:31 +0000 (+0200) Subject: fix media buttons and trans X-Git-Tag: 0.8.3~11 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=96a7d49006d05c6c2e7927c8ce795ebfe26c8155;p=teleforma.git fix media buttons and trans --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 59ed2d36..cc63bfc5 100644 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 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 %}