--- a/src/iconolab/templates/iconolab/detail_annotation.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_annotation.html Mon Sep 19 16:13:53 2016 +0200
@@ -33,10 +33,10 @@
</div>
<div v-show="!showZoom" id="detail-annotation" class='col-md-6' style="">
<h4>Annotation créée par <a href="{% url 'user_home' annotation.author.id %}">{{ annotation.author.username }}</a></h4>
- <p><strong>Titre:</strong> {{ annotation.current_revision.title }}</p>
- <p><strong>Description:</strong> {{ annotation.current_revision.description }}</p>
+ <p><strong>Titre :</strong> {{ annotation.current_revision.title }}</p>
+ <p><strong>Description :</strong> {{ annotation.current_revision.description }}</p>
{% if tags_data != "[]" %}
- <p><strong>Tags:</strong></p>
+ <p><strong>Mot-clés :</strong></p>
<typeahead :read-only="1" :tags="{{ tags_data }}"></typeahead>
<br>
{% endif %}
@@ -125,7 +125,7 @@
{% endfor %}
</ul>
<ul class="pagination pull-right" style="margin-left: 15px;">
- <li class="active pagination-label"><a>Commentaires par page: </a></li>
+ <li class="active pagination-label"><a>Commentaires par page : </a></li>
<li class="{% if comments.paginator.per_page == 5 %}active{% endif %}">
<a {% if comments.paginator.per_page != 5 %}href="{% url 'annotation_detail' collection_name image_guid annotation_guid %}?page=1&perpage=5"{% endif %}>5</a>
</li>
@@ -187,7 +187,7 @@
<input type="hidden" name="next" value="{% url 'annotation_detail' collection_name image_guid annotation_guid %}">
<h4> Commenter ({{user.username}}) </h4>
<div class="reply-to-container">
- <label id="form-reply-to-label" class="control-label reply-to-label" for="id_{{ comment_form.comment.name }}">En réponse à: </label>
+ <label id="form-reply-to-label" class="control-label reply-to-label" for="id_{{ comment_form.comment.name }}">En réponse à : </label>
<div class="alert alert-info reply-to-alert">
<p class="reply-to-content comment-content"></p>
<hr class="comment-separator">
@@ -200,7 +200,7 @@
{% if comment_form.comment.errors %}
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
- <span class="sr-only">Error:</span>
+ <span class="sr-only">Erreur :</span>
{{ comment_form.comment.errors | striptags }}
</div>
{% endif %}
--- a/src/iconolab/templates/iconolab/detail_item.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_item.html Mon Sep 19 16:13:53 2016 +0200
@@ -21,16 +21,16 @@
{% endfor %}
</div>
<div class="col-md-6">
- {% if item.metadatas.designation %}<h3>Désignation: <small>{{item.metadatas.designation}}</small></h3>{% endif %}
- {% if item.metadatas.authors %}<h4>Auteur(s): <small>{{item.metadatas.designation}}</small></h4>{% endif %}
- {% if item.metadatas.conservation_location %}<h4>Conservé à: <small>{{item.metadatas.conservation_location}}</small></h4>{% endif %}
- {% if item.metadatas.datation %}<h4>Datation: <small>{{item.metadatas.datation}}</small></h4>{% endif %}
- {% if item.metadatas.technics %}<h5>Techniques: <small>{{item.metadatas.technics}}</small></h5>{% endif %}
- {% if item.metadatas.measurements %}<h5>Mesures: {{item.metadatas.measurements}}</h5>{% endif %}
- {% if item.metadatas.create_or_usage_location %}<h5>Lieu de création/utilisation: <small>{{item.metadatas.create_or_usage_location}}</small></h5>{% endif %}
- {% if item.metadatas.discovery_context %}<h5>Contexte de découverte: <small>{{item.metadatas.discovery_context}}</small></h5>{% endif %}
- {% if item.metadatas.photo_credits %}<h5>Crédits photographique: <small>{{item.metadatas.photo_credits}}</small></h5>{% endif %}
- {% if item.metadatas.inventory_number %}<h5>Numéro d'inventaire: <small>{{item.metadatas.inventory_number}}</small></h5>{% endif %}
+ {% if item.metadatas.designation %}<h3>Désignation : <small>{{item.metadatas.designation}}</small></h3>{% endif %}
+ {% if item.metadatas.authors %}<h4>Auteur(s) : <small>{{item.metadatas.designation}}</small></h4>{% endif %}
+ {% if item.metadatas.conservation_location %}<h4>Conservé à : <small>{{item.metadatas.conservation_location}}</small></h4>{% endif %}
+ {% if item.metadatas.datation %}<h4>Datation : <small>{{item.metadatas.datation}}</small></h4>{% endif %}
+ {% if item.metadatas.technics %}<h5>Techniques : <small>{{item.metadatas.technics}}</small></h5>{% endif %}
+ {% if item.metadatas.measurements %}<h5>Mesures : {{item.metadatas.measurements}}</h5>{% endif %}
+ {% if item.metadatas.create_or_usage_location %}<h5>Lieu de création/utilisation : <small>{{item.metadatas.create_or_usage_location}}</small></h5>{% endif %}
+ {% if item.metadatas.discovery_context %}<h5>Contexte de découverte : <small>{{item.metadatas.discovery_context}}</small></h5>{% endif %}
+ {% if item.metadatas.photo_credits %}<h5>Crédits photographique : <small>{{item.metadatas.photo_credits}}</small></h5>{% endif %}
+ {% if item.metadatas.inventory_number %}<h5>Numéro d'inventaire : <small>{{item.metadatas.inventory_number}}</small></h5>{% endif %}
{% if item.metadatas.joconde_ref %}<h5><a href="{{item.metadatas.get_joconde_url}}">Cet objet dans Joconde</a></h5>{% endif %}
<br>
{% if item.images.all.count > 1 %}
@@ -44,7 +44,7 @@
{% endif %}
{% for image in item.images.all %}
<div class="item-stats-container" id="stats-{{image.image_guid}}">
- {% include "partials/image_stats_panel.html" with image=image label="Statistiques sur cette image:" %}
+ {% include "partials/image_stats_panel.html" with image=image label="Statistiques sur cette image :" %}
</div>
{% endfor %}
--- a/src/iconolab/templates/iconolab/detail_revision.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_revision.html Mon Sep 19 16:13:53 2016 +0200
@@ -30,9 +30,9 @@
</div>
<div id="revision-detail" class='col-xs-6' style="">
<h4>Annotation révisée par {{ revision.author.username}} </h4>
- <p> <strong>Title:</strong> {{ revision.title }}</p>
+ <p> <strong>Titre :</strong> {{ revision.title }}</p>
<p> <strong>Description:</strong> {{ revision.description }}</p>
- <p><strong>Tags:</strong></p>
+ <p><strong>Mots-clés :</strong></p>
<typeahead :read-only="1" :tags="{{ tags_data }}"></typeahead>
<br>
<div class="alert alert-info" role="alert">
--- a/src/iconolab/templates/iconolab/merge_revision.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/merge_revision.html Mon Sep 19 16:13:53 2016 +0200
@@ -21,7 +21,7 @@
<form class="form">
<fieldset class="form-group">
- <label class="control-label">Titre:</label>
+ <label class="control-label">Titre :</label>
<a @click="showDiffviewer('cur_title_diff','merge-current-revision-title', 'title')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
<a @click="pickProposition($event, 'merge-current-revision-title', 'title')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
@@ -32,7 +32,7 @@
</fieldset>
<fieldset class="form-group">
- <label class="control-label">Description: </label>
+ <label class="control-label">Description : </label>
<a @click="showDiffviewer('cur_desc_diff','merge-current-revision-description', 'desc')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
<a @click="pickProposition($event, 'merge-current-revision-description', 'desc')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
@@ -42,7 +42,7 @@
</fieldset>
<fieldset class="form-group">
- <label class="control-label">Tags: </label>
+ <label class="control-label">Mots-clés : </label>
<a @click="showDiffviewer('cur_tag_diff','current-tags','tag')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
<a @click="pickTag($event, 'current-tags')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-right" aria-hidden="true"></i></a>
@@ -106,7 +106,7 @@
id="id_{{ merge_form.title.name }}" value="{% if merge_form.title.value %}{{ merge_form.title.value}}{% endif %}">
</fieldset>
<fieldset class="form-group {% if merge_form.description.errors %}has-error{% endif %}">
- <label class="control-label" for="id_{{ merge_form.description.name }}">Description: </label>
+ <label class="control-label" for="id_{{ merge_form.description.name }}">Description : </label>
{% if merge_form.description.errors %}
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
@@ -175,7 +175,7 @@
</div>
<form class="form">
<fieldset class="form-group">
- <label class="control-label">Titre:</label>
+ <label class="control-label">Titre :</label>
<a @click="pickProposition($event, 'merge-parent-revision-title', 'title')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-left" aria-hidden="true"></i></a>
<a @click="showDiffviewer('parent_title_diff','merge-parent-revision-title', 'title')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
@@ -187,7 +187,7 @@
<diffviewer ref="parent_title_diff"></diffviewer>
</fieldset>
<fieldset class="form-group">
- <label class="control-label">Description: </label>
+ <label class="control-label">Description : </label>
<a @click="pickProposition($event, 'merge-parent-revision-description', 'desc')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-left" aria-hidden="true"></i></a>
<a @click="showDiffviewer('parent_desc_diff','merge-parent-revision-description', 'desc')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
@@ -196,7 +196,7 @@
<diffviewer ref="parent_desc_diff"></diffviewer>
</fieldset>
<fieldset class="form-group">
- <label class="control-label">Tags: </label>
+ <label class="control-label">Mots-clés : </label>
<a @click="pickTag($event, 'parent-tags')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-left" aria-hidden="true"></i></a>
<a @click="showDiffviewer('parent_tag_diff','parent-tags','tag')" class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
--- a/src/iconolab/templates/iconolab/user_home.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/user_home.html Mon Sep 19 16:13:53 2016 +0200
@@ -12,7 +12,7 @@
<div class="row" style="border: 1px solid gray;">
<div class="col-md-12 user-profile-block" >
- <h3>{% if profile_user == request.user %}Mon espace:{% else %}Profil: {% endif %} {{profile_user.username}}</h3>
+ <h3>{% if profile_user == request.user %}Mon espace:{% else %}Profil : {% endif %} {{profile_user.username}}</h3>
<div class="panel panel-default" style="padding-left: 10px; padding-right: 10px;">
{% if profile_user == request.user %}
{% notifications_unread as unread_count %}
@@ -52,7 +52,7 @@
{% endif %}
<div class="row">
<div class="col-md-6">
- <h4>{% if profile_user == request.user %}Mes annotations:{% else %}Annotations de {{profile_user.username}}{% endif %} </h4>
+ <h4>{% if profile_user == request.user %}Mes annotations :{% else %}Annotations de {{profile_user.username}}{% endif %} </h4>
{% if not user_annotations %}
<h4 class="no-user-annotation"><small>Aucune annotation à afficher</small></h4>
@@ -65,13 +65,13 @@
{% endif %}
</div>
<div class="col-md-6">
- <h4>{% if profile_user == request.user %}Mes autres contributions:{% else %}Contributions de {{profile_user.username}}{% endif %} </h4>
+ <h4>{% if profile_user == request.user %}Mes autres contributions :{% else %}Contributions de {{profile_user.username}}{% endif %} </h4>
<dl>
<dt class="dt-annotation">
{% if profile_user == request.user %}
- Annotations sur lesquelles j'ai proposé des révisions
+ Annotations sur lesquelles j'ai proposé des révisions :
{% else %}
- Annotations sur lesquelles {{profile_user.username}} a proposé des révisions:
+ Annotations sur lesquelles {{profile_user.username}} a proposé des révisions :
{% endif %}
</dt>
<dd>
@@ -87,9 +87,9 @@
</dd>
<dt class="dt-annotation">
{% if profile_user == request.user %}
- Annotations sur lesquelles j'ai commenté (sans proposer de révision):
+ Annotations sur lesquelles j'ai commenté (sans proposer de révision) :
{% else %}
- Annotations sur lesquelles {{profile_user.username}} a commenté (sans proposer de révision):
+ Annotations sur lesquelles {{profile_user.username}} a commenté (sans proposer de révision) :
{% endif %}
</dt>
<dd>
--- a/src/iconolab/templates/iconolab/user_notifications.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/iconolab/user_notifications.html Mon Sep 19 16:13:53 2016 +0200
@@ -12,7 +12,7 @@
<div id="user-profile-block" class="row" style="border: 1px solid gray; padding-top:15px;">
<div class="col-md-12">
<div class="panel panel-default" style="padding-bottom: 10px; padding-left:10px; padding-right: 10px;">
- <h3>Mes notifications: </h3>
+ <h3>Mes notifications : </h3>
{% if notifications %}
<ul class="list-group">
{% for notification in notifications %}
--- a/src/iconolab/templates/partials/annotation_stats_panel.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/partials/annotation_stats_panel.html Mon Sep 19 16:13:53 2016 +0200
@@ -2,15 +2,15 @@
<div class="panel-body">
{% if label %}<label>{{label}}</label>{% endif %}
<dl class="dl-horizontal">
- <dt>Vues:</dt>
+ <dt>Vues :</dt>
<dd><span class="badge">{{ annotation.stats.views_count }}</span></dd>
- <dt>Commentaires:</dt>
+ <dt>Commentaires :</dt>
<dd><span class="badge">{{ annotation.stats.comments_count }}</span></dd>
- <dt>Révisions soumises:</dt>
+ <dt>Révisions soumises :</dt>
<dd><span class="badge">{{ annotation.stats.submitted_revisions_count }}</span></dd>
- <dt>Révisions acceptées:</dt>
+ <dt>Révisions acceptées :</dt>
<dd><span class="badge">{{ annotation.stats.accepted_revisions_count }}</span></dd>
- <dt>Nombre de tags:</dt>
+ <dt>Nombre de mots-clés :</dt>
<dd><span class="badge">{{ annotation.stats.tag_count }}</span></dd>
</dl>
</div>
--- a/src/iconolab/templates/partials/header.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/partials/header.html Mon Sep 19 16:13:53 2016 +0200
@@ -22,7 +22,7 @@
{% if request.user.is_authenticated %}
{% notifications_unread as unread_count %}
<li><a href="{% url 'user_home' request.user.id %}">
- {{request.user.username}}: Mon espace <span class="badge {% if unread_count %}badge-warning{% endif %}">
+ {{request.user.username}} : Mon espace <span class="badge {% if unread_count %}badge-warning{% endif %}">
{{ unread_count }} <i class="fa fa-envelope-o" aria-hidden="true"></i> </span>
</a></li>
<li><a href="{% url 'account:logout' %}">Se déconnecter</a></li>
--- a/src/iconolab/templates/partials/image_stats_panel.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/partials/image_stats_panel.html Mon Sep 19 16:13:53 2016 +0200
@@ -2,15 +2,15 @@
<div class="panel-body">
{% if label %}<label>{{label}}</label>{% endif %}
<dl class="dl-horizontal">
- <dt class="img-stats-dt">Vues:</dt>
+ <dt class="img-stats-dt">Vues :</dt>
<dd class="img-stats-dd"><span class="badge">{{ image.stats.views_count }}</span></dd>
- <dt class="img-stats-dt">Nombre d'annotations:</dt>
+ <dt class="img-stats-dt">Nombre d'annotations :</dt>
<dd class="img-stats-dd"><span class="badge">{{ image.stats.annotations_count }}</span></dd>
- <dt class="img-stats-dt">Commentaires (total):</dt>
+ <dt class="img-stats-dt">Commentaires (total) :</dt>
<dd class="img-stats-dd"><span class="badge">{{ image.stats.comments_count }}</span></dd>
- <dt class="img-stats-dt">Révisions soumises (total):</dt>
+ <dt class="img-stats-dt">Révisions soumises (total) :</dt>
<dd class="img-stats-dd"><span class="badge">{{ image.stats.submitted_revisions_count }}</span></dd>
- <dt class="img-stats-dt">Nombre de tags (total):</dt>
+ <dt class="img-stats-dt">Nombre de tags (total) :</dt>
<dd class="img-stats-dd"><span class="badge">{{ image.stats.tag_count }}</span></dd>
</dl>
</div>
--- a/src/iconolab/templates/partials/user_page_annotation_panel.html Mon Sep 19 16:05:13 2016 +0200
+++ b/src/iconolab/templates/partials/user_page_annotation_panel.html Mon Sep 19 16:13:53 2016 +0200
@@ -18,11 +18,11 @@
</div>
<div class="annotation-detail">
<dl class="dl-horizontal">
- <dt>Commentaires: </dt>
+ <dt>Commentaires : </dt>
<dd><span class="badge">{{annotation.stats.comments_count}}</span></dd>
- <dt>Révisions en attente:</dt>
+ <dt>Révisions en attente :</dt>
<dd><span class="badge {% if annotation.stats.awaiting_revisions_count > 0 %}badge-warning{% endif %}">{{annotation.stats.awaiting_revisions_count}}</span></dd>
- <dt>Révisions acceptée:</dt>
+ <dt>Révisions acceptée :</dt>
<dd><span class="badge">{{annotation.stats.accepted_revisions_count}}</span></dd>
</dl>
</div>