fix media buttons and trans

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 59ed2d36ef553af9bf1c5ac7ed3bb04c5538aca3..cc63bfc5d9917c20f358412e0067da3dff513089 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 7a137a7446a70001b2daf103f926d45b5d1a09d3..ebe37e35be1ed315b6e8770ff56abcfaab4b81da 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-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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 39eff58efe43a014fdaea991056d9f9cff619019..6690b8fb32f38aed85891883b06b0001cfb7a0a3 100644 (file)
--- 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(){
         <a href="{% url teleforma-media-detail media|get_video_id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>
         {% endif %}
         {% if user.is_staff %}
-        <a id="publish" href="#" class="{% if media.is_published %}component_icon button icon_ok{% else %}component_icon button icon_delete{% endif %}">{% if media.is_published %}{% trans "Published" %}{% else %}{% trans "Rejected" %}{% endif %}</a>
+        <a id="publish" href="#" class="{% if media.is_published %}component_icon button icon_ok{% else %}component_icon button icon_delete{% endif %}">{% if media.is_published %}{% trans "published" %}{% else %}{% trans "rejected" %}{% endif %}</a>
         {% endif %}
     </div>
 

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 8f4b11726dcc8f1bd6bee32c8437aed03e1a1ecb..121793af74b7ec406fd60f0c269d16416c66f5fc 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -40,9 +40,9 @@
             </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
             {% if media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans 'Published' %}" />
+             <img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans 'published' %}" />
             {% elif not media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans 'Rejected' %}" />
+             <img src="{{ STATIC_URL }}telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans 'rejected' %}" />
             {% endif %}
             {% if media.item.file %}
              <a href="{{ MEDIA_URL }}{{ media.item.file }}">