# HG changeset patch # User ymh # Date 1287566378 -7200 # Node ID c5514a2bfdcdda126df5f99413e784c64dac3deb # Parent 0fb4b009c6eb9b9787c0ad1d47e6c73c9882b490 - error correction on login template - slight redesign of login template - put the page and header title in translation diff -r 0fb4b009c6eb -r c5514a2bfdcd web/franceculture/locale/fr/LC_MESSAGES/django.mo Binary file web/franceculture/locale/fr/LC_MESSAGES/django.mo has changed diff -r 0fb4b009c6eb -r c5514a2bfdcd web/franceculture/locale/fr/LC_MESSAGES/django.po --- a/web/franceculture/locale/fr/LC_MESSAGES/django.po Tue Oct 19 15:21:07 2010 +0200 +++ b/web/franceculture/locale/fr/LC_MESSAGES/django.po Wed Oct 20 11:19:38 2010 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-12 03:19+0200\n" +"POT-Creation-Date: 2010-10-19 19:51+0200\n" "PO-Revision-Date: 2010-02-17 02:57+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -20,224 +20,10 @@ msgid "French" msgstr "Français" -#: views.py:88 -msgid "You can not access this project" -msgstr "Vous n'avez pas accès à ce projet" - -#: templates/base.html:44 -msgid "home" -msgstr "accueil" - -#: templates/base.html:45 -msgid "contents" -msgstr "Liste des contenus" - -#: templates/base.html:46 -msgid "indexation projects" -msgstr "Projets d'indexation" - -#: templates/base.html:47 -msgid "accounts" -msgstr "Liste des comptes" - -#: templates/base.html:48 -msgid "Profiles" -msgstr "Profile" - -#: templates/base.html:54 -msgid "Log out" -msgstr "déconnexion" - -#: templates/base.html:62 -msgid "Langue" -msgstr "Langue" - -#: templates/franceculture/embed_popup.html:42 -msgid "popup_player" -msgstr "Code du lecteur" - -#: templates/franceculture/embed_popup.html:42 -msgid "popup_seo_body" -msgstr "Code SEO" - -#: templates/franceculture/embed_popup.html:42 -msgid "popup_seo_meta" -msgstr "Code balise meta header" - -#: templates/franceculture/embed_popup.html:42 -msgid "popup_links" -msgstr "Liste de liens" - -#: templates/franceculture/embed_popup.html:56 -msgid "clik here to see the project content" -msgstr "cliquer ici pour voir le contenu du projet" - -#: templates/franceculture/workspace.html:52 -#: templates/ldt/ldt_utils/content_list.html:50 -msgid "content list" -msgstr "Liste des contenus" - -#: templates/franceculture/workspace.html:54 -#: templates/franceculture/workspace.html:65 -#: templates/ldt/ldt_utils/content_list.html:52 -#: templates/ldt/ldt_utils/ldt_list.html:79 -msgid "search" -msgstr "Recherche" - -#: templates/franceculture/workspace.html:63 -#: templates/ldt/ldt_utils/ldt_list.html:77 -msgid "project list" -msgstr "Liste des projets" - -#: templates/franceculture/partial/contentslist.html:3 -#: templates/franceculture/partial/projectslist.html:3 -#: templates/ldt/ldt_utils/create_ldt.html:42 -msgid "name" -msgstr "Nom" - -#: templates/franceculture/partial/contentslist.html:11 -msgid "create project" -msgstr "Créer un projet" - -#: templates/franceculture/partial/contentslist.html:12 -msgid "preview media" -msgstr "preview" - -#: templates/franceculture/partial/contentslist.html:21 -#: templates/ldt/ldt_utils/create_content.html:68 -msgid "Create content" -msgstr "Créer un Contenu" - -#: templates/franceculture/partial/projectslist.html:12 -msgid "open ldt" -msgstr "Ouvrir sous Lignes de Temps" - -#: templates/franceculture/partial/projectslist.html:13 -msgid "copy project" -msgstr "Copier projet" - -#: templates/franceculture/partial/projectslist.html:14 -msgid "link json by id" -msgstr "Ouvrir le lecteur augmenté" - -#: templates/franceculture/partial/projectslist.html:17 -msgid "Project published, click to unpublish" -msgstr "Projet publié, cliquer pour de-publier" - -#: templates/franceculture/partial/projectslist.html:19 -msgid "Project not published, click to publish" -msgstr "Projet non publié, cliquer pour publier" - -#: templates/franceculture/partial/projectslist.html:36 -msgid "Create project" -msgstr "Créer un projet" - -#: templates/ldt/ldt_utils/create_content.html:47 -msgid "" -"The operation could not be performed because one or more error(s) occurred." -"
Please resubmit the content form after making the following changes:" -msgstr "" -"opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " -"resoumettre le formulaire contenu après avoir fait les changements suivants:" - -#: templates/ldt/ldt_utils/create_content.html:58 -msgid "" -"The operation could not be performed because one or more error(s) occurred." -"
Please resubmit the media form after making the following changes:" -msgstr "" -"opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " -"resoumettre le formulaire media après avoir fait les changements suivants:" - -#: templates/ldt/ldt_utils/create_content.html:105 -msgid "media file is being processed please wait." -msgstr "Le fichier média est en cours de traitement. Veullez patienter." - -#: templates/ldt/ldt_utils/create_content.html:109 -#: templates/ldt/ldt_utils/create_ldt.html:59 -#: templates/ldt/ldt_utils/error_confirm.html:48 -msgid "close_cancel" -msgstr "Annuler" - -#: templates/ldt/ldt_utils/create_content.html:110 -msgid "delete" -msgstr "Effacer" - -#: templates/ldt/ldt_utils/create_content.html:111 -msgid "write" -msgstr "Enregistrer" - -#: templates/ldt/ldt_utils/create_ldt.html:34 -msgid "Update your project" -msgstr "Mettre à jour un projet" - -#: templates/ldt/ldt_utils/create_ldt.html:34 -msgid "Create your project" -msgstr "Créer un projet" - -#: templates/ldt/ldt_utils/create_ldt.html:38 -msgid "Title" -msgstr "Titre" - -#: templates/ldt/ldt_utils/create_ldt.html:40 -msgid "List of contents" -msgstr "Liste des Médias" - -#: templates/ldt/ldt_utils/create_ldt.html:61 -msgid "delete_project" -msgstr "Effacer" - -#: templates/ldt/ldt_utils/create_ldt.html:62 -msgid "update_project" -msgstr "Mettre à jour" - -#: templates/ldt/ldt_utils/create_ldt.html:64 -msgid "create_project" -msgstr "Créer" - -#: templates/ldt/ldt_utils/error_confirm.html:30 -msgid "error" -msgstr "Erreurs" - -#: templates/ldt/ldt_utils/error_confirm.html:30 -msgid "confirm" -msgstr "Confirmer" - -#: templates/ldt/ldt_utils/error_confirm.html:44 -msgid "close_error" -msgstr "fermer" - -#: templates/ldt/ldt_utils/error_confirm.html:49 -msgid "do_delete" -msgstr "Effacer" - -#: templates/ldt/user/login_form.html:33 templates/registration/login.html:14 +#: templates/registration/login.html:14 msgid "Log in" msgstr "Connexion" -#: templates/ldt/user/login_form.html:38 -msgid "create account" -msgstr "Créer un compte" - -#: templates/ldt/user/login_form.html:42 -msgid "Pseudo" -msgstr "Pseudo" - -#: templates/ldt/user/login_form.html:45 templates/ldt/user/login_form.html:52 -msgid "this field is compulsory" -msgstr "Ce champs et obligatoire" - -#: templates/ldt/user/login_form.html:49 -msgid "Password" -msgstr "Mot de passe" - -#: templates/ldt/user/login_form.html:56 -msgid "reset password" -msgstr "Réinitialiser le mot de passe" - -#: templates/ldt/user/login_form.html:59 -msgid "Connection" -msgstr "Connexion" - #: templates/registration/login.html:17 msgid "Sorry, that's not a valid username or password." msgstr "Désolé, mais ce n'est pas un identifiant ou un mot de passe valide" @@ -250,6 +36,170 @@ msgid "Forget password?" msgstr "Mot de passe oublié ?" +msgid "header_title" +msgstr "France Culture" + +msgid "page_title" +msgstr "France Culture" + +#~ msgid "You can not access this project" +#~ msgstr "Vous n'avez pas accès à ce projet" + +#~ msgid "home" +#~ msgstr "accueil" + +#~ msgid "contents" +#~ msgstr "Liste des contenus" + +#~ msgid "indexation projects" +#~ msgstr "Projets d'indexation" + +#~ msgid "accounts" +#~ msgstr "Liste des comptes" + +#~ msgid "Profiles" +#~ msgstr "Profile" + +#~ msgid "Log out" +#~ msgstr "déconnexion" + +#~ msgid "Langue" +#~ msgstr "Langue" + +#~ msgid "popup_player" +#~ msgstr "Code du lecteur" + +#~ msgid "popup_seo_body" +#~ msgstr "Code SEO" + +#~ msgid "popup_seo_meta" +#~ msgstr "Code balise meta header" + +#~ msgid "popup_links" +#~ msgstr "Liste de liens" + +#~ msgid "clik here to see the project content" +#~ msgstr "cliquer ici pour voir le contenu du projet" + +#~ msgid "content list" +#~ msgstr "Liste des contenus" + +#~ msgid "search" +#~ msgstr "Recherche" + +#~ msgid "project list" +#~ msgstr "Liste des projets" + +#~ msgid "name" +#~ msgstr "Nom" + +#~ msgid "create project" +#~ msgstr "Créer un projet" + +#~ msgid "preview media" +#~ msgstr "preview" + +#~ msgid "Create content" +#~ msgstr "Créer un Contenu" + +#~ msgid "open ldt" +#~ msgstr "Ouvrir sous Lignes de Temps" + +#~ msgid "copy project" +#~ msgstr "Copier projet" + +#~ msgid "link json by id" +#~ msgstr "Ouvrir le lecteur augmenté" + +#~ msgid "Project published, click to unpublish" +#~ msgstr "Projet publié, cliquer pour de-publier" + +#~ msgid "Project not published, click to publish" +#~ msgstr "Projet non publié, cliquer pour publier" + +#~ msgid "Create project" +#~ msgstr "Créer un projet" + +#~ msgid "" +#~ "The operation could not be performed because one or more error(s) " +#~ "occurred.
Please resubmit the content form after making the " +#~ "following changes:" +#~ msgstr "" +#~ "opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " +#~ "resoumettre le formulaire contenu après avoir fait les changements " +#~ "suivants:" + +#~ msgid "" +#~ "The operation could not be performed because one or more error(s) " +#~ "occurred.
Please resubmit the media form after making the following " +#~ "changes:" +#~ msgstr "" +#~ "opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " +#~ "resoumettre le formulaire media après avoir fait les changements suivants:" + +#~ msgid "media file is being processed please wait." +#~ msgstr "Le fichier média est en cours de traitement. Veullez patienter." + +#~ msgid "close_cancel" +#~ msgstr "Annuler" + +#~ msgid "delete" +#~ msgstr "Effacer" + +#~ msgid "write" +#~ msgstr "Enregistrer" + +#~ msgid "Update your project" +#~ msgstr "Mettre à jour un projet" + +#~ msgid "Create your project" +#~ msgstr "Créer un projet" + +#~ msgid "Title" +#~ msgstr "Titre" + +#~ msgid "List of contents" +#~ msgstr "Liste des Médias" + +#~ msgid "delete_project" +#~ msgstr "Effacer" + +#~ msgid "update_project" +#~ msgstr "Mettre à jour" + +#~ msgid "create_project" +#~ msgstr "Créer" + +#~ msgid "error" +#~ msgstr "Erreurs" + +#~ msgid "confirm" +#~ msgstr "Confirmer" + +#~ msgid "close_error" +#~ msgstr "fermer" + +#~ msgid "do_delete" +#~ msgstr "Effacer" + +#~ msgid "create account" +#~ msgstr "Créer un compte" + +#~ msgid "Pseudo" +#~ msgstr "Pseudo" + +#~ msgid "this field is compulsory" +#~ msgstr "Ce champs et obligatoire" + +#~ msgid "Password" +#~ msgstr "Mot de passe" + +#~ msgid "reset password" +#~ msgstr "Réinitialiser le mot de passe" + +#~ msgid "Connection" +#~ msgstr "Connexion" + #~ msgid "Create" #~ msgstr "Créer" diff -r 0fb4b009c6eb -r c5514a2bfdcd web/franceculture/templates/registration/login.html --- a/web/franceculture/templates/registration/login.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/franceculture/templates/registration/login.html Wed Oct 20 11:19:38 2010 +0200 @@ -8,26 +8,46 @@ {% endblock %} +{% block css_import %} + {{ block.super }} + + +{% endblock %} + + {% block login %} {% endblock %} {% block content_title %}{% trans 'Log in' %}{% endblock %} {% block iricontent %} {% if form.errors %} -

