--- a/src/egonomy/templates/egonomy_annotate_picture.html	Wed Feb 20 16:35:29 2013 +0100
+++ b/src/egonomy/templates/egonomy_annotate_picture.html	Wed Feb 20 16:56:45 2013 +0100
@@ -9,7 +9,7 @@
 {% block content %}
                 <div class="fullwidth">
                     <div class="column column-half">
-                        <h2>{% if img.metadata.titre %}{{ img.metadata.titre }}{% else %}({% trans "No title" %}){% endif %}</h2>
+                        <h2>{{ img.metadata.titre|default:_("No title") }}</h2>
                         <div class="fullphoto center-image">
                           {% with img.info.image_file as image %}
                           {% if image|ratio > 0.8 %}
@@ -33,27 +33,27 @@
                         <table class="image-metadata">
                             <tr>
                                 <th>{% trans "Description" %}&nbsp;:</th>
-                                <td>{% if img.metadata.description %}{{ img.metadata.description }}{% endif %}</td>
+                                <td>{{ img.metadata.description|default:"" }}</td>
                             </tr>
                             <tr>
                                 <th>{% trans "Author" %}&nbsp;:</th>
-                                <td>{% if img.metadata.auteur %}{{ img.metadata.auteur }}{% endif %}</td>
+                                <td>{{ img.metadata.auteur|default:"" }}</td>
                             </tr>
                             <tr>
                                 <th>{% trans "Period" %}&nbsp;:</th>
-                                <td>{% if img.metadata.periode %}{{ img.metadata.periode }}{% endif %}</td>
+                                <td>{{ img.metadata.periode|default:"" }}</td>
                             </tr>
                             <tr>
                                 <th>{% trans "Production site" %}&nbsp;:</th>
-                                <td>{% if img.metadata.site %}{{ img.metadata.site }}{% endif %}</td>
+                                <td>{{ img.metadata.site|default:"" }}</td>
                             </tr>
                             <tr>
                                 <th>{% trans "Localization" %}&nbsp;:</th>
-                                <td>{% if img.metadata.lieu %}{{ img.metadata.lieu }}{% endif %}</td>
+                                <td>{{ img.metadata.lieu|default:"" }}</td>
                             </tr>
                             <tr>
                                 <th>{% trans "RMN keywords" %}&nbsp;:</th>
-                                <td>{% if img.metadata.mots_cles %}{{ img.metadata.mots_cles }}{% endif %}</td>
+                                <td>{{ img.metadata.mots_cles|default:"" }}</td>
                             </tr>
                             <!--tr>
                                 <th> </th>

--- a/src/egonomy/templates/egonomy_create_fragment.html	Wed Feb 20 16:35:29 2013 +0100
+++ b/src/egonomy/templates/egonomy_create_fragment.html	Wed Feb 20 16:56:45 2013 +0100
@@ -63,7 +63,7 @@
                             <table class="image-metadata">
                                 <tr>
                                     <th>{% trans 'Source picture' %}&nbsp;:</th>
-                                    <td><a href="{% url 'annotate_picture' image_id=img.id %}">{{ img.metadata.titre }}</a></td>
+                                    <td><a href="{% url 'annotate_picture' image_id=img.id %}">{{ img.metadata.titre|default:_("No title") }}</a></td>
                                 </tr>
                                 <tr>
                                     <th>{% trans "Fragment's title" %}&nbsp;:</th>

--- a/src/egonomy/templates/egonomy_home.html	Wed Feb 20 16:35:29 2013 +0100
+++ b/src/egonomy/templates/egonomy_home.html	Wed Feb 20 16:56:45 2013 +0100
@@ -36,8 +36,8 @@
 	                             {% endif %}
 	                             {% endwith %}
                                 </div>
-                                <h3>{% if img.metadata.titre %}{{ img.metadata.titre }}{% else %}({% trans "No title" %}){% endif %}</h3></a>
-                                <p>{% trans "Author" %}&nbsp;: <strong>{% if img.metadata.auteur %}{{ img.metadata.auteur }}{% else %}({% trans "Not documented" %}){% endif %}</strong></p>
+                                <h3>{{ img.metadata.titre|default:_("No title") }}</h3></a>
+                                <p>{% trans "Author" %}&nbsp;: <strong>{{ img.metadata.auteur|default:_("Not documented") }}</strong></p>
                             </li>
                           {% endfor %}
                         </ul>
@@ -77,7 +77,7 @@
                                     </div>
                                 </div>
                                 <h3>{{ frg.title }}</h3></a>
-                                <h4>{% trans "Fragment from" %} <a href="{% url 'annotate_picture' image_id=frg.image.id %}">{% if frg.image.metadata.titre %}{{ frg.image.metadata.titre }}{% else %}({% trans "No title" %}){% endif %}</a></h4>
+                                <h4>{% trans "Fragment from" %} <a href="{% url 'annotate_picture' image_id=frg.image.id %}">{{ frg.image.metadata.titre|default:_("No title") }}</a></h4>
                                 <p>{% trans "Annotated by" %} <strong>{{ frg.author }}</strong></p>
                             </li>
                           {% endfor %}

--- a/src/egonomy/templates/egonomy_view_fragment.html	Wed Feb 20 16:35:29 2013 +0100
+++ b/src/egonomy/templates/egonomy_view_fragment.html	Wed Feb 20 16:56:45 2013 +0100
@@ -38,7 +38,7 @@
                             <table class="image-metadata">
                                 <tr>
                                     <th>{% trans "Source picture" %}&nbsp;:</th>
-                                    <td><a href="{% url 'annotate_picture' image_id=fragment.image.id %}">{{ fragment.image.metadata.titre }}</a></td>
+                                    <td><a href="{% url 'annotate_picture' image_id=fragment.image.id %}">{{ fragment.image.metadata.titre|default:_("No title") }}</a></td>
                                 </tr>
                                 <tr>
                                     <th>{% trans "Fragment's description" %}&nbsp;:</th>