fix preview title

diff --git a/example/settings.py b/example/settings.py
index 399eb3dc2740826d2f9036564d013927a65afec8..ba578733448f326beae6c3b8d578d997b33f55e5 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -64,7 +64,7 @@ if not os.path.exists(MEDIA_ROOT):
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = 'http://localhost:8040/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index da53b0eb38917684735fe18fb0ff618e5d34e14c..e52fc2160ad3934b3002673ee042bea792e8ca43 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 fe383239dc3f5d61cd38c4849894c2755c17d360..3a66965bb539cd143382dbb8f3e901b83b0e71f7 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-29 00:39+0200\n"
+"POT-Creation-Date: 2012-08-10 01:21+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"
@@ -193,8 +193,9 @@ msgstr "annale"
 msgid "file"
 msgstr "fichier"
 
-#: models.py:489 models.py:490 templates/telemeta/profile_detail.html:64
-#: templates/telemeta/users.html:29 templates/telemeta/inc/user_list.html:21
+#: models.py:489 models.py:490 templates/telemeta/profile_detail.html:65
+#: templates/telemeta/profile_detail.html:68 templates/telemeta/users.html:28
+#: templates/telemeta/inc/user_list.html:21
 msgid "IEJ"
 msgstr "IEJ"
 
@@ -242,7 +243,7 @@ msgstr "plateforme seulement"
 msgid "student"
 msgstr "étudiant"
 
-#: models.py:581 templates/telemeta/profile_detail.html:77
+#: models.py:581 templates/telemeta/profile_detail.html:82
 msgid "Address"
 msgstr ""
 
@@ -258,11 +259,11 @@ msgstr "Ville"
 msgid "Country"
 msgstr "Pays"
 
-#: models.py:585 templates/telemeta/profile_detail.html:86
+#: models.py:585 templates/telemeta/profile_detail.html:91
 msgid "Language"
 msgstr "Langue"
 
-#: models.py:586 templates/telemeta/profile_detail.html:78
+#: models.py:586 templates/telemeta/profile_detail.html:83
 msgid "Telephone"
 msgstr "Téléphone"
 
@@ -583,7 +584,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/telemeta/profile_detail.html:81
+#: templates/telemeta/profile_detail.html:86
 msgid "Date added"
 msgstr "Date d'ajout"
 
@@ -664,19 +665,19 @@ msgstr "Enregistrer et diffuser"
 
 #: templates/teleforma/course_media.html:27
 #: templates/teleforma/course_media.html:79
-#: templates/teleforma/inc/media_list.html:43
+#: templates/teleforma/inc/media_list.html:46
 msgid " published"
 msgstr " publié"
 
 #: templates/teleforma/course_media.html:34
 #: templates/teleforma/course_media.html:79
-#: templates/teleforma/inc/media_list.html:45
+#: templates/teleforma/inc/media_list.html:48
 msgid " rejected"
 msgstr " rejeté"
 
 #: templates/teleforma/course_media.html:62
 #: templates/teleforma/inc/document_list.html:22
-#: templates/teleforma/inc/media_list.html:49
+#: templates/teleforma/inc/media_list.html:52
 msgid "Download"
 msgstr "Télécharger"
 
@@ -689,6 +690,7 @@ msgid "End date"
 msgstr "Date de fin"
 
 #: templates/teleforma/course_media.html:139
+#: templates/teleforma/inc/media_list.html:39
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -711,12 +713,12 @@ msgstr "Nouvelle note"
 
 #: templates/teleforma/courses.html:104
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: templates/teleforma/help.html:11 templates/telemeta/base.html:110
 #: templates/telemeta/base.html.py:123
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: templates/teleforma/inc/conference_list.html:8
 msgid "Live conferences"
@@ -724,12 +726,12 @@ msgstr "Conférences en direct"
 
 #: templates/teleforma/inc/conference_list.html:18
 #: templates/teleforma/inc/document_list.html:20
-#: templates/teleforma/inc/media_list.html:17
 msgid "View"
-msgstr ""
+msgstr "Voir"
 
 #: templates/teleforma/inc/conference_list.html:19
 #: templates/teleforma/inc/media_list.html:21