{% trans "Sorry, that's not a valid username or password." %}

+

{% trans "Sorry, that's not a valid username or password." %}

{% endif %} - +
+
{% csrf_token %} - -
    - {{form.as_ul}} -
    • -
- - + + +
    + {{form.as_ul}} +
+
+ +
+
+ +
+
+ +
+ {% endblock %} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/franceculture/urls.py --- a/web/franceculture/urls.py Tue Oct 19 15:21:07 2010 +0200 +++ b/web/franceculture/urls.py Wed Oct 20 11:19:38 2010 +0200 @@ -21,4 +21,6 @@ (r'^user/', include('ldt.user.urls')), (r'^accounts/', include('registration.backends.simple.urls')), + + (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), ) diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/core/handlers/modpython.py --- a/web/ldt/core/handlers/modpython.py Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/core/handlers/modpython.py Wed Oct 20 11:19:38 2010 +0200 @@ -3,6 +3,6 @@ activate_this = req.get_options().get("virtualenv.activate_path") execfile(activate_this, dict(__file__=activate_this)) - import django.core.handlers.wsgi + import django.core.handlers.modpython - return django.core.handlers.wsgi.handler(req) + return django.core.handlers.modpython.handler(req) \ No newline at end of file diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/ldt_utils/projectserializer.py --- a/web/ldt/ldt_utils/projectserializer.py Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/ldt_utils/projectserializer.py Wed Oct 20 11:19:38 2010 +0200 @@ -18,6 +18,7 @@ self.ldt_doc = None self.medias_dict = SortedDict() self.annotations_dict = SortedDict() + self.annotations_by_annotation_types = {} self.tags = {} self.tags_dict = SortedDict() self.annotation_types_dict = SortedDict() @@ -134,6 +135,7 @@ } self.annotation_types_dict[decoupage_id] = new_annotation_types + self.annotations_by_annotation_types[decoupage_id] = [] res = decoupage_node.xpath("elements/element") for element_node in res: @@ -226,6 +228,7 @@ } self.annotations_dict[element_id] = new_annotation + self.annotations_by_annotation_types[decoupage_id].append(new_annotation) if not list_items: new_list["items"] = None @@ -241,9 +244,7 @@ if isinstance(self.from_display, basestring): xpath_str = "/iri/displays/display[@id='%s']" % self.from_display - logging.debug("xpath_str " + xpath_str) self.__parse_views(self.ldt_doc.xpath(xpath_str)) - logging.debug("xpath_str " + repr(self.views_dict)) res = self.ldt_doc.xpath("/iri/medias/media") for mediaNode in res: @@ -267,6 +268,19 @@ continue self.__parse_ensemble(ensemble_node, content) + #reorder annotations and annotation type from view + if self.from_display and len(self.views_dict) > 0: + new_annotation_types_dict = SortedDict() + new_annotations_dict = SortedDict() + for annotation_type in self.display_cuttings_list: + if annotation_type in self.annotation_types_dict: + new_annotation_types_dict[annotation_type] = self.annotation_types_dict[annotation_type] + for annot in self.annotations_by_annotation_types[annotation_type]: + new_annotations_dict[annot['id']] = annot + + self.annotations_dict = new_annotations_dict + self.annotation_types_dict = new_annotation_types_dict + self.parsed = True def __parse_content(self, content): @@ -360,12 +374,14 @@ res['medias'] = self.medias_dict.values() if len(self.medias_dict) > 0 else None - res['annotation-types'] = self.annotation_types_dict.values() if len(self.annotation_types_dict) > 0 else None - res['annotations'] = self.annotations_dict.values() if len(self.annotations_dict) > 0 else None res['lists'] = self.lists_dict.values() if len(self.lists_dict) > 0 else None res['tags'] = self.tags.values() if len(self.tags) > 0 else None res['views'] = self.views_dict.values() if len(self.views_dict) > 0 else None + res['annotation-types'] = self.annotation_types_dict.values() if len(self.annotation_types_dict) > 0 else None + res['annotations'] = self.annotations_dict.values() if len(self.annotations_dict) > 0 else None + + return res @@ -379,9 +395,10 @@ current_cutting = None uri = None for annot in self.annotations_dict.values(): - if first_cutting and current_cutting and current_cuttings != annot['meta']['id-ref'] : + logging.debug("current cutting" + repr(current_cutting) + " : annot " + annot['meta']['id-ref']) + if first_cutting and current_cutting and current_cutting != annot['meta']['id-ref'] : break - current_cuttings = annot['meta']['id-ref'] + current_cutting = annot['meta']['id-ref'] content_id = annot['media'] content = Content.objects.get(iri_id=content_id) if annot['tags']: diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html --- a/web/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Wed Oct 20 11:19:38 2010 +0200 @@ -40,15 +40,16 @@
-{% if errors|length > 0 %} - -{% else %} -
- {% csrf_token %} - - -
-{% endif %} -
- +
+ {% if errors|length > 0 %} + + {% else %} +
+ {% csrf_token %} + + +
+ {% endif %} +
+ {% endblock %} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/ldt_utils/views.py --- a/web/ldt/ldt_utils/views.py Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/ldt_utils/views.py Wed Oct 20 11:19:38 2010 +0200 @@ -784,11 +784,12 @@ if iri_id: for content in Content.objects.filter(iri_id=iri_id): titles.append(unicode(content.title)) - projects = Content.objects.all()[0].project_set.all() + projects = content.project_set.all() projects_nb = len(projects) if projects_nb > 0: - project_titles = [lambda p: p.title for p in projects] - errors.append(ungettext("Content '%(title)s' is referenced by this project : %(project_titles)s. Please delete it beforehand.", "Content '%(title)s' is referenced by %(count)d projects: %(project_titles)s. Please delete them beforehand.", projects_nb)%{'title':content.title,'count':projects_nb, 'project_titles': ",".join(project_titles)}) + project_titles = map(lambda p: unicode(p.title), projects) + errors.append(ungettext("Content '%(title)s' is referenced by this project : %(project_titles)s. Please delete it beforehand.", "Content '%(title)s' is referenced by %(count)d projects: %(project_titles)s. Please delete them beforehand.", projects_nb)%{'title':unicode(content.title),'count':projects_nb, 'project_titles': ",".join(project_titles)}) + return errors, titles diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/locale/en/LC_MESSAGES/django.mo Binary file web/ldt/locale/en/LC_MESSAGES/django.mo has changed diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/locale/en/LC_MESSAGES/django.po --- a/web/ldt/locale/en/LC_MESSAGES/django.po Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/locale/en/LC_MESSAGES/django.po Wed Oct 20 11:19:38 2010 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-12 03:19+0200\n" +"POT-Creation-Date: 2010-10-19 19:43+0200\n" "PO-Revision-Date: 2010-02-17 03:53+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgid "Time" msgstr "Time" -#: ldt_utils/forms.py:43 ldt_utils/models.py:80 +#: ldt_utils/forms.py:43 ldt_utils/models.py:82 msgid "content.content_creation_date" msgstr "content creation date" @@ -52,155 +52,154 @@ msgid "none_media" msgstr "no media" -#: ldt_utils/models.py:23 +#: ldt_utils/models.py:25 msgid "media.external_id" msgstr "external id" -#: ldt_utils/models.py:24 +#: ldt_utils/models.py:26 msgid "media.external_permalink" msgstr "media permalink" -#: ldt_utils/models.py:25 +#: ldt_utils/models.py:27 msgid "media.external_publication_url" msgstr "media publication url" -#: ldt_utils/models.py:26 +#: ldt_utils/models.py:28 msgid "media.external_src_url" msgstr "media external source url" -#: ldt_utils/models.py:27 +#: ldt_utils/models.py:29 msgid "media.creation_date" msgstr "media object creation date" -#: ldt_utils/models.py:28 +#: ldt_utils/models.py:30 msgid "media.media_creation_date" msgstr "media creation date" -#: ldt_utils/models.py:29 +#: ldt_utils/models.py:31 msgid "media.update_date" msgstr "update date" -#: ldt_utils/models.py:30 +#: ldt_utils/models.py:32 msgid "media.videopath" msgstr "videopath" -#: ldt_utils/models.py:31 +#: ldt_utils/models.py:33 msgid "media.duration" msgstr "duration (ms)" -#: ldt_utils/models.py:32 +#: ldt_utils/models.py:34 msgid "media.creator" msgstr "media creator" -#: ldt_utils/models.py:33 +#: ldt_utils/models.py:35 msgid "description" msgstr "description" -#: ldt_utils/models.py:34 +#: ldt_utils/models.py:36 #: ldt_utils/templates/ldt/ldt_utils/content_list.html:69 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:64 msgid "title" msgstr "Title" -#: ldt_utils/models.py:35 +#: ldt_utils/models.py:37 msgid "media.src" msgstr "media source" -#: ldt_utils/models.py:72 +#: ldt_utils/models.py:74 msgid "content.iri_id" msgstr "iri id" -#: ldt_utils/models.py:73 +#: ldt_utils/models.py:75 msgid "content.iriurl" msgstr "iri url" -#: ldt_utils/models.py:74 +#: ldt_utils/models.py:76 msgid "content.creation_date" msgstr "content creation date" -#: ldt_utils/models.py:75 +#: ldt_utils/models.py:77 msgid "content.update_date" msgstr "content update date" -#: ldt_utils/models.py:76 +#: ldt_utils/models.py:78 msgid "content.title" msgstr "title" -#: ldt_utils/models.py:77 +#: ldt_utils/models.py:79 msgid "content.description" msgstr "description" -#: ldt_utils/models.py:78 +#: ldt_utils/models.py:80 msgid "content.authors" msgstr "authors" -#: ldt_utils/models.py:79 +#: ldt_utils/models.py:81 msgid "content.duration" msgstr "duration (ms)" -#: ldt_utils/models.py:248 +#: ldt_utils/models.py:256 msgid "created by" msgstr "created by" -#: ldt_utils/models.py:249 +#: ldt_utils/models.py:257 msgid "changed by" msgstr "changed by" -#: ldt_utils/views.py:231 +#: ldt_utils/views.py:72 ldt_utils/views.py:332 ldt_utils/views.py:378 msgid "You can not access this project" msgstr "You can not access this project" -#: ldt_utils/views.py:380 +#: ldt_utils/views.py:536 #, python-format msgid "the project %(title)s is published. please unpublish before deleting." msgstr "the project %(title)s is published. please unpublish before deleting." -#: ldt_utils/views.py:381 +#: ldt_utils/views.py:537 msgid "can not delete the project. Please correct the following error" msgstr "can not delete the project. Please correct the following error" -#: ldt_utils/views.py:382 +#: ldt_utils/views.py:538 msgid "title error deleting project" msgstr "Error when deleting project" -#: ldt_utils/views.py:384 +#: ldt_utils/views.py:540 #, python-format msgid "please confirm deleting project %(title)s" msgstr "Please confirm deleting project %(title)s" -#: ldt_utils/views.py:385 +#: ldt_utils/views.py:541 msgid "confirm deletion" msgstr "Confirm deletion" -#: ldt_utils/views.py:509 +#: ldt_utils/views.py:683 msgid "Problem when downloading file from url : " msgstr "Problem when downloading file from url: " -#: ldt_utils/views.py:512 +#: ldt_utils/views.py:686 msgid "Problem when uploading file : " msgstr "Problem when uploading file: " -#: ldt_utils/views.py:582 +#: ldt_utils/views.py:756 #, python-format msgid "There is %(count)d error when deleting content" msgid_plural "There are %(count)d errors when deleting content" msgstr[0] "There is %(count)d error when deleting content" msgstr[1] "There are %(count)d errors when deleting content" -#: ldt_utils/views.py:583 +#: ldt_utils/views.py:757 msgid "title error deleting content" msgstr "Error when deleting content" -#: ldt_utils/views.py:585 +#: ldt_utils/views.py:759 #, python-format msgid "Confirm delete content %(titles)s" msgstr "Confirm delete content %(titles)s" -#: ldt_utils/views.py:586 +#: ldt_utils/views.py:760 msgid "confirm delete content" msgstr "Confirm delete content" -#: ldt_utils/views.py:618 +#: ldt_utils/views.py:791 #, python-format msgid "" "Content '%(title)s' is referenced by this project : %(project_titles)s. " @@ -225,7 +224,6 @@ msgstr "Home" #: ldt_utils/templates/ldt/ldt_utils/content_list.html:55 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:51 #: templates/admin/page_base.html:19 #: user/templates/ldt/user/login_form.html:33 #: user/templates/ldt/user/space.html:6 user/templates/ldt/user/space.html:9 @@ -233,8 +231,6 @@ msgstr "Space" #: ldt_utils/templates/ldt/ldt_utils/content_list.html:56 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:52 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:55 msgid "Ldt Project" msgstr "Ldt Project" @@ -252,6 +248,7 @@ #: ldt_utils/templates/ldt/ldt_utils/content_list.html:70 #: ldt_utils/templates/ldt/ldt_utils/content_list.html:77 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:11 msgid "create project" msgstr "Create new project" @@ -260,7 +257,7 @@ msgstr "Copy your project" #: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:14 -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:14 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:38 msgid "Title" msgstr "Title" @@ -268,41 +265,153 @@ msgid "Copy" msgstr "Copy" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:22 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:47 +msgid "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the content form after making the following changes:" +msgstr "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the content form after making the following changes:" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:58 +msgid "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the media form after making the following changes:" +msgstr "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the media form after making the following changes:" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:68 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:21 msgid "Create content" msgstr "Create content" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:11 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:105 +msgid "media file is being processed please wait." +msgstr "media file is being processed please wait." + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:109 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:59 +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:49 +msgid "close_cancel" +msgstr "Close" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:110 +msgid "delete" +msgstr "Approve delete" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:111 +msgid "write" +msgstr "write" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:34 +msgid "Update your project" +msgstr "Create your project" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:34 msgid "Create your project" msgstr "Create your project" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:16 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:40 msgid "List of contents" msgstr "List of contents" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:23 -msgid "Create" -msgstr "Create" +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:42 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:3 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:3 +msgid "name" +msgstr "name" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:61 +msgid "delete_project" +msgstr "delete project" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:62 +msgid "update_project" +msgstr "update project" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:64 +msgid "create_project" +msgstr "Create new project" -#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:16 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_player" +msgstr "player" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_seo_body" +msgstr "seo" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_seo_meta" +msgstr "meta" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_links" +msgstr "links" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:56 +msgid "clik here to see the project content" +msgstr "clik here to see the project content" + +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:30 msgid "error" msgstr "Error" -#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:25 +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:30 +msgid "confirm" +msgstr "Confirm deletion" + +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:45 msgid "close_error" msgstr "Close" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:59 -msgid "Create new project" -msgstr "Create new project" +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:50 +msgid "do_delete" +msgstr "Approve delete" + +#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:77 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:63 +msgid "project list" +msgstr "Projects" + +#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:79 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:54 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:65 +msgid "search" +msgstr "search" + +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:52 +msgid "content list" +msgstr "contents" + +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:12 +msgid "preview media" +msgstr "preview media" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:61 -msgid "Project" -msgstr "Project" +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:12 +msgid "open ldt" +msgstr "open ldt" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:13 +msgid "copy project" +msgstr "Copy your project" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:14 +msgid "link json by id" +msgstr "link json by id" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:65 -msgid " published" -msgstr " published" +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:17 +msgid "Project published, click to unpublish" +msgstr "Project published, click to unpublish" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:19 +msgid "Project not published, click to publish" +msgstr "Project not published, click to publish" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:36 +msgid "Create project" +msgstr "Create new project" #: templates/admin/cms_change_form.html:30 msgid "Approve page deletion" @@ -511,7 +620,7 @@ msgstr "Change password" #: templates/cms/admin/cms/page/change_form.html:11 -#: user/templates/ldt/user/login_form.html:34 +#: templates/ldt/ldt_base.html:54 user/templates/ldt/user/login_form.html:34 msgid "Log out" msgstr "Log out" @@ -523,6 +632,42 @@ msgid "Order:" msgstr "Order:" +#: templates/ldt/ldt_base.html:26 +msgid "header_title" +msgstr "Ldt Platform" + +#: templates/ldt/ldt_base.html:44 +msgid "home" +msgstr "home" + +#: templates/ldt/ldt_base.html:45 +msgid "contents" +msgstr "Contents" + +#: templates/ldt/ldt_base.html:46 +msgid "indexation projects" +msgstr "indexation projects" + +#: templates/ldt/ldt_base.html:47 +msgid "accounts" +msgstr "accounts" + +#: templates/ldt/ldt_base.html:48 user/templates/ldt/user/change_email.html:6 +#: user/templates/ldt/user/change_email_done.html:6 +#: 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 "Profiles" + +#: templates/ldt/ldt_base.html:62 +msgid "Langue" +msgstr "Langue" + +#: templates/ldt/ldt_raw_base.html:13 +msgid "page_title" +msgstr "Ldt Platform" + #: user/admin.py:15 msgid "User details" msgstr "User details" @@ -559,14 +704,6 @@ msgid "Sorry, that's not a valid username or password." msgstr "Sorry, that's not a valid username or password." -#: user/templates/ldt/user/change_email.html:6 -#: user/templates/ldt/user/change_email_done.html:6 -#: 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 "Profiles" - #: user/templates/ldt/user/change_email.html:7 #: user/templates/ldt/user/change_email.html:10 msgid "Modification de l'adresse émail" @@ -856,6 +993,15 @@ "We've e-mailed you instructions for activate your account to the e-mail " "address you submitted. You should be receiving it shortly." +#~ msgid "Create" +#~ msgstr "Create" + +#~ msgid "Create new project" +#~ msgstr "Create new project" + +#~ msgid " published" +#~ msgstr " published" + #~ msgid "Changement de l'adresse émail" #~ msgstr "E-mail change" diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/locale/fr/LC_MESSAGES/django.mo Binary file web/ldt/locale/fr/LC_MESSAGES/django.mo has changed diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/locale/fr/LC_MESSAGES/django.po --- a/web/ldt/locale/fr/LC_MESSAGES/django.po Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/locale/fr/LC_MESSAGES/django.po Wed Oct 20 11:19:38 2010 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-12 03:19+0200\n" +"POT-Creation-Date: 2010-10-19 19:43+0200\n" "PO-Revision-Date: 2010-03-09 15:52+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgid "Time" msgstr "Time" -#: ldt_utils/forms.py:43 ldt_utils/models.py:80 +#: ldt_utils/forms.py:43 ldt_utils/models.py:82 msgid "content.content_creation_date" msgstr "Date de creation du contenu" @@ -52,156 +52,155 @@ msgid "none_media" msgstr "Aucun" -#: ldt_utils/models.py:23 +#: ldt_utils/models.py:25 msgid "media.external_id" msgstr "id externe" -#: ldt_utils/models.py:24 +#: ldt_utils/models.py:26 msgid "media.external_permalink" msgstr "permalien externe" -#: ldt_utils/models.py:25 +#: ldt_utils/models.py:27 msgid "media.external_publication_url" msgstr "url de publication externe" -#: ldt_utils/models.py:26 +#: ldt_utils/models.py:28 msgid "media.external_src_url" msgstr "url source" -#: ldt_utils/models.py:27 +#: ldt_utils/models.py:29 msgid "media.creation_date" msgstr "Date de création" -#: ldt_utils/models.py:28 +#: ldt_utils/models.py:30 msgid "media.media_creation_date" msgstr "Date de création du média" -#: ldt_utils/models.py:29 +#: ldt_utils/models.py:31 msgid "media.update_date" msgstr "Date de maj" -#: ldt_utils/models.py:30 +#: ldt_utils/models.py:32 msgid "media.videopath" msgstr "videopath" -#: ldt_utils/models.py:31 +#: ldt_utils/models.py:33 msgid "media.duration" msgstr "Durée du contenu (ms)" -#: ldt_utils/models.py:32 +#: ldt_utils/models.py:34 msgid "media.creator" msgstr "Créateur" -#: ldt_utils/models.py:33 +#: ldt_utils/models.py:35 msgid "description" msgstr "description" -#: ldt_utils/models.py:34 +#: ldt_utils/models.py:36 #: ldt_utils/templates/ldt/ldt_utils/content_list.html:69 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:64 msgid "title" msgstr "Titre" -#: ldt_utils/models.py:35 +#: ldt_utils/models.py:37 msgid "media.src" msgstr "Sources" -#: ldt_utils/models.py:72 +#: ldt_utils/models.py:74 msgid "content.iri_id" msgstr "iri id" -#: ldt_utils/models.py:73 +#: ldt_utils/models.py:75 msgid "content.iriurl" msgstr "iri url" -#: ldt_utils/models.py:74 +#: ldt_utils/models.py:76 msgid "content.creation_date" msgstr "date de création" -#: ldt_utils/models.py:75 +#: ldt_utils/models.py:77 msgid "content.update_date" msgstr "Date de maj" -#: ldt_utils/models.py:76 +#: ldt_utils/models.py:78 msgid "content.title" msgstr "titre" -#: ldt_utils/models.py:77 +#: ldt_utils/models.py:79 msgid "content.description" msgstr "Description" -#: ldt_utils/models.py:78 +#: ldt_utils/models.py:80 msgid "content.authors" msgstr "Autheurs" -#: ldt_utils/models.py:79 +#: ldt_utils/models.py:81 msgid "content.duration" msgstr "Durée (ms)" -#: ldt_utils/models.py:248 +#: ldt_utils/models.py:256 msgid "created by" msgstr "créé par" -#: ldt_utils/models.py:249 +#: ldt_utils/models.py:257 msgid "changed by" msgstr "modifié par" -#: ldt_utils/views.py:231 +#: ldt_utils/views.py:72 ldt_utils/views.py:332 ldt_utils/views.py:378 msgid "You can not access this project" msgstr "vous n'avez pas l'autorisation d'accéder à ce projet" -#: ldt_utils/views.py:380 +#: ldt_utils/views.py:536 #, python-format msgid "the project %(title)s is published. please unpublish before deleting." msgstr "Le projet %(title)s est publié. Déplublier le avant de l'effacer." -#: ldt_utils/views.py:381 +#: ldt_utils/views.py:537 msgid "can not delete the project. Please correct the following error" msgstr "" "Le projet ne peut pas être effacé. Veuillez corriger les erreurs suivantes." -#: ldt_utils/views.py:382 +#: ldt_utils/views.py:538 msgid "title error deleting project" msgstr "Erreur lors de l'effacement du projet" -#: ldt_utils/views.py:384 +#: ldt_utils/views.py:540 #, python-format msgid "please confirm deleting project %(title)s" msgstr "Confirmer l'efaccement du projet intitulé %(title)s" -#: ldt_utils/views.py:385 +#: ldt_utils/views.py:541 msgid "confirm deletion" msgstr "Confirmation d'effacement" -#: ldt_utils/views.py:509 +#: ldt_utils/views.py:683 msgid "Problem when downloading file from url : " msgstr "Problème lors du téléchargement du fichier : " -#: ldt_utils/views.py:512 +#: ldt_utils/views.py:686 msgid "Problem when uploading file : " msgstr "Problème lors de l'upload du fichier : " -#: ldt_utils/views.py:582 +#: ldt_utils/views.py:756 #, 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.py:583 +#: ldt_utils/views.py:757 msgid "title error deleting content" msgstr "Erreur lors de l'effacement du contenu" -#: ldt_utils/views.py:585 +#: ldt_utils/views.py:759 #, python-format msgid "Confirm delete content %(titles)s" msgstr "Veuillez confirmer l'effacement du contenu %(titles)s" -#: ldt_utils/views.py:586 +#: ldt_utils/views.py:760 msgid "confirm delete content" msgstr "Confirmation effacement contenu" -#: ldt_utils/views.py:618 +#: ldt_utils/views.py:791 #, python-format msgid "" "Content '%(title)s' is referenced by this project : %(project_titles)s. " @@ -226,7 +225,6 @@ msgstr "Accueil" #: ldt_utils/templates/ldt/ldt_utils/content_list.html:55 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:51 #: templates/admin/page_base.html:19 #: user/templates/ldt/user/login_form.html:33 #: user/templates/ldt/user/space.html:6 user/templates/ldt/user/space.html:9 @@ -234,8 +232,6 @@ msgstr "Esp. perso" #: ldt_utils/templates/ldt/ldt_utils/content_list.html:56 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:52 -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:55 msgid "Ldt Project" msgstr "Projet lignes de temps" @@ -253,6 +249,7 @@ #: ldt_utils/templates/ldt/ldt_utils/content_list.html:70 #: ldt_utils/templates/ldt/ldt_utils/content_list.html:77 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:11 msgid "create project" msgstr "Créer un nouveau projet Ligne de Temps" @@ -261,7 +258,7 @@ msgstr "Copier votre projet" #: ldt_utils/templates/ldt/ldt_utils/copy_ldt.html:14 -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:14 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:38 msgid "Title" msgstr "Titre" @@ -269,41 +266,153 @@ msgid "Copy" msgstr "Copier" -#: ldt_utils/templates/ldt/ldt_utils/create_content.html:22 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:47 +msgid "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the content form after making the following changes:" +msgstr "" +"Opération impossible à cause d'une ou plusieurs erreurs.
Veuillez " +"resoumettre le formulaire contenu après avoir fait les changements suivants:" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:58 +msgid "" +"The operation could not be performed because one or more error(s) occurred." +"
Please resubmit the media form after making the following changes:" +msgstr "" +"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:68 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:21 msgid "Create content" msgstr "Créer un compte" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:11 +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:105 +msgid "media file is being processed please wait." +msgstr "Le fichier média est en cours de traitement. Veullez patienter." + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:109 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:59 +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:49 +msgid "close_cancel" +msgstr "Fermer" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:110 +msgid "delete" +msgstr "Effacer" + +#: ldt_utils/templates/ldt/ldt_utils/create_content.html:111 +msgid "write" +msgstr "Enregistrer" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:34 +msgid "Update your project" +msgstr "Mettre à jour votre projet Lignes de Temps" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:34 msgid "Create your project" msgstr "Créer votre projet Lignes de Temps" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:16 +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:40 msgid "List of contents" msgstr "Liste de contenus" -#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:23 -msgid "Create" -msgstr "Créer" +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:42 +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:3 +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:3 +msgid "name" +msgstr "nom" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:61 +msgid "delete_project" +msgstr "Effacer" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:62 +msgid "update_project" +msgstr "Mettre à jour" + +#: ldt_utils/templates/ldt/ldt_utils/create_ldt.html:64 +msgid "create_project" +msgstr "Créer un nouveau projet Ligne de Temps" -#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:16 +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_player" +msgstr "Code Lecteur métadata" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_seo_body" +msgstr "Code SEO" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_seo_meta" +msgstr "Code balise meta en-tête" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:42 +msgid "popup_links" +msgstr "Liste de liens" + +#: ldt_utils/templates/ldt/ldt_utils/embed_popup.html:56 +msgid "clik here to see the project content" +msgstr "cliquer ici pour voir le contenu du projet" + +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:30 msgid "error" msgstr "Erreur" -#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:25 +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:30 +msgid "confirm" +msgstr "Confirmation d'effacement" + +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:45 msgid "close_error" msgstr "Fermer" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:59 -msgid "Create new project" -msgstr "Créer un nouveau projet Ligne de Temps" +#: ldt_utils/templates/ldt/ldt_utils/error_confirm.html:50 +msgid "do_delete" +msgstr "Effacer" + +#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:77 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:63 +msgid "project list" +msgstr "Liste des projets" + +#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:79 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:54 +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:65 +msgid "search" +msgstr "Recherche" + +#: ldt_utils/templates/ldt/ldt_utils/workspace_base.html:52 +msgid "content list" +msgstr "Liste des contenus" + +#: ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html:12 +msgid "preview media" +msgstr "aperçu" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:61 -msgid "Project" -msgstr "Projet" +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:12 +msgid "open ldt" +msgstr "Ouvrir sous Lignes de Temps" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:13 +msgid "copy project" +msgstr "Copier votre projet" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:14 +msgid "link json by id" +msgstr "Ouvrir le lecteur de métadata" -#: ldt_utils/templates/ldt/ldt_utils/ldt_list.html:65 -msgid " published" -msgstr "Publié" +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:17 +msgid "Project published, click to unpublish" +msgstr "Projet publié, cliquer pour de-publier" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:19 +msgid "Project not published, click to publish" +msgstr "Projet non publié, cliquer pour publier" + +#: ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html:36 +msgid "Create project" +msgstr "Créer un nouveau projet Ligne de Temps" #: templates/admin/cms_change_form.html:30 msgid "Approve page deletion" @@ -512,7 +621,7 @@ msgstr "Modifier le mot de passe" #: templates/cms/admin/cms/page/change_form.html:11 -#: user/templates/ldt/user/login_form.html:34 +#: templates/ldt/ldt_base.html:54 user/templates/ldt/user/login_form.html:34 msgid "Log out" msgstr "Déconnexion" @@ -524,6 +633,42 @@ msgid "Order:" msgstr "Ordre :" +#: templates/ldt/ldt_base.html:26 +msgid "header_title" +msgstr "Plateforme Ldt" + +#: templates/ldt/ldt_base.html:44 +msgid "home" +msgstr "accueil" + +#: templates/ldt/ldt_base.html:45 +msgid "contents" +msgstr "Liste des contenus" + +#: templates/ldt/ldt_base.html:46 +msgid "indexation projects" +msgstr "Projets d'indexation" + +#: templates/ldt/ldt_base.html:47 +msgid "accounts" +msgstr "Comptes" + +#: templates/ldt/ldt_base.html:48 user/templates/ldt/user/change_email.html:6 +#: user/templates/ldt/user/change_email_done.html:6 +#: 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 "Mon profil" + +#: templates/ldt/ldt_base.html:62 +msgid "Langue" +msgstr "Langue" + +#: templates/ldt/ldt_raw_base.html:13 +msgid "page_title" +msgstr "Plateforme Ldt" + #: user/admin.py:15 msgid "User details" msgstr "Détail utilisateur" @@ -560,14 +705,6 @@ msgid "Sorry, that's not a valid username or password." msgstr "Saisissez un nom d'utilisateur et un mot de passe valide." -#: user/templates/ldt/user/change_email.html:6 -#: user/templates/ldt/user/change_email_done.html:6 -#: 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 "Mon profil" - #: user/templates/ldt/user/change_email.html:7 #: user/templates/ldt/user/change_email.html:10 msgid "Modification de l'adresse émail" @@ -612,7 +749,7 @@ #: user/templates/ldt/user/home.html:10 msgid "Créer un compte" -msgstr "Créere un compte" +msgstr "Créer un compte" #: user/templates/ldt/user/home.html:11 msgid "récupérer mot de passe" @@ -860,5 +997,14 @@ "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 "Create" +#~ msgstr "Créer" + +#~ msgid "Create new project" +#~ msgstr "Créer un nouveau projet Ligne de Temps" + +#~ msgid " published" +#~ msgstr "Publié" + #~ msgid "Password (Verification)" #~ msgstr "Mot de passe (Vérification)" diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/templates/ldt/ldt_base.html --- a/web/ldt/templates/ldt/ldt_base.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/templates/ldt/ldt_base.html Wed Oct 20 11:19:38 2010 +0200 @@ -23,7 +23,7 @@ diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/templates/ldt/ldt_raw_base.html --- a/web/ldt/templates/ldt/ldt_raw_base.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/templates/ldt/ldt_raw_base.html Wed Oct 20 11:19:38 2010 +0200 @@ -10,7 +10,7 @@ - {% block title %}France Culture{% endblock %} + {% block title %}{% trans "page_title" %}{% endblock %} {% block js_import %} {% endblock %} @@ -30,7 +30,6 @@ - {% endblock %} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/user/templates/ldt/user/home.html --- a/web/ldt/user/templates/ldt/user/home.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/user/templates/ldt/user/home.html Wed Oct 20 11:19:38 2010 +0200 @@ -1,4 +1,4 @@ -{% extends "ldt_base.html" %} +{% extends "ldt/ldt_base.html" %} {% load i18n %} {% block title %}Home{% endblock %} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/user/templates/ldt/user/user_base.html --- a/web/ldt/user/templates/ldt/user/user_base.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/user/templates/ldt/user/user_base.html Wed Oct 20 11:19:38 2010 +0200 @@ -1,15 +1,11 @@ -{% extends "ldt_base.html" %} +{% extends "ldt/ldt_base.html" %} {# this page inherit base html, all pages of ldt inherit this page. #} {# all contents are writed in the "iricontent" block #} {% load i18n %} -{% block js_import %}{{ block.super }} -{% endblock %} -{% block css_import %}{{ block.super }} -{% endblock%} {% block content %} -
+
{% block iricontent %}{% endblock %}
{% endblock%} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/user/templates/registration/base.html --- a/web/ldt/user/templates/registration/base.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/user/templates/registration/base.html Wed Oct 20 11:19:38 2010 +0200 @@ -1,10 +1,9 @@ {% extends "ldt/user/user_base.html" %} -{% block js_import %}{{ block.super }} +{% block js_import %} + {{ block.super }} {% endblock %} {% block css_import %} -{{ block.super }} - + {{ block.super }} + {% endblock %} {% block pageclass %}profile{% endblock %} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/ldt/user/templates/registration/login.html --- a/web/ldt/user/templates/registration/login.html Tue Oct 19 15:21:07 2010 +0200 +++ b/web/ldt/user/templates/registration/login.html Wed Oct 20 11:19:38 2010 +0200 @@ -8,28 +8,47 @@ {% endblock %} +{% block css_import %} + {{ block.super }} + + +{% endblock %} + + {% block login %} {% endblock %} {% block content_title %}{% trans 'Log in' %}{% endblock %} {% block iricontent %} {% if form.errors %} -

