# HG changeset patch # User cavaliet # Date 1384880311 -3600 # Node ID ec7a604ed82125ab69f25b51038a465c89c8ba14 # Parent e216b8db05cc0ba34de9cc301994f1c9efdfde83 v1.51.12 front group debug and enhance diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/__init__.py Tue Nov 19 17:58:31 2013 +0100 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 51, 11, "final", 0) +VERSION = (1, 51, 12, "final", 0) def get_version(): diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/ldt_utils/templates/front/front_group.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Tue Nov 19 17:58:31 2013 +0100 @@ -3,6 +3,7 @@ {% load thumbnail %} {% load front_tags %} {% load static %} +{% load absstatic %} {% block title %}Lignes de temps : groupe "{{group.name}}"{% endblock %} @@ -30,6 +31,7 @@ {% block body %} {{block.super}} - -{% comment %} - - -{% endcomment %}
@@ -110,7 +114,13 @@ {{group.get_profile.description|safe}}

{% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}{{content.title}}{% endthumbnail %} -

 

+
+ {% if projects %} + {% trans "See all the group's medias" %} + {% else %} + {% trans "See all the group's projects" %} + {% endif %} +

{% trans 'Members' %} ({{users|length}})

diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/ldt_utils/templates/front/front_groups.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_groups.html Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_groups.html Tue Nov 19 17:58:31 2013 +0100 @@ -4,7 +4,7 @@ {% load front_tags %} {% load absstatic %} -{% block title %}Lignes de temps : groupe "{{group.name}}"{% endblock %} +{% block title %}Lignes de temps : groupes{% endblock %} {% block css_import %} {{block.super}} @@ -23,9 +23,8 @@ {% for g in group_list %}
  • - {% thumbnail g.get_profile.image "134x75" format="PNG" crop="center" as im %}{% trans 'See this group' %}{% endthumbnail %} -

    {% if g.name|length > 69 %}{{g.name|slice:":69"}}...{% else %}{{g.name}}{% endif %}

    -

    {{ g.name }}

    + {% thumbnail g.get_profile.image "134x75" format="PNG" crop="center" as im %}{% trans 'See this group' %}{% endthumbnail %} +

    {% if g.name|length > 69 %}{{g.name|slice:":69"}}...{% else %}{{g.name}}{% endif %}

  • {% endfor %} diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/ldt_utils/urls.py --- a/src/ldt/ldt/ldt_utils/urls.py Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/urls.py Tue Nov 19 17:58:31 2013 +0100 @@ -44,7 +44,8 @@ url(r'^updateGroup/(?P.*)$', 'views.group.update_group'), url(r'^$', 'views.front.front_home', name='front_home'), url(r'^front/groups/$', 'views.front.group_list'), - url(r'^front/group/(?P.*)$', 'views.front.group_info'), + url(r'^front/group/(?P.*)/medias/$', 'views.front.group_medias'), + url(r'^front/group/(?P.*)/$', 'views.front.group_info'), url(r'^front/player/(?P.*)/$', 'views.front.annot_content'), url(r'^front/player/(?P.*)/(?P.*)/(?P.*)$', 'views.front.annot_content'), url(r'^front/player/(?P.*)/(?P.*)$', 'views.front.annot_content', name='front_player_content_project'), diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/ldt_utils/views/front.py --- a/src/ldt/ldt/ldt_utils/views/front.py Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/views/front.py Tue Nov 19 17:58:31 2013 +0100 @@ -5,7 +5,7 @@ from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.core.urlresolvers import reverse from django.db.models import Count -from django.shortcuts import render_to_response +from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from ldt.ldt_utils.forms import SearchForm from ldt.ldt_utils.models import Content, Project @@ -15,6 +15,7 @@ from ldt.utils.url import static from tagging.models import TaggedItem import logging +from guardian.shortcuts import get_objects_for_group User = get_user_model() logger = logging.getLogger(__name__) @@ -32,7 +33,7 @@ # Get the all tags list tag_cloud = get_content_tags() - is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) return render_to_response("front/front_home.html", {'last_contents': last_contents, 'most_contents':most_contents, 'active_groups':active_groups, 'front_tags':front_tags, @@ -43,9 +44,9 @@ def group_list(request): # Get the active group - group_list = Group.objects.order_by('name').select_related("profile").exclude(name=settings.PUBLIC_GROUP_NAME) + group_list = Group.objects.select_related("profile").exclude(name=settings.PUBLIC_GROUP_NAME).order_by('name') - is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) return render_to_response("front/front_groups.html", {'group_list':group_list, @@ -79,13 +80,28 @@ # Group's users users = User.objects.filter(groups__in=[group]).exclude(is_superuser=True) - is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) return render_to_response("front/front_group.html", {'group': group, 'content_list':None, 'results':results, 'users':users, 'project_title':proj_title, - 'is_gecko': is_gecko}, + 'projects': True, 'is_gecko': is_gecko}, context_instance=RequestContext(request)) +@login_required +def group_medias(request, group_id): + group = get_object_or_404(Group, id=group_id) + + content_list = get_objects_for_group(group, 'ldt_utils.view_content') + + # Group's users + users = User.objects.filter(groups__in=[group]).exclude(is_superuser=True) + + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) + + return render_to_response("front/front_group.html", + {'group': group, 'content_list':content_list, 'results':None, 'users':users, + 'projects': False, 'is_gecko': is_gecko}, + context_instance=RequestContext(request)) def all_contents(request): @@ -121,7 +137,7 @@ # Get the all tags list tag_cloud = get_content_tags() - is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) return render_to_response("front/front_all_contents.html", {'results':results, 'tag_label':tag_label, 'media_title':media_title, 'front_tags':front_tags, 'tag_cloud':tag_cloud, @@ -160,7 +176,7 @@ if stream_mode != "video": stream_mode = 'radio' - is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); + is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1) return render_to_response("front/front_player.html", diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/locale/fr/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Nov 19 17:58:31 2013 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-19 10:37+0000\n" +"POT-Creation-Date: 2013-11-19 16:45+0000\n" "PO-Revision-Date: 2010-03-09 15:52+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -16,24 +16,24 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms/fields.py:22 +#: forms/fields.py:20 msgid "The duration field can not be empty." msgstr "La durée ne peut pas être nulle." -#: forms/fields.py:23 +#: forms/fields.py:21 msgid "Enter a valid duration format;" msgstr "Entrez un format de durée valide" -#: forms/widgets.py:21 +#: forms/widgets.py:17 msgid "Date" msgstr "Date" -#: forms/widgets.py:21 +#: forms/widgets.py:17 msgid "Time" msgstr "Heure" #: ldt_utils/forms.py:32 ldt_utils/templates/front/front_base.html:53 -#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:53 +#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:79 msgid "Search" msgstr "Recherche" @@ -41,7 +41,7 @@ msgid "all" msgstr "tous" -#: ldt_utils/forms.py:33 ldt_utils/models.py:70 +#: ldt_utils/forms.py:33 ldt_utils/models.py:73 #: ldt_utils/templates/ldt/ldt_utils/content_list.html:70 msgid "title" msgstr "titre" @@ -66,7 +66,7 @@ msgid "Content Tag" msgstr "Catégorie de contenu" -#: ldt_utils/forms.py:52 ldt_utils/models.py:175 +#: ldt_utils/forms.py:52 ldt_utils/models.py:178 msgid "content.content_creation_date" msgstr "Date de création du contenu" @@ -98,123 +98,123 @@ msgid "content.front_project" msgstr "Choisir le front project" -#: ldt_utils/forms.py:57 ldt_utils/models.py:174 +#: ldt_utils/forms.py:57 ldt_utils/models.py:177 msgid "content.duration" msgstr "Durée" -#: ldt_utils/models.py:59 +#: ldt_utils/models.py:62 msgid "media.external_id" msgstr "id externe" -#: ldt_utils/models.py:60 +#: ldt_utils/models.py:63 msgid "media.external_permalink" msgstr "permalien externe" -#: ldt_utils/models.py:61 +#: ldt_utils/models.py:64 msgid "media.external_publication_url" msgstr "url de publication externe" -#: ldt_utils/models.py:62 +#: ldt_utils/models.py:65 msgid "media.external_src_url" msgstr "url source" -#: ldt_utils/models.py:63 +#: ldt_utils/models.py:66 msgid "media.creation_date" msgstr "Date de création" -#: ldt_utils/models.py:64 +#: ldt_utils/models.py:67 msgid "media.media_creation_date" msgstr "Date de création du média" -#: ldt_utils/models.py:65 +#: ldt_utils/models.py:68 msgid "media.update_date" msgstr "Date de maj" -#: ldt_utils/models.py:66 +#: ldt_utils/models.py:69 msgid "media.videopath" msgstr "videopath" -#: ldt_utils/models.py:67 +#: ldt_utils/models.py:70 msgid "media.duration" msgstr "Durée du contenu (ms)" -#: ldt_utils/models.py:68 +#: ldt_utils/models.py:71 msgid "media.creator" msgstr "Créateur" -#: ldt_utils/models.py:69 +#: ldt_utils/models.py:72 msgid "description" msgstr "description" -#: ldt_utils/models.py:71 +#: ldt_utils/models.py:74 msgid "media.src" msgstr "Sources" -#: ldt_utils/models.py:72 +#: ldt_utils/models.py:75 msgid "media.src_hash" msgstr "Hash de la source" -#: ldt_utils/models.py:73 +#: ldt_utils/models.py:76 msgid "media.mimetype" msgstr "mimetype" -#: ldt_utils/models.py:167 +#: ldt_utils/models.py:170 msgid "content.iri_id" msgstr "iri id" -#: ldt_utils/models.py:168 +#: ldt_utils/models.py:171 msgid "content.iriurl" msgstr "iri url" -#: ldt_utils/models.py:169 +#: ldt_utils/models.py:172 msgid "content.creation_date" msgstr "date de création" -#: ldt_utils/models.py:170 +#: ldt_utils/models.py:173 msgid "content.update_date" msgstr "Date de maj" -#: ldt_utils/models.py:171 +#: ldt_utils/models.py:174 msgid "content.title" msgstr "titre" -#: ldt_utils/models.py:172 +#: ldt_utils/models.py:175 msgid "content.description" msgstr "Description" -#: ldt_utils/models.py:173 +#: ldt_utils/models.py:176 msgid "content.authors" msgstr "Auteurs" -#: ldt_utils/models.py:544 +#: ldt_utils/models.py:551 msgid "content_stat.content" msgstr "statistiques d'annotation" -#: ldt_utils/models.py:545 +#: ldt_utils/models.py:552 msgid "content_stat.annotations_volume" msgstr "Volume d'annotations" -#: ldt_utils/models.py:546 +#: ldt_utils/models.py:553 msgid "content_stat.polemics_volume" msgstr "Volume d'annotations" -#: ldt_utils/models.py:547 +#: ldt_utils/models.py:554 msgid "content.nb_annotation" msgstr "nombre d'annotations" -#: ldt_utils/models.py:548 +#: ldt_utils/models.py:555 msgid "content.last_annotated" msgstr "annoté pour la dernière foiss" -#: ldt_utils/models.py:603 +#: ldt_utils/models.py:615 msgid "created by" msgstr "créé par" -#: ldt_utils/models.py:604 +#: ldt_utils/models.py:616 msgid "changed by" msgstr "modifié par" -#: ldt_utils/utils.py:205 ldt_utils/utils.py:388 +#: ldt_utils/utils.py:202 ldt_utils/utils.py:385 msgid "Personal cutting" msgstr "Découpages personnels" @@ -265,26 +265,28 @@ msgstr "Toutes les catégories de médias" #: ldt_utils/templates/front/front_all_contents.html:72 -#: ldt_utils/templates/front/front_group.html:47 +#: ldt_utils/templates/front/front_group.html:49 #: ldt_utils/templates/front/front_search_results.html:138 #: ldt_utils/templates/ldt/ldt_utils/search_results.html:105 msgid "previous" msgstr "Précedent" #: ldt_utils/templates/front/front_all_contents.html:90 -#: ldt_utils/templates/front/front_group.html:65 +#: ldt_utils/templates/front/front_group.html:67 #: ldt_utils/templates/front/front_search_results.html:158 #: ldt_utils/templates/ldt/ldt_utils/search_results.html:115 msgid "next" msgstr "Suivant" #: ldt_utils/templates/front/front_all_contents.html:93 -#: ldt_utils/templates/front/front_group.html:68 +#: ldt_utils/templates/front/front_group.html:70 msgid "All" msgstr "Tous" #: ldt_utils/templates/front/front_all_contents.html:102 #: ldt_utils/templates/front/front_all_contents.html:115 +#: ldt_utils/templates/front/front_group.html:92 +#: ldt_utils/templates/front/front_group.html:94 #: ldt_utils/templates/front/front_home.html:62 #: ldt_utils/templates/front/front_home.html:73 #: ldt_utils/templates/front/front_home.html:90 @@ -293,6 +295,7 @@ msgstr "voir ce média" #: ldt_utils/templates/front/front_all_contents.html:114 +#: ldt_utils/templates/front/front_group.html:93 #: ldt_utils/templates/front/front_home.html:72 #: ldt_utils/templates/front/front_home.html:98 #, python-format @@ -302,7 +305,8 @@ msgstr[1] "%(nb)s annotations sur ce média" #: ldt_utils/templates/front/front_all_contents.html:116 -#: ldt_utils/templates/front/front_group.html:77 +#: ldt_utils/templates/front/front_group.html:79 +#: ldt_utils/templates/front/front_group.html:95 #: ldt_utils/templates/front/front_home.html:74 #: ldt_utils/templates/front/front_home.html:100 msgid "by" @@ -317,7 +321,7 @@ msgstr "Lignes de temps" #: ldt_utils/templates/front/front_base.html:60 -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:68 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:115 msgid "My projects" msgstr "Mes projets" @@ -328,14 +332,14 @@ #: ldt_utils/templates/front/front_base.html:70 #: templates/cms/admin/cms/page/change_form.html:11 -#: templates/ldt/ldt_base.html:98 user/templates/ldt/user/login_form.html:35 +#: templates/ldt/ldt_base.html:98 user/templates/ldt/user/login_form.html:34 msgid "Log out" msgstr "Déconnexion" #: ldt_utils/templates/front/front_base.html:72 #: templates/admin/page_login.html:32 -#: user/templates/ldt/user/login_form.html:38 -#: user/templates/ldt/user/login_form.html:46 +#: user/templates/ldt/user/login_form.html:37 +#: user/templates/ldt/user/login_form.html:45 #: user/templates/registration/login.html:22 #: user/templates/registration/password_reset_complete.html:14 msgid "Log in" @@ -354,42 +358,56 @@ msgid "about" msgstr "A propos" -#: ldt_utils/templates/front/front_group.html:34 +#: ldt_utils/templates/front/front_group.html:36 msgid "Projects shared by the group" msgstr "Projets partagés par le groupe" -#: ldt_utils/templates/front/front_group.html:35 +#: ldt_utils/templates/front/front_group.html:37 #: templates/admin/cms_change_list.html:110 #: templates/admin/page_change_list.html:65 msgid "Filter" msgstr "Filtre" -#: ldt_utils/templates/front/front_group.html:39 +#: ldt_utils/templates/front/front_group.html:41 msgid "Search in the projects title" msgstr "Chercher dans le titre des projets" -#: ldt_utils/templates/front/front_group.html:75 -#: ldt_utils/templates/front/front_group.html:76 +#: ldt_utils/templates/front/front_group.html:77 +#: ldt_utils/templates/front/front_group.html:78 msgid "open this project" msgstr "Ouvrir ce projet" -#: ldt_utils/templates/front/front_group.html:82 +#: ldt_utils/templates/front/front_group.html:84 +#: ldt_utils/templates/front/front_group.html:119 +msgid "See all the group's medias" +msgstr "Voir tous les médias du groupe" + +#: ldt_utils/templates/front/front_group.html:88 +msgid "Medias annotated by the group" +msgstr "Médias annotés par le groupe" + +#: ldt_utils/templates/front/front_group.html:99 +#: ldt_utils/templates/front/front_group.html:121 +msgid "See all the group's projects" +msgstr "Voir tous les projets du groupe" + +#: ldt_utils/templates/front/front_group.html:103 msgid "Back to the group list" msgstr "Retour à la liste des groupes" -#: ldt_utils/templates/front/front_group.html:107 +#: ldt_utils/templates/front/front_group.html:111 msgid "About the group" msgstr "A propos du groupe" -#: ldt_utils/templates/front/front_group.html:116 +#: ldt_utils/templates/front/front_group.html:126 msgid "Members" msgstr "liste des membres" -#: ldt_utils/templates/front/front_group.html:123 +#: ldt_utils/templates/front/front_group.html:133 msgid "active since" msgstr "actif depuis" -#: ldt_utils/templates/front/front_groups.html:22 user/admin.py:38 +#: ldt_utils/templates/front/front_groups.html:22 msgid "Groups" msgstr "Groupes" @@ -439,12 +457,12 @@ msgstr "Toutes les annotations sur le média" #: ldt_utils/templates/front/front_search_results.html:7 -#: ldt_utils/templates/ldt/ldt_utils/groups.html:100 -#: ldt_utils/templates/ldt/ldt_utils/groups.html:112 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:130 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:142 #: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:80 -#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:70 -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:56 -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:71 +#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:96 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:103 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:118 #: ldt_utils/templates/ldt/ldt_utils/partial/permissions.html:133 #: templates/ldt/ldt_base.html:128 msgid "search" @@ -508,7 +526,7 @@ #: ldt_utils/templates/ldt/ldt_utils/content_list.html:56 #: templates/admin/page_base.html:19 -#: user/templates/ldt/user/login_form.html:34 +#: user/templates/ldt/user/login_form.html:33 msgid "Space" msgstr "Esp. perso" @@ -539,7 +557,7 @@ msgstr "Copier votre projet" #: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:17 -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:96 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:95 msgid "Title" msgstr "Titre" @@ -547,23 +565,19 @@ msgid "Copy" msgstr "Copier" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:35 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:31 msgid "Browse" msgstr "Parcourir" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:36 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:32 msgid "File uploaded" msgstr "Fichier téléversé" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:37 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:33 msgid "Please wait, the upload is not finished yet" msgstr "Un peu de patience, le téléversement n'est pas terminé" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:38 -msgid "Cancel upload" -msgstr "Annuler le téléversement" - -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:73 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:92 msgid "" "The operation could not be performed because one or more error(s) occurred." "
    Please resubmit the media form after making the following changes:" @@ -571,33 +585,33 @@ "opération impossible à cause d'une ou plusieurs erreurs.
    Veuillez " "resoumettre le formulaire media après avoir fait les changements suivants:" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:88 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:107 msgid "Modify this content" msgstr "Modifier ce contenu" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:90 -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:53 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:109 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:100 msgid "Create content" msgstr "Créer un contenu" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:132 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:149 msgid "Actual front project" msgstr "Front project actuel" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:133 -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:149 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:150 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:148 #: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:39 #: ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html:54 msgid "reset_front_project" msgstr "Réinitialiser" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:147 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:163 msgid "media file is being processed please wait." msgstr "Le fichier média est en cours de traitement. Veuillez patienter." -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:151 -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:79 -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:145 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:167 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:83 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:144 #: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:37 #: ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html:53 #: ldt_utils/templates/ldt/ldt_utils/reset_confirm.html:38 @@ -605,228 +619,232 @@ msgid "close_cancel" msgstr "Fermer" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:152 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:168 msgid "delete" msgstr "Effacer" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:153 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:169 msgid "write" msgstr "Enregistrer" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:38 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:36 msgid "Do you really want to delete this group ?" msgstr "Voulez-vous quitter ce groupe ?" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:56 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:62 msgid "Update a group" msgstr "Mettre à jour votre groupe" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:56 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:62 msgid "Create a group" msgstr "Créer un groupe" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:63 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:69 #: user/templates/ldt/user/change_profile.html:62 msgid "Name" msgstr "Nom" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:69 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:75 msgid "Description" msgstr "Description" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:81 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:85 msgid "update_group" msgstr "Mettre à jour le groupe" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:83 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:87 msgid "delete_group" msgstr "Effacer le groupe" -#: ldt_utils/templates/ldt/ldt_utils/create_group.html:86 +#: ldt_utils/templates/ldt/ldt_utils/create_group.html:90 msgid "create_group" msgstr "Créer un nouveau groupe" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:48 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:47 msgid "more options" msgstr "Plus d'options" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:52 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:51 msgid "hide" msgstr "Réduire" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:90 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:89 msgid "Update your project" msgstr "Mettre à jour votre projet Lignes de Temps" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:90 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:89 msgid "Create your project" msgstr "Créer votre projet Lignes de Temps" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:101 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:100 msgid "Description :" msgstr "Description :" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:106 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:105 msgid "List of contents" msgstr "Liste de contenus" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:120 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:119 #: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:22 #: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:13 #: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:13 msgid "name" msgstr "Nom" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:136 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:135 msgid "More options" msgstr "Plus d'options" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:147 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:146 msgid "delete_project" msgstr "Effacer" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:151 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:150 msgid "update_project" msgstr "Mettre à jour" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:153 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:152 msgid "create_project" msgstr "Créer un nouveau projet Ligne de Temps" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:26 -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:231 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:25 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:232 msgid "Show Player" msgstr "Afficher le Lecteur métadata" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:27 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:26 msgid "Hide Player" msgstr "Masquer le Lecteur métadata " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:62 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:61 msgid "Share the project" msgstr "Partager le projet" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:63 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:62 msgid "List of the project's contents" msgstr "Liste des contenus du projet" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:66 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65 msgid "Link to the Metadata Player" msgstr "Lien vers le Metadata Player" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:66 -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:71 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70 msgid "See" msgstr "Voir" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:66 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:65 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69 #: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70 -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:71 msgid "Select" msgstr "Sélectionner" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:69 msgid "project id" msgstr "Identifiant du projet " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:71 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:70 msgid "The project in Lignes de Temps" msgstr "Le projet dans Lignes De Temps" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:76 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:75 msgid "popup_player" msgstr "Code Lecteur métadata" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:77 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:76 msgid "popup_ldt_iframe" msgstr "Code Lignes De Temps" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:78 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:77 msgid "popup_seo_body" msgstr "Code SEO" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:79 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:78 msgid "popup_seo_meta" msgstr "Code balise meta en-tête" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:80 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:79 msgid "popup_links" msgstr "Liste de liens" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:100 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:98 msgid "Integration mode" msgstr "Utiliser le mode d'intégration " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:101 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:99 msgid "div" msgstr "div" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:102 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:100 msgid "iframe" msgstr "iframe" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:105 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:103 msgid "Player Size : " msgstr "Taille de la vidéo : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:112 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:110 msgid "Preset Modes" msgstr "Modes prédéfinis" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:115 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:113 msgid "Basic configuration" msgstr "Confirmation de base" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:116 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:114 msgid "Polemic configuration" msgstr "Configuration avec widget polemic" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:117 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:115 msgid "Polemic configuration with tagcloud, annotationsList and Social widgets" msgstr "Configuration avec widget social, liste d'annotations et tagcloud" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:124 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:122 msgid "Create your own configuration" msgstr "Personnaliser votre configuration" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:129 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:126 +msgid "The video starts automatically" +msgstr "La vidéo commence automatiquement" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:130 msgid "Displays a form to create a new annotation" msgstr "Permet de créer une annotation en affichant un formulaire" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:132 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133 msgid "audio annotation" msgstr "Annotation audio" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134 msgid "Audio annotation" msgstr "Annotation audio" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:133 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:134 msgid "Allows the user to record an annotation" msgstr "" "Permet à l'utilisateur d'enregistrer une annotation à l'aide d'un micro" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:135 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:136 msgid "Use most used tags " msgstr "Utiliser les tags les plus utilisés" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:137 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138 msgid "Set your own tags : " msgstr "Ajouter vos propres tags" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:137 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:138 msgid "Write your tags separeted by a comma" msgstr "Ecrire la liste des tags séparés par une virgule" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:143 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:144 msgid "Displays segments of a media as rectangles on an horizontal line" msgstr "Affiche le chapitrage du média, en horizontal" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:146 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:147 msgid "Show a list of annotations" msgstr "Affiche une liste d’annotations " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:150 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:151 msgid "" "Shows the polemical timeline, i.e. tweets colored according to the polemical " "syntax" @@ -834,65 +852,65 @@ "Affiche la timeline polémique, c’est à dire les tweets colorés en fonction " "de la syntaxe polémique " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:153 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:154 msgid "Display in the polemic timeline : " msgstr "Afficher dans la timeline polemic : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:154 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:155 msgid "only tweets" msgstr "seulement les annotations de type tweet" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:155 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:156 msgid "all annotations" msgstr "toutes les annotations" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:157 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:158 msgid "Personalize tweet's color" msgstr "Personnaliser les couleurs des tweets" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:162 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:163 msgid "Default color" msgstr "Couleur des tweets sans annotation polémique : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:166 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:167 msgid "Polemic's color : ++ : " msgstr "Couleur des tweets polémiques de type : ++ : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:176 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:177 msgid "Found color" msgstr "Couleur d'affichage des tweets lors d'une recherche : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:184 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:185 msgid "Displays a curve showing the volume of tweets across time" msgstr "" "Affiche une courbe indiquant l’évolution du volume d’annotations au cours du " "temps" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:188 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:189 msgid "personalize sparkline's color" msgstr "Personnaliser les couleurs de la courbe" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:192 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:193 msgid "line color" msgstr "Couleur de la courbe : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:197 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:198 msgid "fill color" msgstr "Couleur sous la courbe : " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:204 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:205 msgid "Displays a div in order to watch the slides displayed in the media" msgstr "Permet d'afficher les slides d'un média" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:208 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:209 msgid " Adds buttons to share an URL on social networks" msgstr "Affiche des boutons pour partager une URL sur les réseaux sociaux" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:215 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:216 msgid "share with email" msgstr "Partager par email" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:219 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:220 msgid "" " Displays information relative to a single segment/annotation while it is " "being played" @@ -900,11 +918,11 @@ "Affiche les informations relatives à une annotation au moment où celle-ci " "est jouée" -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:222 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:223 msgid "Show the contents on a tweet when clicked (in Polemic Widget)" msgstr "Affiche furtivement le contenu d’un tweet " -#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:225 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:226 msgid "Shows a tag cloud" msgstr "Affiche un nuage de mots-clés " @@ -931,20 +949,20 @@ msgid "close_error" msgstr "Fermer" -#: ldt_utils/templates/ldt/ldt_utils/groups.html:67 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:85 msgid "Do you want to leave this group ?" msgstr "Voulez-vous quitter ce groupe ?" -#: ldt_utils/templates/ldt/ldt_utils/groups.html:92 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:122 #: templates/ldt/ldt_base.html:116 msgid "My groups" msgstr "Groupes" -#: ldt_utils/templates/ldt/ldt_utils/groups.html:94 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:124 msgid "Create group" msgstr "Créer un nouveau groupe" -#: ldt_utils/templates/ldt/ldt_utils/groups.html:110 +#: ldt_utils/templates/ldt/ldt_utils/groups.html:140 msgid "The group's projects" msgstr "projets du groupe" @@ -960,17 +978,17 @@ msgid "project list" msgstr "Liste des projets" -#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:62 +#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:88 msgid "Submit" msgstr "Chercher" -#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:67 +#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:93 #: templates/ldt/ldt_base.html:117 msgid "Published projects" msgstr "Projets publiés" -#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:68 -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:69 +#: ldt_utils/templates/ldt/ldt_utils/published_projects.html:94 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:116 msgid "Create project" msgstr "Créer un nouveau projet d'indexation" @@ -978,7 +996,7 @@ msgid "confirm_reset" msgstr "Confirmation de réinitialisation" -#: ldt_utils/templates/ldt/ldt_utils/search_form.html:11 +#: ldt_utils/templates/ldt/ldt_utils/search_form.html:10 msgid "The search field can not be empty." msgstr "Le champ de recherche ne peut pas être vide." @@ -999,10 +1017,12 @@ msgstr "Supprimer définitivement cette annotation" #: ldt_utils/templates/ldt/ldt_utils/search_results.html:80 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:25 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:27 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:33 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:35 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:26 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:28 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:31 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:38 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:40 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:43 #: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:22 #: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:24 msgid "open ldt" @@ -1017,7 +1037,7 @@ msgid "Page %(number)s of %(num_pages)s" msgstr "Page %(number)s de %(num_pages)s" -#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:52 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:99 msgid "content list" msgstr "Liste des contenus" @@ -1121,26 +1141,26 @@ msgid "Upload a new picture" msgstr "Téléverser une nouvelle image" -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:41 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:48 msgid "copy project" msgstr "Copier votre projet" -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:46 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:52 #: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:30 msgid "link json by id" msgstr "Ouvrir le lecteur de métadata" -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:53 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:58 msgid "Project published, click to unpublish" msgstr "Projet publié, cliquer pour de-publier" -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:53 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:55 -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:66 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:58 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:60 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:71 msgid "You are not allowed to change this project" msgstr "vous n'avez pas l'autorisation de modifier ce projet" -#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:55 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:60 msgid "Project not published, click to publish" msgstr "Projet non publié, cliquer pour publier" @@ -1148,67 +1168,67 @@ msgid "copy the project" msgstr "Copier le projet" -#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:34 +#: ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html:35 msgid "Project published" msgstr "Projet publié" -#: ldt_utils/views/content.py:131 +#: ldt_utils/views/content.py:130 msgid "Problem when downloading file from url : " msgstr "Problème lors du téléchargement du fichier : " -#: ldt_utils/views/content.py:134 +#: ldt_utils/views/content.py:133 msgid "Problem when uploading file : " msgstr "Problème lors de l'upload du fichier : " -#: ldt_utils/views/content.py:343 +#: ldt_utils/views/content.py:340 #, python-format msgid "There is %(count)d error when deleting content" msgid_plural "There are %(count)d errors when deleting content" msgstr[0] "Il y a %(count)d erreur lors de l'effacement du contenu" msgstr[1] "Il y a %(count)d erreurs lors de l'effacement du contenu" -#: ldt_utils/views/content.py:344 +#: ldt_utils/views/content.py:341 msgid "title error deleting content" msgstr "Erreur lors de l'effacement du contenu" -#: ldt_utils/views/content.py:349 +#: ldt_utils/views/content.py:346 #, python-format msgid "Confirm delete content %(titles)s" msgstr "Veuillez confirmer l'effacement du contenu %(titles)s" -#: ldt_utils/views/content.py:350 +#: ldt_utils/views/content.py:347 msgid "confirm delete content" msgstr "Confirmation effacement contenu" -#: ldt_utils/views/content.py:361 +#: ldt_utils/views/content.py:358 #, python-format msgid "Please unpublish the front project %(title)s" msgstr "Veuillez dépublier le projet : %(title)s" -#: ldt_utils/views/content.py:362 +#: ldt_utils/views/content.py:359 msgid "The front project is published" msgstr "Projet publié" -#: ldt_utils/views/content.py:363 ldt_utils/views/content.py:366 -#: ldt_utils/views/project.py:138 +#: ldt_utils/views/content.py:360 ldt_utils/views/content.py:363 +#: ldt_utils/views/project.py:139 msgid "confirm reset" msgstr "Confirmer la réinitialisation" -#: ldt_utils/views/content.py:365 ldt_utils/views/project.py:137 +#: ldt_utils/views/content.py:362 ldt_utils/views/project.py:138 #, python-format msgid "please confirm reseting project %(title)s" msgstr "Veuillez confirmer la réinitialisation du projet %(title)s" -#: ldt_utils/views/content.py:392 +#: ldt_utils/views/content.py:389 msgid "An error occurred - Please try again or contact webmaster" msgstr "" "Une erreur est apparue - Merci de réessayer ou de contacter le webmaster" -#: ldt_utils/views/content.py:393 +#: ldt_utils/views/content.py:390 msgid "Error" msgstr "Erreur" -#: ldt_utils/views/content.py:438 +#: ldt_utils/views/content.py:435 #, python-format msgid "" "Content '%(title)s' is referenced by this project : %(project_titles)s. " @@ -1219,7 +1239,7 @@ msgstr[0] "" msgstr[1] "" -#: ldt_utils/views/content.py:441 +#: ldt_utils/views/content.py:438 #, python-format msgid "" "The project '%(project_title)s' pointing on the content '%(title)s' has " @@ -1230,28 +1250,27 @@ "plusieurs annotations. Voulez-vous toujours supprimer le contenu et le " "projet ?" -#: ldt_utils/views/json.py:41 ldt_utils/views/rdf.py:15 -#: ldt_utils/views/workspace.py:241 +#: ldt_utils/views/json.py:43 ldt_utils/views/rdf.py:15 msgid "You can not access this project" msgstr "vous n'avez pas l'autorisation de modifier ce projet" -#: ldt_utils/views/project.py:118 +#: ldt_utils/views/project.py:119 #, python-format msgid "the project %(title)s is published. please unpublish before deleting." msgstr "" "Le projet %(title)s est publié. Veuillez le dépublier pour pouvoir le " "supprimer" -#: ldt_utils/views/project.py:119 ldt_utils/views/project.py:123 +#: ldt_utils/views/project.py:120 ldt_utils/views/project.py:124 msgid "can not delete the project. Please correct the following error" msgstr "" "Le projet ne peut être effacé. Veuillez corriger les erreurs suivantes." -#: ldt_utils/views/project.py:120 ldt_utils/views/project.py:124 +#: ldt_utils/views/project.py:121 ldt_utils/views/project.py:125 msgid "title error deleting project" msgstr "Erreur lors de l'effacement du contenu" -#: ldt_utils/views/project.py:122 +#: ldt_utils/views/project.py:123 #, python-format msgid "" "the project %(title)s is the front project of %(content)s. please delete " @@ -1260,34 +1279,34 @@ "Le projet %(title)s est le 'front projet' de %(content)s. Veuillez d'abord " "supprimer ce contenu." -#: ldt_utils/views/project.py:126 +#: ldt_utils/views/project.py:127 #, python-format msgid "please confirm deleting project %(title)s" msgstr "Veuillez confirmer la réinitialisation du projet %(title)s" -#: ldt_utils/views/project.py:127 +#: ldt_utils/views/project.py:128 msgid "confirm deletion" msgstr "Confirmation effacement contenu" -#: ldt_utils/views/workspace.py:116 +#: ldt_utils/views/workspace.py:119 msgid "" "The content does not exists or you are not allowed to access this content" msgstr "Le contenu n'existe pas ou bien vous n'êtes pas autorisé à y accéder" -#: ldt_utils/views/workspace.py:120 +#: ldt_utils/views/workspace.py:123 msgid "Parameters project_id or content_id must be given in the url" msgstr "" "Les paramètres project_id ou content_id doivent être indiqués dans l'url" -#: ldt_utils/views/workspace.py:392 +#: ldt_utils/views/workspace.py:415 msgid "Annotation not found in the xml" msgstr "Annotation non trouvée dans le xml" -#: ldt_utils/views/workspace.py:401 +#: ldt_utils/views/workspace.py:426 msgid "Annotation not found" msgstr "Annotation non trouvée" -#: ldt_utils/views/workspace.py:403 ldt_utils/views/workspace.py:405 +#: ldt_utils/views/workspace.py:428 ldt_utils/views/workspace.py:430 msgid "Project not found" msgstr "Projet non trouvé" @@ -1439,7 +1458,6 @@ msgstr "Ajouter" #: templates/admin/index.html:35 templates/admin/page_index.html:35 -#, fuzzy msgid "Change" msgstr "modifié par" @@ -1452,9 +1470,8 @@ msgstr "Actions récentes" #: templates/admin/index.html:73 templates/admin/page_index.html:54 -#, fuzzy msgid "My Actions" -msgstr "Plus d'options" +msgstr "Mes actions" #: templates/admin/index.html:77 templates/admin/page_index.html:58 msgid "None available" @@ -1463,14 +1480,13 @@ #: templates/admin/index.html:91 templates/admin/page_index.html:72 #, fuzzy msgid "Unknown content" -msgstr "Créer un nouveau contenu" +msgstr "Contenu inconnu" #: templates/admin/page_base.html:20 templates/admin/page_index.html:11 msgid "Pages" msgstr "Pages" #: templates/admin/page_base_site.html:7 -#, fuzzy msgid "Django administration" msgstr "Administration Django" @@ -1479,7 +1495,6 @@ msgstr "Connexion" #: templates/admin/page_login.html:20 -#, fuzzy msgid "Username:" msgstr "Nom d'utilisateur :" @@ -1489,7 +1504,6 @@ #: templates/admin/page_login.html:29 #: user/templates/registration/login.html:40 -#, fuzzy msgid "Create an account" msgstr "Créer un nouveau compte" @@ -1499,7 +1513,6 @@ msgstr "Mot de passe oublié ?" #: templates/cms/admin/cms/page/change_form.html:11 -#, fuzzy msgid "Documentation" msgstr "Documentation" @@ -1537,7 +1550,6 @@ msgstr "Modification du profil" #: templates/ldt/ldt_base.html:115 templates/ldt/ldt_base.html.py:116 -#, fuzzy msgid "home" msgstr "Accueil" @@ -1546,7 +1558,7 @@ msgstr "numéro de version" #: templates/ldt/ldt_base.html:149 -#, fuzzy, python-format +#, python-format msgid " web %(WEB_VERSION)s | platform %(VERSION)s" msgstr "web v%(WEB_VERSION)s | platform v%(VERSION)s " @@ -1555,7 +1567,6 @@ msgstr "Plateforme Ldt" #: text/models.py:14 -#, fuzzy msgid "annotation.external_id" msgstr "id externe" @@ -1604,73 +1615,38 @@ msgid "annotation.update_date" msgstr "Date de maj" -#: user/admin.py:37 -msgid "User details" -msgstr "Détails utilisateur" - -#: user/admin.py:39 -msgid "Permissions" -msgstr "Permissions" - -#: user/admin.py:50 user/templates/ldt/user/change_profile.html:105 -#: user/templates/ldt/user/login_form.html:62 -msgid "Password" -msgstr "Mot de passe" - -#: user/forms.py:27 user/templates/ldt/user/change_password.html:40 -#: user/templates/ldt/user/change_profile.html:118 -msgid "New password" -msgstr "Nouveau mot de passe" - -#: user/forms.py:29 user/templates/ldt/user/change_password.html:50 -#: user/templates/ldt/user/change_profile.html:131 +#: user/admin.py:20 #, fuzzy -msgid "New password confirmation" -msgstr "Confirmation de base" - -#: user/forms.py:58 user/forms.py:59 -msgid "E-mail" -msgstr "E-mail" - -#: user/forms.py:70 -msgid "The two emails didn't match." -msgstr "les deux emails ne correspondent pas" +msgid "profile" +msgstr "Profils" -#: user/forms.py:81 user/templates/ldt/user/change_profile.html:54 -msgid "First name" -msgstr "Prénom" - -#: user/forms.py:82 -#, fuzzy -msgid "Last name" -msgstr "Nom" - -#: user/forms.py:109 user/templates/ldt/user/change_profile.html:83 +#: user/forms.py:38 user/forms.py:63 +#: user/templates/ldt/user/change_profile.html:83 msgid "Language" msgstr "Langue" -#: user/forms.py:123 +#: user/forms.py:39 user/forms.py:75 msgid "Profile picture" msgstr "Image de profil" -#: user/forms.py:134 +#: user/forms.py:48 user/forms.py:86 #, python-format msgid "Image size is limited to %s" msgstr "La taille de l'image à limitée à %s" -#: user/views.py:26 +#: user/views.py:25 msgid "Your profile has been updated." msgstr "Votre profil a été modifié" -#: user/views.py:49 +#: user/views.py:48 msgid "Your password has been updated." msgstr "Votre mot de passe a été mis à jour" -#: user/views.py:73 +#: user/views.py:72 msgid "Your profile picture has been updated." msgstr "Votre image de profil a été mise à jour" -#: user/views.py:95 user/templates/registration/login.html:25 +#: user/views.py:93 user/templates/registration/login.html:25 msgid "Sorry, that's not a valid username or password." msgstr "Saisissez un nom d'utilisateur et un mot de passe valide." @@ -1678,10 +1654,21 @@ msgid "Old password" msgstr "Ancien mot de passe" +#: user/templates/ldt/user/change_password.html:40 +#: user/templates/ldt/user/change_profile.html:118 +msgid "New password" +msgstr "Nouveau mot de passe" + #: user/templates/ldt/user/change_password.html:44 msgid "passwords don't match" msgstr "les mots de passe ne correspondent pas" +#: user/templates/ldt/user/change_password.html:50 +#: user/templates/ldt/user/change_profile.html:131 +#, fuzzy +msgid "New password confirmation" +msgstr "Confirmation de base" + #: user/templates/ldt/user/change_password.html:57 #: user/templates/ldt/user/change_profile.html:144 #: user/templates/registration/password_change_form.html:14 @@ -1701,39 +1688,48 @@ msgid "Username" msgstr "Nom d'utilisateur" +#: user/templates/ldt/user/change_profile.html:54 +msgid "First name" +msgstr "Prénom" + #: user/templates/ldt/user/change_profile.html:70 msgid "Email" msgstr "Email" +#: user/templates/ldt/user/change_profile.html:105 +#: user/templates/ldt/user/login_form.html:61 +msgid "Password" +msgstr "Mot de passe" + #: user/templates/ldt/user/change_profile.html:175 msgid "Profile picture change" msgstr "Image de profil" -#: user/templates/ldt/user/login_form.html:33 +#: user/templates/ldt/user/login_form.html:32 #: user/templates/registration/password_change_done.html:7 #: user/templates/registration/password_change_form.html:13 msgid "Profiles" msgstr "Profils" -#: user/templates/ldt/user/login_form.html:51 +#: user/templates/ldt/user/login_form.html:50 msgid "create account" msgstr "Créer un compte" -#: user/templates/ldt/user/login_form.html:55 +#: user/templates/ldt/user/login_form.html:54 msgid "Pseudo" msgstr "Pseudo" -#: user/templates/ldt/user/login_form.html:58 -#: user/templates/ldt/user/login_form.html:65 +#: user/templates/ldt/user/login_form.html:57 +#: user/templates/ldt/user/login_form.html:64 msgid "this field is compulsory" msgstr "Ce champs est obligatoire" -#: user/templates/ldt/user/login_form.html:69 +#: user/templates/ldt/user/login_form.html:68 #, fuzzy msgid "reset password" msgstr "Réinitialiser le mot de passe" -#: user/templates/ldt/user/login_form.html:72 +#: user/templates/ldt/user/login_form.html:71 msgid "Connection" msgstr "Connexion" @@ -1944,5 +1940,21 @@ "Nous vous avons envoyé par courriel les instructions pour activer le compte " "à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement." -#~ msgid "The video starts automatically" -#~ msgstr "La vidéo commence automatiquement" +#~ msgid "Cancel upload" +#~ msgstr "Annuler le téléversement" + +#~ msgid "User details" +#~ msgstr "Détails utilisateur" + +#~ msgid "Permissions" +#~ msgstr "Permissions" + +#~ msgid "E-mail" +#~ msgstr "E-mail" + +#~ msgid "The two emails didn't match." +#~ msgstr "les deux emails ne correspondent pas" + +#, fuzzy +#~ msgid "Last name" +#~ msgstr "Nom" diff -r e216b8db05cc -r ec7a604ed821 src/ldt/ldt/static/ldt/css/front_common.css --- a/src/ldt/ldt/static/ldt/css/front_common.css Thu Nov 07 13:38:26 2013 +0100 +++ b/src/ldt/ldt/static/ldt/css/front_common.css Tue Nov 19 17:58:31 2013 +0100 @@ -127,6 +127,7 @@ .li_media { margin: 10px; + word-wrap: break-word; } .img_media {