+#: templates/teleforma/inc/media_list.html:25
 msgid "Click here"
 msgstr "Cliquez ici"
 
@@ -741,6 +743,10 @@ msgstr "Aucun document"
 msgid "Passed conferences"
 msgstr "Conférences en différé"
 
+#: templates/teleforma/inc/media_list.html:17
+msgid "Play"
+msgstr "Lire"
+
 #: templates/telemeta/base.html:85
 msgid "Desk"
 msgstr "Bureau"
@@ -754,7 +760,7 @@ msgid "Messaging"
 msgstr "Messagerie"
 
 #: templates/telemeta/base.html:96 templates/telemeta/users.html:6
-#: templates/telemeta/users.html.py:70
+#: templates/telemeta/users.html.py:69
 msgid "Users"
 msgstr ""
 
@@ -889,62 +895,63 @@ msgstr ""
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: templates/telemeta/profile_detail.html:65
+#: templates/telemeta/profile_detail.html:66
+#: templates/telemeta/profile_detail.html:69
 #: templates/telemeta/inc/user_list.html:22
 msgid "Training"
 msgstr "Formation"
 
-#: templates/telemeta/profile_detail.html:66
+#: templates/telemeta/profile_detail.html:71
 msgid "Platform only"
 msgstr "Plateforme seulement"
 
-#: templates/telemeta/profile_detail.html:67
+#: templates/telemeta/profile_detail.html:72
 #: templates/telemeta/inc/user_list.html:23
 msgid "Procedure"
 msgstr "Procédure"
 
-#: templates/telemeta/profile_detail.html:68
+#: templates/telemeta/profile_detail.html:73
 #: templates/telemeta/inc/user_list.html:24
 msgid "Oral spe"
 msgstr "Oral Spé"
 
-#: templates/telemeta/profile_detail.html:69
+#: templates/telemeta/profile_detail.html:74
 #: templates/telemeta/inc/user_list.html:25
 msgid "Written spe"
 msgstr "Ecrit Spé"
 
-#: templates/telemeta/profile_detail.html:70
+#: templates/telemeta/profile_detail.html:75
 #: templates/telemeta/inc/user_list.html:26
 msgid "Oral 1"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:71
+#: templates/telemeta/profile_detail.html:76
 #: templates/telemeta/inc/user_list.html:27
 msgid "Oral 2"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:72
+#: templates/telemeta/profile_detail.html:77
 msgid "Options"
 msgstr "Options"
 
-#: templates/telemeta/profile_detail.html:76
+#: templates/telemeta/profile_detail.html:81
 msgid "Email"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:82
+#: templates/telemeta/profile_detail.html:87
 #, fuzzy
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: templates/telemeta/profile_detail.html:83
+#: templates/telemeta/profile_detail.html:88
 msgid "Last login"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:94
+#: templates/telemeta/profile_detail.html:99
 msgid "Apply"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:104
+#: templates/telemeta/profile_detail.html:109
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
 
@@ -967,19 +974,19 @@ msgstr ""
 msgid "Year of publication"
 msgstr "obligation"
 
-#: templates/telemeta/users.html:16
+#: templates/telemeta/users.html:15
 msgid "Trainings"
 msgstr "Formations"
 
-#: templates/telemeta/users.html:42
+#: templates/telemeta/users.html:41
 msgid "Courses"
 msgstr "Matières"
 
-#: templates/telemeta/users.html:56
+#: templates/telemeta/users.html:55
 msgid "Grouped message"
 msgstr "Message groupé"
 
-#: templates/telemeta/users.html:75
+#: templates/telemeta/users.html:74
 #, fuzzy
 msgid "No users"
 msgstr "Pas d'utilisateurs"

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index c26c953efc09ff8506726ee28541003aab0c8a3e..3f6f5aadd2c74075816dac6ac7eb7b2e077c12f0 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -14,7 +14,7 @@
           {% if media.type == 'webm' %}
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="230px" style="vertical-align:middle">
-                <a href="{% url teleforma-media-detail media.id %}" title="{% trans "View" %}">
+                <a href="{% url teleforma-media-detail media.id %}" title="{% trans "Play" %}">
                  {% if media.item.related.all %}
                  {% for related in media.item.related.all %}
                   {% if related.title == "preview" %}