{% trans "Sorry, that's not a valid username or password." %}

+

{% trans "Sorry, that's not a valid username or password." %}

{% endif %} - +
+
{% csrf_token %} - -
    - {{form.as_ul}} -
    • -
- - + + +
    + {{form.as_ul}} +
+
+ +
+
+ +
+
+ +
+ {% endblock %} - diff -r 0fb4b009c6eb -r c5514a2bfdcd web/static/ldt/css/ldtform.css --- a/web/static/ldt/css/ldtform.css Tue Oct 19 15:21:07 2010 +0200 +++ b/web/static/ldt/css/ldtform.css Wed Oct 20 11:19:38 2010 +0200 @@ -137,3 +137,4 @@ font-weight: bold; } + diff -r 0fb4b009c6eb -r c5514a2bfdcd web/static/ldt/css/registration.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/static/ldt/css/registration.css Wed Oct 20 11:19:38 2010 +0200 @@ -0,0 +1,33 @@ +/* style for registration */ + +label.error { + float: none; + color: red; + padding-left: .5em; + vertical-align: middle; +} + +#login_links { + height: 127px; +} + +#login_links_list { + border-left: 1px solid black; + height: 90%; + padding-top: 6px; +} + +#login_links_list ul { + list-style: none; +} + + +#loginform_div ul { + list-style: none; +} + +#loginform_div label { + display: inline; + float: left; + width: 110px; +} diff -r 0fb4b009c6eb -r c5514a2bfdcd web/static/ldt/css/style.css --- a/web/static/ldt/css/style.css Tue Oct 19 15:21:07 2010 +0200 +++ b/web/static/ldt/css/style.css Wed Oct 20 11:19:38 2010 +0200 @@ -1,3 +1,243 @@ +@charset "UTF-8"; + +body { + + font-family: Arial, Helvetica, sans serif; + font-size: 12px; + color: #4F5155; + margin: 5px; + padding: 0px; + min-width:750px; + text-align: justify; +} + +a img,a:link img, a:active img, a:visited img, a:hover img { + border:0px; +} + + +a:link +{ + text-decoration: none; + color: #2181b1; + text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + /*font-weight: bold;*/ +} + +a:hover +{ + color: #2181b1; + text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + /*border-bottom-width: 1px; + border-bottom-style: dashed; + border-bottom-color: #2c8084; + /*font-weight: bold;*/ +} +a:visited { + color: #2181b1; + font-family: Arial, Helvetica, sans-serif; + /*font-weight: bold;*/ +} + + +#header +{ + padding: .5em; + border-bottom: 1px solid gray; + border-left: 1px solid gray; + padding: 1em; +} + +#header a +{ + text-decoration: none; +} + + +#header_left +{ + max-width: 8em; + font-size: 40px; + font-weight : bold; + text-align: left; + text-transform: uppercase; +} + +#header_left a:link +{ + text-decoration: none; +} + +#header_left a:hover +{ + color: #4F5155; + text-decoration: none; +} +#header_left a:visited { + color: #4F5155; + text-decoration: none; +} + + +#header_right +{ + text-align: right; +} + +#header_right a:link +{ + text-decoration: none; + text-decoration: none; + color: white; +} + +#header_right a:hover +{ + text-decoration: none; + color: white; +} + +#header_right a:visited { + text-decoration: none; + color: white; +} + + +#footer +{ + clear: both; + margin: 0; + padding: .5em; + /*background-color: #ddd;*/ + border-top: 1px solid gray; +} + +.version +{ + text-align: right; + color: white; + font-size:9px; +} + +.version a:link +{ + text-decoration: none; + color: white; + text-decoration: bold; + font-weight: bold; + border-bottom-style: none; +} + +.version a:hover +{ + color: #2c8084; + text-decoration: none; + font-weight: bold; + border-bottom-width: 0px; + border-bottom-style: none; +} + +.version a:active +{ + color: white; + text-decoration: none; + font-weight: bold; + border-bottom-style: none; +} + +.version a:visited +{ + color: white; + font-weight: bold; + border-bottom-style: none; +} + +.small +{ + font-size:9px; +} + +.footer_img +{ + float: left; +} + +.footer_img img +{ + padding-left: 10px; + padding-right: 10px; +} + +.footer_img a +{ + color: white; +} + +.footer_img a:link +{ + color: white; +} + +.footer_img a:hover +{ + color: white; +} + +.footer_img a:visited +{ + color: white; +} + + +#home_links +{ + line-height: 150% +} + +#search_form_div { + text-align: center; + padding: 10px; + margin: 10px 10px; + margin-bottom: 30px; + background-color:#ececec; + border: 1px solid #7E7E7E +} + +#search_form ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +#search_form ul li { + display: inline; +} + +#toolbar { + margin-top: 10px; + border-bottom: 3px solid #707070; +} + +#inner_content { + padding: 40px 0px 50px 0px; +} + +#loginstate { + text-align: right; +} + +.projectscontentstitle { + color: #949494; + font-family: Verdana; + font-weight: lighter; + font-size: 2.0em; + font-style: normal; + text-align: left; +} + + #loginstate a, #loginstate a:hover, #loginstate a:visited, #loginstate a:link, #loginstate a:active { color:#0063DC; margin-right:4px; diff -r 0fb4b009c6eb -r c5514a2bfdcd web/static/ldt/css/style_bis.css --- a/web/static/ldt/css/style_bis.css Tue Oct 19 15:21:07 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,238 +0,0 @@ -@charset "UTF-8"; - -body { - - font-family: Arial, Helvetica, sans serif; - font-size: 12px; - color: #4F5155; - margin: 5px; - padding: 0px; - min-width:750px; - text-align: justify; -} - -a img,a:link img, a:active img, a:visited img, a:hover img { - border:0px; -} - - -a:link -{ - text-decoration: none; - color: #2181b1; - text-decoration: none; - font-family: Arial, Helvetica, sans-serif; - /*font-weight: bold;*/ -} - -a:hover -{ - color: #2181b1; - text-decoration: none; - font-family: Arial, Helvetica, sans-serif; - /*border-bottom-width: 1px; - border-bottom-style: dashed; - border-bottom-color: #2c8084; - /*font-weight: bold;*/ -} -a:visited { - color: #2181b1; - font-family: Arial, Helvetica, sans-serif; - /*font-weight: bold;*/ -} - - -#header -{ - padding: .5em; - border-bottom: 1px solid gray; - border-left: 1px solid gray; - padding: 1em; -} - -#header a -{ - text-decoration: none; -} - - -#header_left -{ - max-width: 8em; - font-size: 40px; - font-weight : bold; - text-align: left; - text-transform: uppercase; -} - -#header_left a:link -{ - text-decoration: none; -} - -#header_left a:hover -{ - color: #4F5155; - text-decoration: none; -} -#header_left a:visited { - color: #4F5155; - text-decoration: none; -} - - -#header_right -{ - text-align: right; -} - -#header_right a:link -{ - text-decoration: none; - text-decoration: none; - color: white; -} - -#header_right a:hover -{ - text-decoration: none; - color: white; -} - -#header_right a:visited { - text-decoration: none; - color: white; -} - - -#footer -{ - clear: both; - margin: 0; - padding: .5em; - /*background-color: #ddd;*/ - border-top: 1px solid gray; -} - -.version -{ - text-align: right; - color: white; - font-size:9px; -} - -.version a:link -{ - text-decoration: none; - color: white; - text-decoration: bold; - font-weight: bold; - border-bottom-style: none; -} - -.version a:hover -{ - color: #2c8084; - text-decoration: none; - font-weight: bold; - border-bottom-width: 0px; - border-bottom-style: none; -} - -.version a:active -{ - color: white; - text-decoration: none; - font-weight: bold; - border-bottom-style: none; -} - -.version a:visited -{ - color: white; - font-weight: bold; - border-bottom-style: none; -} - -.small -{ - font-size:9px; -} - -.footer_img -{ - float: left; -} - -.footer_img img -{ - padding-left: 10px; - padding-right: 10px; -} - -.footer_img a -{ - color: white; -} - -.footer_img a:link -{ - color: white; -} - -.footer_img a:hover -{ - color: white; -} - -.footer_img a:visited -{ - color: white; -} - - -#home_links -{ - line-height: 150% -} - -#search_form_div { - text-align: center; - padding: 10px; - margin: 10px 10px; - margin-bottom: 30px; - background-color:#ececec; - border: 1px solid #7E7E7E -} - -#search_form ul { - list-style-type: none; - margin: 0; - padding: 0; -} - -#search_form ul li { - display: inline; -} - -#toolbar { - margin-top: 10px; - border-bottom: 3px solid #707070; -} - -#inner_content { - padding: 40px 0px 50px 0px; -} - -#loginstate { - text-align: right; -} - -.projectscontentstitle { - color: #949494; - font-family: Verdana; - font-weight: lighter; - font-size: 2.0em; - font-style: normal; - text-align: left; -}