diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index b101b6f286..e976b9728c 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -434,7 +434,7 @@
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
                         <div>
-                            <p>{% trans 'export::mail: fichiers joint' %}</p>
+                            <p>{{  'export::mail: fichiers joint' | trans }}</p>
                             {% for name, values in download.get_display_ftp() %}
                                 {% if values.available > 0 %}
                                     <div class="well-small">
diff --git a/templates/web/email-template.html.twig b/templates/web/email-template.html.twig
index c5b06292d9..6b991d7281 100644
--- a/templates/web/email-template.html.twig
+++ b/templates/web/email-template.html.twig
@@ -106,7 +106,7 @@
                                     {% if expiration is not none %}
                                     <tr>
                                         <td height="60" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:16px; color:#999999;">
-                                            {% trans 'Ce lien est valable jusqu\'au' %} {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }}
+                                            {{ 'Ce lien est valable jusqu\'au' | trans  }} {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }}
                                         </td>
                                     </tr>
                                     {% endif %}
diff --git a/templates/web/setup/step2.html.twig b/templates/web/setup/step2.html.twig
index ad0726739a..8b913be6e7 100644
--- a/templates/web/setup/step2.html.twig
+++ b/templates/web/setup/step2.html.twig
@@ -245,7 +245,7 @@
                         return;
                     }
                     if (false === data.innodb) {
-                        el_message.empty().append("{% trans 'Database server does not support InnoDB storage engine' %}");
+                        el_message.empty().append("{{ 'Database server does not support InnoDB storage engine' | trans }}");
 
                         return;
                     }
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index 60571167b8..e3e3505c46 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -73,7 +73,7 @@
 
                 $("#SEARCH_DLG").dialog({
                     modal: true,
-                    title: "{% trans 'Chercher' %}",
+                    title: "{{ 'Chercher' | trans }}",
                     autoOpen:false
                 });
                 $("#NEWSY_DLG").dialog({
@@ -206,14 +206,14 @@
 
                 <div class="onglet" style="background-color:#f0f0f0; border-bottom:1px solid #f4f4f4">
                     <span id="baseName">{{ 'phraseanet:: thesaurus' | trans }}</span>
-                    <a href="javascript:void();" onclick="fixTh();return(false);" style="visibility:hidden;">X</a>
+                    <a href="#" onclick="fixTh();return(false);" style="visibility:hidden;">X</a>
                 </div>
 
 
                 <div id="TabT0" style="position:absolute; top:28px; left:0px; bottom:0px; width:40%;">
 
                     <div class="thbox" style="position:absolute; top:0px; bottom:8px; left:6px; right:3px;">
-                        <div class="onglet">{{ 'thesaurus:: onglet stock' | trans }} <a href="javascript:void();" onclick="test('T0');return(false);" style="visibility:hidden;">X</a>
+                        <div class="onglet">{{ 'thesaurus:: onglet stock' | trans }} <a href="#" onclick="test('T0');return(false);" style="visibility:hidden;">X</a>
                         </div>
                         <div style="width:100%; overflow:hidden">
                             <input type="checkbox" name="ckShowRejected" onClick="return(chgCkShowRejected());" /><span style="white-space:nowrap; overflow:hidden">{{ 'thesaurus:: afficher les termes refuses' | trans }}</span>
@@ -243,16 +243,16 @@
                     <form>
                         <table>
                             <tr>
-                                <td>{% trans 'thesaurus:: le terme' %}</td>
-                                <td><input type="radio" name="m" value="equal">{% trans 'thesaurus:: est egal a ' %}</td>
+                                <td>{{ 'thesaurus:: le terme' | trans }}</td>
+                                <td><input type="radio" name="m" value="equal">{{ 'thesaurus:: est egal a ' | trans }}</td>
                             </tr>
                             <tr>
                                 <td />
-                                <td><input type="radio" checked name="m" value="begins">{% trans 'thesaurus:: commence par' %}</td>
+                                <td><input type="radio" checked name="m" value="begins">{{ 'thesaurus:: commence par' | trans }}</td>
                             </tr>
                             <tr>
                                 <td />
-                                <td><input type="radio" name="m" value="contains">{% trans 'thesaurus:: contient' %}</td>
+                                <td><input type="radio" name="m" value="contains">{{ 'thesaurus:: contient' | trans }}</td>
                             </tr>
                         </table>
                         <br/>
@@ -270,12 +270,12 @@
                             <td><input type="text" style="width:250px;" name="term"></td>
                         </tr>
                         <tr>
-                            <td style="text-align:right">{% trans 'thesaurus:: contexte' %} : </td>
+                            <td style="text-align:right">{{ 'thesaurus:: contexte'  | trans }} : </td>
                             <td><b>(</b>&nbsp;</td>
                             <td><input type="text" style="width:250px;" name="context">&nbsp;<b>)</b></td>
                         </tr>
                         <tr>
-                            <td valign="bottom" style="text-align:right">{% trans 'phraseanet:: language' %} :&nbsp;</td>
+                            <td valign="bottom" style="text-align:right">{{ 'phraseanet:: language' %} :&nbsp;</td>
                             <td></td>
                             <td valign="bottom">
                                 {% for code, language in flags %}
@@ -620,13 +620,13 @@
                             $("#SEARCH_DLG").dialog("option", "buttons",
                                 [
                                     {
-                                        text:"{% trans 'boutton::annuler' %}",
+                                        text:"{{ 'boutton::annuler' %}",
                                         click: function() {
                                             $(this).dialog("close");
                                         }
                                     } ,
                                     {
-                                        text:"{% trans 'boutton::chercher' %}",
+                                        text:"{{ 'boutton::chercher' %}",
                                         click:function() {
                                             var zdialog = $(this);
                                             var nid = cbParm.id.substr(4).replace(".", "\\.", "g");
@@ -1012,19 +1012,19 @@
                                     case "kterm_newsy": // nouveau synonyme
                                         var typ = menuelem_id=="kterm_newts" ? "TS" : "SY";
                                         $("#NEWSY_DLG .label").html(
-                                                typ=="TS" ? "{% trans 'thesaurus:: terme' %}" : "{% trans 'thesaurus:: synonyme' %}"
+                                                typ=="TS" ? "{{ 'thesaurus:: terme'  | trans }}" : "{{ 'thesaurus:: synonyme'  | trans }}"
                                         );
-                                        $("#NEWSY_DLG").dialog("option", "title", typ=="TS" ? "{% trans 'thesaurus:: Nouveau terme' %}" : "{% trans 'thesaurus:: Nouveau synonyme' %}");
+                                        $("#NEWSY_DLG").dialog("option", "title", typ=="TS" ? "{{ 'thesaurus:: Nouveau terme'  | trans }}" : "{{ 'thesaurus:: Nouveau synonyme'  | trans }}");
                                         $("#NEWSY_DLG").dialog("option", "buttons",
                                                 [
                                                     {
-                                                        text:"{% trans 'boutton::annuler' %}",
+                                                        text:"{{ 'boutton::annuler'  | trans }}",
                                                         click: function() {
                                                             $(this).dialog("close");
                                                         }
                                                     } ,
                                                     {
-                                                        text:"{% trans 'boutton::valider' %}",
+                                                        text:"{{ 'boutton::valider'  | trans }}",
                                                         click:function() {
                                                             var zdialog = $(this);
                                                             var myObj = { "win":window };
@@ -1117,13 +1117,13 @@
                                         $("#SEARCH_DLG").dialog("option", "buttons",
                                             [
                                                 {
-                                                    text:"{% trans 'boutton::annuler' %}",
+                                                    text:"{{ 'boutton::annuler'  | trans }}",
                                                     click: function() {
                                                         $(this).dialog("close");
                                                     }
                                                 } ,
                                                 {
-                                                    text:"{% trans 'boutton::chercher' %}",
+                                                    text:"{{ 'boutton::chercher'  | trans }}",
                                                     click:function() {
                                                         var zdialog = $(this);
                                                         var nid = cbParm.id.substr(4).replace(".", "\\.", "g");