From e7421e1fddf081fbe83154b990b6a2b24a4e7c53 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 21 Nov 2013 14:17:12 +0100
Subject: [PATCH] Fix twig tags

---
 .../api/auth/end_user_authorization.html.twig |  14 +-
 .../auth/native_app_access_token.html.twig    |   4 +-
 .../mobile/lightbox/basket_element.html.twig  |   6 +-
 templates/mobile/lightbox/error.html.twig     |   6 +-
 templates/mobile/lightbox/feed.html.twig      |   2 +-
 templates/mobile/lightbox/index.html.twig     |  20 +-
 templates/mobile/lightbox/note_form.html.twig |   2 +-
 templates/mobile/lightbox/sc_note.html.twig   |   2 +-
 templates/mobile/lightbox/validate.html.twig  |  10 +-
 templates/web/account/access.html.twig        |  36 +--
 templates/web/account/account.html.twig       |  64 ++---
 .../web/account/authorized_apps.html.twig     |  22 +-
 templates/web/account/base.html.twig          |  10 +-
 .../web/account/change-password.html.twig     |   6 +-
 templates/web/account/reset-email.html.twig   |  18 +-
 templates/web/account/sessions.html.twig      |  12 +-
 .../web/admin/collection/collection.html.twig |  64 ++---
 .../web/admin/collection/create.html.twig     |  16 +-
 .../web/admin/collection/details.html.twig    |  14 +-
 .../web/admin/collection/reorder.html.twig    |  10 +-
 .../collection/suggested_value.html.twig      |  30 +-
 templates/web/admin/dashboard.html.twig       |  26 +-
 templates/web/admin/databases.html.twig       |  52 ++--
 templates/web/admin/databox/cgus.html.twig    |   6 +-
 templates/web/admin/databox/databox.html.twig |  72 ++---
 templates/web/admin/databox/details.html.twig |  12 +-
 templates/web/admin/editusers.html.twig       | 100 +++----
 .../web/admin/editusers_quotas.html.twig      |  10 +-
 .../web/admin/editusers_timelimit.html.twig   |   8 +-
 .../admin/editusers_timelimit_sbas.html.twig  |   8 +-
 .../web/admin/fields/templates.html.twig      |   4 +-
 templates/web/admin/index.html.twig           |  12 +-
 .../web/admin/publications/fiche.html.twig    |  36 +--
 .../web/admin/publications/list.html.twig     |  32 +--
 .../web/admin/publications/wrapper.html.twig  |   4 +-
 .../web/admin/search-engine/phrasea.html.twig |  10 +-
 .../search-engine/sphinx-search.html.twig     |  14 +-
 templates/web/admin/setup.html.twig           |   4 +-
 templates/web/admin/statusbit.html.twig       |  12 +-
 templates/web/admin/statusbit/edit.html.twig  |  26 +-
 templates/web/admin/structure.html.twig       |  12 +-
 templates/web/admin/subdefs.html.twig         |  44 +--
 .../web/admin/task-manager/list.html.twig     |  30 +-
 .../web/admin/task-manager/log.html.twig      |   4 +-
 .../task-editor/archive.html.twig             |  16 +-
 .../task-editor/ftp-pull.html.twig            |  20 +-
 .../task-manager/task-editor/ftp.html.twig    |   4 +-
 .../task-editor/phraseanet-indexer.html.twig  |  36 +--
 .../task-editor/record-mover.html.twig        |   2 +-
 .../task-editor/subdefs.html.twig             |   2 +-
 .../task-manager/task-editor/task.html.twig   |  12 +-
 .../task-editor/write-metadata.html.twig      |   2 +-
 templates/web/admin/tree.html.twig            |  34 +--
 templates/web/admin/user/demand.html.twig     |  58 ++--
 .../web/admin/user/import/file.html.twig      |  20 +-
 .../web/admin/user/import/view.html.twig      |   8 +-
 templates/web/admin/users.html.twig           |  76 +++---
 .../api/auth/end_user_authorization.html.twig |  14 +-
 .../auth/native_app_access_token.html.twig    |   4 +-
 templates/web/client/answers.html.twig        |   8 +-
 templates/web/client/baskets.html.twig        |  20 +-
 .../client/home_inter_pub_basket.html.twig    |   4 +-
 templates/web/client/index.html.twig          |  66 ++---
 templates/web/common/dialog_export.html.twig  | 154 +++++------
 templates/web/common/doctype_icons.html.twig  |  12 +-
 .../web/common/drop_down_options.html.twig    |   8 +-
 templates/web/common/macros.html.twig         |   2 +-
 templates/web/common/menubar.html.twig        |  38 +--
 .../web/common/technical_datas.html.twig      |  44 +--
 .../web/developers/application.html.twig      |  28 +-
 .../web/developers/application_form.html.twig |  24 +-
 .../web/developers/applications.html.twig     |  22 +-
 templates/web/email-template.html.twig        |   6 +-
 templates/web/geonames/city_list.html.twig    |   2 +-
 .../web/lightbox/IE6/agreement_box.html.twig  |   8 +-
 .../web/lightbox/IE6/basket_options.html.twig |   4 +-
 templates/web/lightbox/IE6/feed.html.twig     |   6 +-
 .../lightbox/IE6/feed_options_box.html.twig   |  14 +-
 templates/web/lightbox/IE6/index.html.twig    |  14 +-
 .../web/lightbox/IE6/sc_options_box.html.twig |  14 +-
 templates/web/lightbox/IE6/validate.html.twig |  12 +-
 .../web/lightbox/agreement_box.html.twig      |   8 +-
 .../web/lightbox/basket_options.html.twig     |   4 +-
 templates/web/lightbox/error.html.twig        |   4 +-
 templates/web/lightbox/feed.html.twig         |   6 +-
 .../web/lightbox/feed_options_box.html.twig   |  14 +-
 templates/web/lightbox/index.html.twig        |  14 +-
 templates/web/lightbox/sc_note.html.twig      |   6 +-
 .../web/lightbox/sc_options_box.html.twig     |  14 +-
 templates/web/lightbox/validate.html.twig     |  16 +-
 templates/web/login/cgus.html.twig            |   2 +-
 templates/web/login/forgot-password.html.twig |   8 +-
 .../include/guest-access-block.html.twig      |   2 +-
 .../login/include/language-block.html.twig    |   4 +-
 .../include/register-link-block.html.twig     |   4 +-
 templates/web/login/index.html.twig           |  12 +-
 .../web/login/layout/base-layout.html.twig    |   6 +-
 .../web/login/layout/sidebar-layout.html.twig |   2 +-
 .../login/oauth/authorize-access.html.twig    |   8 +-
 .../web/login/oauth/desktop-code.html.twig    |   6 +-
 templates/web/login/oauth/login.html.twig     |  10 +-
 templates/web/login/providers/bind.html.twig  |  10 +-
 .../web/login/providers/mapping.html.twig     |  14 +-
 .../web/login/register-classic.html.twig      |   8 +-
 .../web/login/register-provider.html.twig     |  12 +-
 templates/web/login/register.html.twig        |   8 +-
 templates/web/login/renew-password.html.twig  |   6 +-
 templates/web/prod/Baskets/Create.html.twig   |   6 +-
 templates/web/prod/Baskets/Reorder.html.twig  |  14 +-
 templates/web/prod/Baskets/Update.html.twig   |   6 +-
 templates/web/prod/Share/record.html.twig     |   6 +-
 templates/web/prod/Story/Create.html.twig     |   6 +-
 templates/web/prod/Story/Reorder.html.twig    |  14 +-
 templates/web/prod/Tooltip/Basket.html.twig   |   2 +-
 templates/web/prod/Tooltip/Caption.html.twig  |   4 +-
 .../web/prod/Tooltip/DCESFieldInfo.html.twig  |   4 +-
 .../web/prod/Tooltip/DataboxField.html.twig   |  22 +-
 .../DataboxFieldRestrictions.html.twig        |   6 +-
 templates/web/prod/Tooltip/Preview.html.twig  |   2 +-
 templates/web/prod/Tooltip/Story.html.twig    |   2 +-
 .../web/prod/Tooltip/TechnicalDatas.html.twig |   4 +-
 templates/web/prod/Tooltip/User.html.twig     |   2 +-
 templates/web/prod/User/Add.html.twig         |  16 +-
 templates/web/prod/WorkZone/Basket.html.twig  |  26 +-
 .../prod/WorkZone/Browser/Basket.html.twig    |   6 +-
 .../prod/WorkZone/Browser/Browser.html.twig   |  22 +-
 .../prod/WorkZone/Browser/Results.html.twig   |   8 +-
 templates/web/prod/WorkZone/Macros.html.twig  |  56 ++--
 templates/web/prod/WorkZone/Story.html.twig   |  28 +-
 .../Dailymotion/actioncontainers.html.twig    |   6 +-
 .../Dailymotion/actionelement.html.twig       |   2 +-
 .../Dailymotion/actionelements.html.twig      |   8 +-
 .../playlist_createcontainer.html.twig        |   8 +-
 .../playlist_deleteelement.html.twig          |   6 +-
 .../Bridge/Dailymotion/upload.html.twig       |  36 +--
 .../Dailymotion/video_deleteelement.html.twig |   6 +-
 .../Bridge/Dailymotion/video_modify.html.twig |  22 +-
 .../video_moveinto_playlist.html.twig         |   6 +-
 .../Bridge/Flickr/actioncontainers.html.twig  |   6 +-
 .../Bridge/Flickr/actionelement.html.twig     |   2 +-
 .../Bridge/Flickr/actionelements.html.twig    |   8 +-
 .../Flickr/photo_deleteelement.html.twig      |   6 +-
 .../Bridge/Flickr/photo_modify.html.twig      |  12 +-
 .../Flickr/photo_moveinto_photoset.html.twig  |   6 +-
 .../Flickr/photoset_createcontainer.html.twig |  12 +-
 .../Flickr/photoset_deleteelement.html.twig   |   6 +-
 .../actions/Bridge/Flickr/upload.html.twig    |  18 +-
 .../Bridge/Youtube/actioncontainers.html.twig |   6 +-
 .../Bridge/Youtube/actionelement.html.twig    |   2 +-
 .../Bridge/Youtube/actionelements.html.twig   |   8 +-
 .../playlist_createcontainer.html.twig        |  10 +-
 .../Youtube/playlist_deleteelement.html.twig  |   6 +-
 .../actions/Bridge/Youtube/upload.html.twig   |  36 +--
 .../Youtube/video_deleteelement.html.twig     |   6 +-
 .../Bridge/Youtube/video_modify.html.twig     |  22 +-
 .../Youtube/video_moveinto_playlist.html.twig |   6 +-
 .../prod/actions/Bridge/callback.html.twig    |   6 +-
 .../actions/Bridge/disconnected.html.twig     |   8 +-
 .../actions/Bridge/element_list.html.twig     |   8 +-
 .../web/prod/actions/Bridge/error.html.twig   |   6 +-
 .../web/prod/actions/Bridge/index.html.twig   |   8 +-
 .../actions/Bridge/notconfigured.html.twig    |   2 +-
 .../prod/actions/Bridge/paginator.html.twig   |   2 +-
 .../actions/Bridge/records_list.html.twig     |   6 +-
 .../web/prod/actions/Bridge/wrapper.html.twig |   6 +-
 .../prod/actions/Download/prepare.html.twig   |  16 +-
 .../actions/Feedback/List-Share.html.twig     |  26 +-
 .../actions/Feedback/ListsMacros.html.twig    |  18 +-
 .../web/prod/actions/Feedback/list.html.twig  |  50 ++--
 .../prod/actions/Feedback/lists-all.html.twig |   6 +-
 .../web/prod/actions/Property/index.html.twig |   8 +-
 .../web/prod/actions/Property/type.html.twig  |   6 +-
 templates/web/prod/actions/Push.html.twig     |  50 ++--
 .../web/prod/actions/Tools/confirm.html.twig  |   4 +-
 .../web/prod/actions/Tools/index.html.twig    |  78 +++---
 .../prod/actions/collection_default.html.twig |   8 +-
 .../actions/delete_records_confirm.html.twig  |  14 +-
 .../web/prod/actions/edit_default.html.twig   |  80 +++---
 .../prod/actions/printer_default.html.twig    |  20 +-
 .../prod/actions/publish/publish.html.twig    |  18 +-
 .../actions/publish/publish_edit.html.twig    |  14 +-
 .../web/prod/feeds/entry_macro.html.twig      |   4 +-
 templates/web/prod/feeds/feeds.html.twig      |  18 +-
 templates/web/prod/index.html.twig            | 258 +++++++++---------
 templates/web/prod/notifications.html.twig    |   4 +-
 templates/web/prod/orders/order_box.html.twig |  26 +-
 .../web/prod/orders/order_item.html.twig      |  28 +-
 .../web/prod/preview/appears_in.html.twig     |   4 +-
 .../web/prod/preview/basket_train.html.twig   |   4 +-
 templates/web/prod/preview/caption.html.twig  |   2 +-
 .../web/prod/preview/feed_train.html.twig     |   4 +-
 .../web/prod/preview/popularity.html.twig     |   4 +-
 .../web/prod/preview/reg_train.html.twig      |   4 +-
 .../web/prod/preview/result_train.html.twig   |   4 +-
 .../preview/result_train_options.html.twig    |   4 +-
 .../web/prod/preview/short_history.html.twig  |  10 +-
 templates/web/prod/preview/tools.html.twig    |   8 +-
 templates/web/prod/results/help.html.twig     |  60 ++--
 templates/web/prod/thesaurus.js               |  40 +--
 templates/web/prod/upload/lazaret.html.twig   |  30 +-
 .../web/prod/upload/upload-flash.html.twig    |  66 ++---
 templates/web/prod/upload/upload.html.twig    |  28 +-
 .../report/ajax_dashboard_content.html.twig   |   2 +-
 .../web/report/ajax_data_content.html.twig    |   6 +-
 .../report/ajax_report_dashboard.html.twig    |   6 +-
 templates/web/report/all_content.html.twig    |  22 +-
 templates/web/report/chart.html.twig          |   8 +-
 templates/web/report/colFilter.html.twig      |   6 +-
 .../web/report/dashboard_macro.html.twig      |   2 +-
 .../web/report/form_date_and_base.html.twig   |   8 +-
 templates/web/report/generate_tab.html.twig   |  18 +-
 templates/web/report/listColumn.html.twig     |   8 +-
 templates/web/report/report_layout.html.twig  |   8 +-
 .../web/report/report_layout_child.html.twig  |  70 ++---
 templates/web/setup/step2.html.twig           | 158 +++++------
 templates/web/thesaurus/accept.html.twig      |  28 +-
 .../thesaurus/export-text-dialog.html.twig    |  22 +-
 templates/web/thesaurus/export-text.html.twig |   2 +-
 .../thesaurus/export-topics-dialog.html.twig  |  34 +--
 .../web/thesaurus/export-topics.html.twig     |   4 +-
 .../web/thesaurus/import-dialog.html.twig     |  14 +-
 templates/web/thesaurus/index.html.twig       |  12 +-
 .../web/thesaurus/link-field-step1.html.twig  |   6 +-
 .../web/thesaurus/link-field-step2.html.twig  |  18 +-
 .../web/thesaurus/link-field-step3.html.twig  |   8 +-
 .../thesaurus/new-synonym-dialog.html.twig    |   8 +-
 templates/web/thesaurus/new-term.html.twig    |  16 +-
 templates/web/thesaurus/properties.html.twig  |  14 +-
 templates/web/thesaurus/search.html.twig      |  14 +-
 templates/web/thesaurus/thesaurus.html.twig   |  48 ++--
 230 files changed, 2060 insertions(+), 2060 deletions(-)

diff --git a/templates/mobile/api/auth/end_user_authorization.html.twig b/templates/mobile/api/auth/end_user_authorization.html.twig
index abb7ec1fe3..67ee696571 100644
--- a/templates/mobile/api/auth/end_user_authorization.html.twig
+++ b/templates/mobile/api/auth/end_user_authorization.html.twig
@@ -40,19 +40,19 @@
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             {% if errorMessage %}
-                                <p class="login_error">{% trans 'Erreur de login / mot de passe' %}</p>
+                                <p class="login_error">{{ 'Erreur de login / mot de passe' | trans }}</p>
                             {% endif %}
                             <p class="login_hello">
                                 {% trans %}
                                 Bonjour, veuillez vous identifier sur {{home_title}} :
                                 {% endtrans %}
                             </p>
-                            <input id="myLogin" name="login" class="span6" type="text" placeholder="{% trans 'admin::compte-utilisateur identifiant' %}" />
-                            <input id="myPass" name="password" class="span6" type="password" placeholder="{% trans 'admin::compte-utilisateur mot de passe' %}" />
-                            <input id="button_login" name="action_login" class="btn btn-inverse btn-large span6" type="submit" value="{% trans 'Se connecter' %}" />
+                            <input id="myLogin" name="login" class="span6" type="text" placeholder="{{ 'admin::compte-utilisateur identifiant' | trans }}" />
+                            <input id="myPass" name="password" class="span6" type="password" placeholder="{{ 'admin::compte-utilisateur mot de passe' | trans }}" />
+                            <input id="button_login" name="action_login" class="btn btn-inverse btn-large span6" type="submit" value="{{ 'Se connecter' | trans }}" />
                         </form>
                         <p>
-                            <a href="#">{% trans 'Probl&egrave;mes de connexion ?' %}</a>
+                            <a href="#">{{ 'Probl&egrave;mes de connexion ?' | trans }}</a>
                         </p>
                     </div>
                 {% else %}
@@ -87,14 +87,14 @@
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             <input type="hidden" name="action_accept" value="1">
-                            <input id="button_access" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Autoriser' %}" />
+                            <input id="button_access" class="btn btn-inverse btn-large span3" type="submit" value="{{ 'Autoriser' | trans }}" />
                         </form>
                         <form method="post" class="access-deny">
                             {% for key,value in auth.getParams %}
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             <input type="hidden" name="action_accept" value="0">
-                            <input id="button_deny" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Ne pas autoriser' %}" />
+                            <input id="button_deny" class="btn btn-inverse btn-large span3" type="submit" value="{{ 'Ne pas autoriser' | trans }}" />
                         </form>
                     </div>
                  {% endif %}
diff --git a/templates/mobile/api/auth/native_app_access_token.html.twig b/templates/mobile/api/auth/native_app_access_token.html.twig
index eb11163e4f..a9f4d1de7b 100644
--- a/templates/mobile/api/auth/native_app_access_token.html.twig
+++ b/templates/mobile/api/auth/native_app_access_token.html.twig
@@ -4,9 +4,9 @@
         <meta charset="utf-8" />
         <title>
         {% if error is defined %}
-            {% trans 'Fail' %}
+            {{ 'Fail' | trans }}
         {% else %}
-            {% trans 'Success' %}
+            {{ 'Success' | trans }}
         {% endif %}
             </title>
         <meta name="author" content="Alchemy" />
diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig
index f98d193a67..9736e9a1bb 100644
--- a/templates/mobile/lightbox/basket_element.html.twig
+++ b/templates/mobile/lightbox/basket_element.html.twig
@@ -39,14 +39,14 @@
       {% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
         <fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
           <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes"  />
-            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label>
+            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{{ 'validation:: OUI' | trans }}</label>
           <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == false and basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no"  />
-            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label>
+            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{{ 'validation:: NON' | trans }}</label>
         </fieldset>
       {% endif %}
       <div style="text-align:center;margin:0 0 1em 0">
         <a href="{{ path('lightbox_ajax_note_form', { 'sselcont_id' : basket_element.getId() }) }}" data-role="button" data-inline="true" data-rel="dialog" data-transition="slidedown">
-          {% trans 'validation:: editer ma note' %}
+          {{ 'validation:: editer ma note' | trans }}
         </a>
       </div>
       <div>
diff --git a/templates/mobile/lightbox/error.html.twig b/templates/mobile/lightbox/error.html.twig
index ada374a922..7df94e735a 100644
--- a/templates/mobile/lightbox/error.html.twig
+++ b/templates/mobile/lightbox/error.html.twig
@@ -12,10 +12,10 @@
     <h1>{{module_name}}</h1>
   </div>
     <div data-role="content">
-        <h2 style="font-weight:bold;font-size:20px;margin:40px 0;">{% trans 'Erreur !' %}</h2>
-        <p>{% trans 'Le panier demande nexiste plus' %}</p>
+        <h2 style="font-weight:bold;font-size:20px;margin:40px 0;">{{ 'Erreur !' | trans }}</h2>
+        <p>{{ 'Le panier demande nexiste plus' | trans }}</p>
         <p>{{error}}</p>
-        <p><a style="color:black;" target="_self" href="{{ path('lightbox') }}">{% trans 'Retour a l\'accueil' %}</a></p>
+        <p><a style="color:black;" target="_self" href="{{ path('lightbox') }}">{{ 'Retour a l\'accueil' | trans }}</a></p>
   </div>
     <div data-role="footer">
 
diff --git a/templates/mobile/lightbox/feed.html.twig b/templates/mobile/lightbox/feed.html.twig
index c16994b940..18419f4be7 100644
--- a/templates/mobile/lightbox/feed.html.twig
+++ b/templates/mobile/lightbox/feed.html.twig
@@ -13,7 +13,7 @@
 <div id="home" data-role="page">
     <div data-role="header">
     <h1>{{feed_entry.getTitle()}}</h1>
-    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">{% trans 'Home' %}</a>
+    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">{{ 'Home' | trans }}</a>
   </div>
     <div data-role="content">
     <p>
diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig
index 2f10b3cbef..8952785d68 100644
--- a/templates/mobile/lightbox/index.html.twig
+++ b/templates/mobile/lightbox/index.html.twig
@@ -36,21 +36,21 @@
 <div id="home" data-role="page">
     <div data-role="header">
     <h1>{{module_name}}</h1>
-    <a href="#about" class="ui-btn-right">{% trans 'a propos'%}</a>
+    <a href="#about" class="ui-btn-right">{{ 'a propos' | trans }}</a>
   </div>
     <div data-role="content">
     <ul data-role="listview" style="width:100%;margin: 0;">
       <li>
-        <a href="#validation">{% trans 'Validations'%}</a>
+        <a href="#validation">{{ 'Validations' | trans }}</a>
         <span class="ui-li-count">{{_self.valid_baskets_length(baskets_collection)}}</span>
       </li>
       <li>
-        <a href="#baskets">{% trans 'Paniers'%}</a>
+        <a href="#baskets">{{ 'Paniers' | trans }}</a>
         <span class="ui-li-count">{{_self.baskets_length(baskets_collection)}}</span>
       </li>
     </ul>
     <div style="margin:2em 0 0 0">
-      <a href="{{ path ('logout') }}" data-role="button" rel="external">{% trans 'Deconnexion' %}</a>
+      <a href="{{ path ('logout') }}" data-role="button" rel="external">{{ 'Deconnexion' | trans }}</a>
     </div>
   </div>
     <div data-role="footer">
@@ -60,7 +60,7 @@
 
 <div id="about" data-role="page">
     <div data-role="header">
-    <h1>{% trans 'a propos'%}</h1>
+    <h1>{{ 'a propos' | trans }}</h1>
   </div>
     <div data-role="content">
     <p>Phraseanet Version {{ app['phraseanet.version'].getName() }} - {{ app['phraseanet.version'].getNumber() }}</p>
@@ -79,12 +79,12 @@
 
 <div id="validation" data-role="page">
     <div data-role="header">
-     <a href="#home" data-rel="back" data-icon="arrow-l">{% trans 'Back' %}</a>
-     <h1>{% trans 'Validations'%}</h1>
+     <a href="#home" data-rel="back" data-icon="arrow-l">{{ 'Back' | trans }}</a>
+     <h1>{{ 'Validations' | trans }}</h1>
   </div>
     <div data-role="content">
     <p>
-      {% trans 'Voici vos validations en cours' %}
+      {{ 'Voici vos validations en cours' | trans }}
     </p>
     <ul data-role="listview"  style="width:100%;margin: 0;">
             {% for basket in baskets_collection %}
@@ -109,11 +109,11 @@
 
 <div id="baskets" data-role="page">
     <div data-role="header">
-     <h1>{% trans 'Paniers'%}</h1>
+     <h1>{{ 'Paniers' | trans }}</h1>
   </div>
     <div data-role="content">
     <p>
-      {% trans 'Voici vos paniers' %}
+      {{ 'Voici vos paniers' | trans }}
     </p>
     <ul data-role="listview"  style="width:100%;margin: 0;">
             {% for basket in baskets_collection %}
diff --git a/templates/mobile/lightbox/note_form.html.twig b/templates/mobile/lightbox/note_form.html.twig
index 52fc51582b..2305266399 100644
--- a/templates/mobile/lightbox/note_form.html.twig
+++ b/templates/mobile/lightbox/note_form.html.twig
@@ -20,7 +20,7 @@
         <textarea class="note_area"
           id="note_area_{{basket_element.getId()}}"
           {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getNote() == '' %}placeholder="Note"{% endif %}>{{basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getNote()}}</textarea>
-          <button type="submit" class="note_area_validate">{% trans 'boutton::valider' %}</button>
+          <button type="submit" class="note_area_validate">{{ 'boutton::valider' | trans }}</button>
         <input name="sselcont_id" value="{{basket_element.getId()}}" type="hidden"/>
     </form>
   </div>
diff --git a/templates/mobile/lightbox/sc_note.html.twig b/templates/mobile/lightbox/sc_note.html.twig
index 82571dda65..40b07e2563 100644
--- a/templates/mobile/lightbox/sc_note.html.twig
+++ b/templates/mobile/lightbox/sc_note.html.twig
@@ -10,7 +10,7 @@
       {{ validationDatas.getParticipant().getUser(app).get_display_name() }}
     </h3>
     {% if validationDatas.getNote() != '' %}
-    <p style="text-align:left;">{% trans 'validation:: note'%} : {{ validationDatas.getNote()|nl2br }}</p>
+    <p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}</p>
     {% endif %}
   </li>
   {% endif %}
diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig
index ec8eb861aa..0384c5ed91 100644
--- a/templates/mobile/lightbox/validate.html.twig
+++ b/templates/mobile/lightbox/validate.html.twig
@@ -4,7 +4,7 @@
 {% block javascript %}
   <script type="text/javascript">
     {% if basket.getValidation() %}
-    var releasable = {% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).isReleasable() %}"{% trans 'Do you want to send your report ?' %}"{% else %}false{% endif %}
+    var releasable = {% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).isReleasable() %}"{{ 'Do you want to send your report ?' | trans }}"{% else %}false{% endif %}
     {% endif %}
   </script>
   <script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/lightbox/jquery.validator.mobile.js' }) }}"></script>
@@ -17,9 +17,9 @@
 {% block content %}
 <div id="home" data-role="page">
     <div data-role="header">
-    <a href="{{ path('lightbox') }}{% if basket.getValidation() %}#validation{% else %}#baskets{% endif %}" data-rel="back" data-icon="arrow-l">{% trans 'Back' %}</a>
+    <a href="{{ path('lightbox') }}{% if basket.getValidation() %}#validation{% else %}#baskets{% endif %}" data-rel="back" data-icon="arrow-l">{{ 'Back' | trans }}</a>
     <h1>{{basket.getName()}}</h1>
-    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">{% trans 'Home' %}</a>
+    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">{{ 'Home' | trans }}</a>
   </div>
     <div data-role="content">
     <input type="hidden" id="basket_validation_id" value="{{ basket.getId() }}">
@@ -44,8 +44,8 @@
   </div>
     <div data-role="footer">
         {% if basket.getValidation() and basket.getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
-            <button class="confirm_report" style="width:100%;" title="{% trans 'validation::envoyer mon rapport'%}">
-                {% trans 'validation::envoyer mon rapport'%}
+            <button class="confirm_report" style="width:100%;" title="{{ 'validation::envoyer mon rapport' | trans }}">
+                {{ 'validation::envoyer mon rapport' | trans }}
                 <img src="/skins/icons/loader1F1E1B.gif" style="visibility:hidden;" class="loader"/>
             </button>
         {% endif %}
diff --git a/templates/web/account/access.html.twig b/templates/web/account/access.html.twig
index 7743972a5e..fcbab25619 100644
--- a/templates/web/account/access.html.twig
+++ b/templates/web/account/access.html.twig
@@ -1,7 +1,7 @@
 {% extends "account/base.html.twig" %}
 
 {% block title %}
-    {% trans "Granted bases" %}
+    {{ "Granted bases" | trans }}
 {% endblock %}
 
 {% set selected = "access" %}
@@ -27,9 +27,9 @@
                             {% set base_id = sbasId |base_from_coll(collId, app) %}
                             <tr>
                                 <td colspan="3" style="text-align:center;">
-                                    {% trans "login::register: acces authorise sur la collection " %}{{ sbasId |sbas_labels(app) }}
+                                    {{ "login::register: acces authorise sur la collection " | trans }}{{ sbasId |sbas_labels(app) }}
                                     {% if isTrue | trim != "" %}
-                                        <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                        <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                     {% endif %}
                                 </td>
                             </tr>
@@ -46,9 +46,9 @@
                         {% set base_id = sbasId |base_from_coll(collId, app) %}
                         <tr>
                             <td colspan="3" style="text-align: center;">
-                                <span style="color: red;">{% trans "login::register: acces refuse sur la collection " %}{{ sbasId |sbas_labels(app) }}</span>
+                                <span style="color: red;">{{ "login::register: acces refuse sur la collection " | trans }}{{ sbasId |sbas_labels(app) }}</span>
                                 {% if isTrue | trim != "" %}
-                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                 {% endif %}
                             </td>
                         </tr>
@@ -64,9 +64,9 @@
                         {% set base_id = sbasId |base_from_coll(collId, app) %}
                         <tr>
                             <td colspan="3" style="text-align: center;">
-                                <span style="color: orange;">{% trans "login::register: en attente d\'acces sur" %} {{ sbasId |sbas_labels(app) }}</span>
+                                <span style="color: orange;">{{ "login::register: en attente d\'acces sur" | trans }} {{ sbasId |sbas_labels(app) }}</span>
                                 {% if isTrue | trim != "" %}
-                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                 {% endif %}
                             </td>
                         </tr>
@@ -79,9 +79,9 @@
                         {% set base_id = sbasId |base_from_coll(collId, app) %}
                         <tr>
                             <td colspan="3" style="text-align: center;">
-                                <span>{% trans "login::register: acces temporaire sur" %} {{ sbasId |sbas_labels(app) }}</span>
+                                <span>{{ "login::register: acces temporaire sur" | trans }} {{ sbasId |sbas_labels(app) }}</span>
                                 {% if isTrue |trim != "" %}
-                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                 {% endif %}
                             </td>
                         </tr>
@@ -94,9 +94,9 @@
                         {% set base_id = sbasId |base_from_coll(collId, app) %}
                         <tr>
                             <td colspan="3" style="text-align: center;">
-                                <span style="color:red;">{% trans "login::register: acces temporaire termine sur " %}{{ sbasId |sbas_labels(app) }}</span>
+                                <span style="color:red;">{{ "login::register: acces temporaire termine sur " | trans }}{{ sbasId |sbas_labels(app) }}</span>
                                 {% if isTrue |trim != "" %}
-                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                 {% endif %}
                             </td>
                         </tr>
@@ -109,9 +109,9 @@
                         {% set base_id = sbasId |base_from_coll(collId, app) %}
                         <tr>
                             <td colspan="3" style="text-align: center;">
-                                <span style="color:red;">{% trans "login::register: acces supendu sur" %} {{ sbasId |sbas_labels(app) }}</span>
+                                <span style="color:red;">{{ "login::register: acces supendu sur" | trans }} {{ sbasId |sbas_labels(app) }}</span>
                                 {% if isTrue |trim != "" %}
-                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
+                                    <a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{{ "login::register::CGU: lire les CGU" | trans }}</a>
                                 {% endif %}
                             </td>
                         </tr>
@@ -123,7 +123,7 @@
                     {% if baseInsc["Colls"] %}
                         {% if baseInsc["CGU"] %}
                             <tr>
-                                <td colspan="3" style="text-align: center;">{% trans "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" %}</td>
+                                <td colspan="3" style="text-align: center;">{{ "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" | trans }}</td>
                             </tr>
                             <tr>
                                 <td colspan="3" style="text-align: center;"><div style="width: 90%; height: 120px; text-align: left; overflow: auto;">{{ baseInsc["CGU"] }}</div></td>
@@ -136,7 +136,7 @@
                                 <td></td>
                                 <td class="TD_R" style="width: 200px;">
                                     <input style="width: 15px;" class="checkbox" type="checkbox" name="demand[]" value="{{ base_id }}" />
-                                    <span>{% trans "login::register: Faire une demande d\'acces" %}</span>
+                                    <span>{{ "login::register: Faire une demande d\'acces" | trans }}</span>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -148,7 +148,7 @@
                                 <td colspan="3" style="text-align: center;"><hr style="width: 80%"/></td>
                             </tr>
                             <tr>
-                                <td colspan="3" style="text-align: center;">{% trans "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" %}</td>
+                                <td colspan="3" style="text-align: center;">{{ "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" | trans }}</td>
                             </tr>
                             <tr>
                                 <td colspan="3" style="text-align: center;">
@@ -160,7 +160,7 @@
                                 <td></td>
                                 <td class="TD_R" style="width: 200px;">
                                     <input style="width: 15px;" class="checkbox" type="checkbox" name="demand[]" value="{{ base_id }}" />
-                                    <span>{% trans "login::register: Faire une demande d\'acces" %}</span>
+                                    <span>{{ "login::register: Faire une demande d\'acces" | trans }}</span>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -169,7 +169,7 @@
             {% endfor %}
         </table>
         <div class="form-actions">
-            <input type="submit" class="btn btn-info" value="{% trans "boutton::valider" %}">
+            <input type="submit" class="btn btn-info" value="{{ "boutton::valider" | trans }}">
         </div>
     </form>
 {% endblock %}
diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig
index 4ee167d3dd..fde83a910c 100644
--- a/templates/web/account/account.html.twig
+++ b/templates/web/account/account.html.twig
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block title %}
-    {% trans "login:: Mon compte" %}
+    {{ "login:: Mon compte" | trans }}
 {% endblock %}
 
 {% block content_account %}
@@ -34,117 +34,117 @@
             <form name="account" id="account" class="form-horizontal" action="{{ path("submit_update_account") }}" method="post">
                 <div class="row-fluid">
                     <div class="span12 well well-small" id="phr-account">
-                        <legend>{% trans "Informations personnelles" %}</legend>
+                        <legend>{{ "Informations personnelles" | trans }}</legend>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_login"><strong>{% trans "admin::compte-utilisateur identifiant" %}</strong></label>
+                            <label class="form_label control-label" for="form_login"><strong>{{ "admin::compte-utilisateur identifiant" | trans }}</strong></label>
                             <div class="controls">
                                 <span class="control-span">{{ app["authentication"].getUser().get_login() }}</span>
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_gender"><strong>{% trans "admin::compte-utilisateur sexe" %}</strong></label>
+                            <label class="form_label control-label" for="form_gender"><strong>{{ "admin::compte-utilisateur sexe" | trans }}</strong></label>
                             <div class="controls">
                                 <select name="form_gender" class="input-xlarge">
                                     <option value=""></option>
                                     <option {% if app["authentication"].getUser().get_gender() == "0" %}selected{% endif %} value="0" >
-                                        {% trans "admin::compte-utilisateur:sexe: mademoiselle" %}
+                                        {{ "admin::compte-utilisateur:sexe: mademoiselle" | trans }}
                                     </option>
                                     <option {% if app["authentication"].getUser().get_gender() == "1" %}selected{% endif %} value="1" >
-                                        {% trans "admin::compte-utilisateur:sexe: madame" %}
+                                        {{ "admin::compte-utilisateur:sexe: madame" | trans }}
                                     </option>
                                     <option {% if app["authentication"].getUser().get_gender() == "2" %}selected{% endif %} value="2" >
-                                        {% trans "admin::compte-utilisateur:sexe: monsieur" %}
+                                        {{ "admin::compte-utilisateur:sexe: monsieur" | trans }}
                                     </option>
                                 </select>
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_lastname"><strong>{% trans "admin::compte-utilisateur nom" %}</strong></label>
+                            <label class="form_label control-label" for="form_lastname"><strong>{{ "admin::compte-utilisateur nom" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_lastname" id="form_lastname" value="{{ app["authentication"].getUser().get_lastname() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_firstname"><strong>{% trans "admin::compte-utilisateur prenom" %}</strong></label>
+                            <label class="form_label control-label" for="form_firstname"><strong>{{ "admin::compte-utilisateur prenom" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_firstname" id="form_firstname" value="{{ app["authentication"].getUser().get_firstname() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_firstname"><strong>{% trans "admin::compte-utilisateur email" %}</strong></label>
+                            <label class="form_label control-label" for="form_firstname"><strong>{{ "admin::compte-utilisateur email" | trans }}</strong></label>
                             <div class="controls">
-                                <span class="control-span">{{ app["authentication"].getUser().get_email() }} <a href="{{ path("account_reset_email") }}" target="_self">{% trans "login:: Changer mon adresse email" %}</a></span>
+                                <span class="control-span">{{ app["authentication"].getUser().get_email() }} <a href="{{ path("account_reset_email") }}" target="_self">{{ "login:: Changer mon adresse email" | trans }}</a></span>
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="control-label"><strong>{% trans "Password" %}</strong></label>
+                            <label class="control-label"><strong>{{ "Password" | trans }}</strong></label>
                             <div class="controls">
-                                <span class="control-span"><a href="{{ path("reset_password") }}" target="_self">{% trans "admin::compte-utilisateur changer mon mot de passe" %}</a></span>
+                                <span class="control-span"><a href="{{ path("reset_password") }}" target="_self">{{ "admin::compte-utilisateur changer mon mot de passe" | trans }}</a></span>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_address"><strong>{% trans "admin::compte-utilisateur adresse" %}</strong></label>
+                            <label class="form_label control-label" for="form_address"><strong>{{ "admin::compte-utilisateur adresse" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_address" id="form_address" value="{{ app["authentication"].getUser().get_address() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_zip"><strong>{% trans "admin::compte-utilisateur code postal" %}</strong></label>
+                            <label class="form_label control-label" for="form_zip"><strong>{{ "admin::compte-utilisateur code postal" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_zip" id="form_zip" value="{{ app["authentication"].getUser().get_zipcode() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_city"><strong>{% trans "admin::compte-utilisateur ville" %}</strong></label>
+                            <label class="form_label control-label" for="form_city"><strong>{{ "admin::compte-utilisateur ville" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="{{ app["authentication"].getUser().get_geonameid() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_function"><strong>{% trans "admin::compte-utilisateur poste" %}</strong></label>
+                            <label class="form_label control-label" for="form_function"><strong>{{ "admin::compte-utilisateur poste" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().get_position() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_company"><strong>{% trans "admin::compte-utilisateur societe" %}</strong></label>
+                            <label class="form_label control-label" for="form_company"><strong>{{ "admin::compte-utilisateur societe" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_company" id="form_company" value="{{ app["authentication"].getUser().get_company() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_activity"><strong>{% trans "admin::compte-utilisateur activite" %}</strong></label>
+                            <label class="form_label control-label" for="form_activity"><strong>{{ "admin::compte-utilisateur activite" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().get_job() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_phone"><strong>{% trans "admin::compte-utilisateur telephone" %}</strong></label>
+                            <label class="form_label control-label" for="form_phone"><strong>{{ "admin::compte-utilisateur telephone" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_phone" id="form_phone" value="{{ app["authentication"].getUser().get_tel() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="form_label control-label" for="form_fax"><strong>{% trans "admin::compte-utilisateur fax" %}</strong></label>
+                            <label class="form_label control-label" for="form_fax"><strong>{{ "admin::compte-utilisateur fax" | trans }}</strong></label>
                             <div class="controls">
                                 <input class="input_element input-xlarge" type="text" name="form_fax" id="form_fax" value="{{ app["authentication"].getUser().get_fax() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
 
-                        <legend>{% trans "Notification par email" %}</legend>
+                        <legend>{{ "Notification par email" | trans }}</legend>
 
                         {% for notification_group, nots in notifications%}
                             <div class="control-group">
@@ -165,12 +165,12 @@
                             </div>
                         {% endfor %}
 
-                        <legend>{% trans "FTP" %}</legend>
+                        <legend>{{ "FTP" | trans }}</legend>
 
                         {% set ftpCredential = app["authentication"].getUser().getFtpCredential() %}
                         <div class="control-group">
                             <div class="controls">
-                                <label class="form_label checkbox" for="form_activeFTP">{% trans "admin::compte-utilisateur:ftp: Activer le compte FTP" %}
+                                <label class="form_label checkbox" for="form_activeFTP">{{ "admin::compte-utilisateur:ftp: Activer le compte FTP" | trans }}
                                     <input class="input_element input-xlarge" type="checkbox" name="form_activeFTP" id="form_activeFTP" {% if ftpCredential.isActive() %}checked{% endif %} onchange="if(this.checked){$('#ftpinfos').slideDown();}else{$('#ftpinfos').slideUp();}" />
                                 </label>
                                 <p class="form_alert help-block"></p>
@@ -179,35 +179,35 @@
 
                         <div id="ftpinfos" style="display:{% if ftpCredential.isActive() %}block{% else %}none{% endif %}">
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_addressFTP"><strong>{% trans "phraseanet:: adresse" %}</strong></label>
+                                <label class="form_label control-label" for="form_addressFTP"><strong>{{ "phraseanet:: adresse" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_addressFTP" id="form_addressFTP" value="{{ ftpCredential.getAddress() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_loginFTP"><strong>{% trans "admin::compte-utilisateur identifiant" %}</strong></label>
+                                <label class="form_label control-label" for="form_loginFTP"><strong>{{ "admin::compte-utilisateur identifiant" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_loginFTP" id="form_loginFTP" value="{{ ftpCredential.getLogin() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_pwdFTP"><strong>{% trans "admin::compte-utilisateur mot de passe" %}</strong></label>
+                                <label class="form_label control-label" for="form_pwdFTP"><strong>{{ "admin::compte-utilisateur mot de passe" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_pwdFTP" id="form_pwdFTP" value="{{ ftpCredential.getPassword() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_destFTP"><strong>{% trans "admin::compte-utilisateur:ftp:  repertoire de destination ftp" %}</strong></label>
+                                <label class="form_label control-label" for="form_destFTP"><strong>{{ "admin::compte-utilisateur:ftp:  repertoire de destination ftp" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_destFTP" id="form_destFTP" value="{{ ftpCredential.getReceptionFolder() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_prefixFTPfolder"><strong>{% trans "admin::compte-utilisateur:ftp: prefixe des noms de dossier ftp" %}</strong></label>
+                                <label class="form_label control-label" for="form_prefixFTPfolder"><strong>{{ "admin::compte-utilisateur:ftp: prefixe des noms de dossier ftp" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_prefixFTPfolder" id="form_prefixFTPfolder" value="{{ ftpCredential.getRepositoryPrefixName() }}" />
                                     <p class="form_alert help-block"></p>
@@ -216,14 +216,14 @@
                             <div class="control-group">
                                 <div class="controls">
                                     <label class="form_label checkbox" for="form_passifFTP">
-                                        {% trans "admin::compte-utilisateur:ftp: Utiliser le mode passif" %}
+                                        {{ "admin::compte-utilisateur:ftp: Utiliser le mode passif" | trans }}
                                         <input class="input_element input-xlarge" type="checkbox" name="form_passifFTP" id="form_passifFTP" {% if ftpCredential.isPassive() %}checked{% endif %} />
                                     </label>
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="form_label control-label" for="form_retryFTP"><strong>{% trans "admin::compte-utilisateur:ftp: Nombre d\'essais max" %}</strong></label>
+                                <label class="form_label control-label" for="form_retryFTP"><strong>{{ "admin::compte-utilisateur:ftp: Nombre d\'essais max" | trans }}</strong></label>
                                 <div class="controls">
                                     <input class="input_element input-xlarge" type="text" name="form_retryFTP" id="form_retryFTP" value="{{ ftpCredential.getMaxRetry() }}" />
                                     <p class="form_alert help-block"></p>
@@ -232,7 +232,7 @@
                         </div>
                     </div>
                     <div class="form-actions">
-                        <input type="submit" class="btn btn-info btn-" value="{% trans "boutton::valider" %}">
+                        <input type="submit" class="btn btn-info btn-" value="{{ "boutton::valider" | trans }}">
                     </div>
                 </div>
             </form>
diff --git a/templates/web/account/authorized_apps.html.twig b/templates/web/account/authorized_apps.html.twig
index 837a3b6aeb..aa0a6ab5ec 100644
--- a/templates/web/account/authorized_apps.html.twig
+++ b/templates/web/account/authorized_apps.html.twig
@@ -1,7 +1,7 @@
 {% extends "account/base.html.twig" %}
 
 {% block title %}
-    {% trans "Granted third party applications" %}
+    {{ "Granted third party applications" | trans }}
 {% endblock %}
 
 {% set selected = "applications" %}
@@ -10,15 +10,15 @@
     <div class="row-fluid">
         <div class="span6">
             <div id="content-apps">
-                <h3>{% trans "Vous avez autorise ces applications a acceder a votre compte" %}</h3>
+                <h3>{{ "Vous avez autorise ces applications a acceder a votre compte" | trans }}</h3>
                 {% if applications|length > 0 %}
                     <ul class="unstyled app-list">
                         {% for application in applications %}
                             <li id="app_{{ application.get_id() }}">
                                 <div>
                                     {% set account = application.get_user_account(app["authentication"].getUser()) %}
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Revoquer l\'access" %}</a>
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}"  class="authorize app-btn btn btn-small pull-right {% if not account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{% trans "Authoriser l\'access" %}</a>
+                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{{ "Revoquer l\'access" | trans }}</a>
+                                    <a href="{{ path("grant_app_access", {"application_id" : application.get_id()}) }}"  class="authorize app-btn btn btn-small pull-right {% if not account.is_revoked() %}hidden{% endif %}" value="{{application.get_id()}}">{{ "Authoriser l\'access" | trans }}</a>
                                     <p class="app-row">
                                         <a href="{{ application.get_website() }}" target="_blank">
                                             <strong>{{ application.get_name() }}</strong>
@@ -33,8 +33,8 @@
                                         {% endif%}
                                     </p>
                                     <p class="app-row">
-                                        <span class="status text-error {% if account.is_revoked() == false %}hidden{% endif %}">{% trans "Not Allowed"%}</span>
-                                        <span class="status text-success {% if account.is_revoked() == true %}hidden{% endif %}">{% trans "Allowed"%}</span>
+                                        <span class="status text-error {% if account.is_revoked() == false %}hidden{% endif %}">{{ "Not Allowed" | trans }}</span>
+                                        <span class="status text-success {% if account.is_revoked() == true %}hidden{% endif %}">{{ "Allowed" | trans }}</span>
                                     </p>
                                     <p class="app-row">{{ application.get_description()|truncate(120, true, "...") }}</p>
                                 </div>
@@ -43,23 +43,23 @@
                     </ul>
                  {% else %}
                     <div>
-                        {% trans "Aucune application n\'a accés à vos données." %}
+                        {{ "Aucune application n\'a accés à vos données." | trans }}
                     </div>
                  {% endif %}
             </div>
         </div>
         <div class="span6">
             <div class="well well-small">
-                <h3>{% trans "Third-party applications" %}</h3>
+                <h3>{{ "Third-party applications" | trans }}</h3>
                 <p>
-                  {% trans "A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data." %}
+                  {{ "A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data." | trans }}
                 </p>
             </div>
 
             <div class="well well-small">
-                <h3>{% trans "Developpeurs" %}</h3>
+                <h3>{{ "Developpeurs" | trans }}</h3>
                 <p>
-                    {% trans "Les developpeurs peuvent editer l\'enregistrement de leurs application grace a l\'onglet 'developpeurs' ci-dessus" %}
+                    {{ "Les developpeurs peuvent editer l\'enregistrement de leurs application grace a l\'onglet 'developpeurs' ci-dessus" | trans }}
                 </p>
             </div>
         </div>
diff --git a/templates/web/account/base.html.twig b/templates/web/account/base.html.twig
index f22c8b526c..a825f58482 100644
--- a/templates/web/account/base.html.twig
+++ b/templates/web/account/base.html.twig
@@ -20,11 +20,11 @@
                             <div class="navbar-inner">
                                 <span class="brand">{{ app["phraseanet.registry"].get("GV_homeTitle") }}<span class="section-title"> {{ block("title") }}</span></span>
                                 <ul class="nav">
-                                    <li {% if selected == "informations" %}class="active"{% endif %}><a href="{{ path("account") }}">{% trans "Informations" %}</a></li>
-                                    <li {% if selected == "access" %}class="active"{% endif %}><a href="{{ path("account_access") }}">{% trans "Acces" %}</a></li>
-                                    <li {% if selected == "sessions" %}class="active"{% endif %}><a href="{{ path("account_sessions") }}">{% trans "Sessions" %}</a></li>
-                                    <li {% if selected == "applications" %}class="active"{% endif %}><a href="{{ path("account_auth_apps") }}">{% trans "Applications" %}</a></li>
-                                    <li {% if selected == "developer" %}class="active"{% endif %}><a href="{{ path("developers_applications") }}">{% trans "Developpeur" %}</a></li>
+                                    <li {% if selected == "informations" %}class="active"{% endif %}><a href="{{ path("account") }}">{{ "Informations" | trans }}</a></li>
+                                    <li {% if selected == "access" %}class="active"{% endif %}><a href="{{ path("account_access") }}">{{ "Acces" | trans }}</a></li>
+                                    <li {% if selected == "sessions" %}class="active"{% endif %}><a href="{{ path("account_sessions") }}">{{ "Sessions" | trans }}</a></li>
+                                    <li {% if selected == "applications" %}class="active"{% endif %}><a href="{{ path("account_auth_apps") }}">{{ "Applications" | trans }}</a></li>
+                                    <li {% if selected == "developer" %}class="active"{% endif %}><a href="{{ path("developers_applications") }}">{{ "Developpeur" | trans }}</a></li>
                                 </ul>
                             </div>
                         </div>
diff --git a/templates/web/account/change-password.html.twig b/templates/web/account/change-password.html.twig
index af6fef39f8..0c1152854b 100644
--- a/templates/web/account/change-password.html.twig
+++ b/templates/web/account/change-password.html.twig
@@ -4,7 +4,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Renew password" %}
+    {{ "Renew password" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -12,7 +12,7 @@
         <div class="row-fluid">
             <div class="span12 authentication-sidebar-title">
                 <div class="text-title">
-                    {% trans "Choose a new password" %}
+                    {{ "Choose a new password" | trans }}
                 </div>
             </div>
         </div>
@@ -42,7 +42,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger ">
-                                {% trans "Save" %}
+                                {{ "Save" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/account/reset-email.html.twig b/templates/web/account/reset-email.html.twig
index d8e40e01ed..75ca24a5f9 100644
--- a/templates/web/account/reset-email.html.twig
+++ b/templates/web/account/reset-email.html.twig
@@ -3,7 +3,7 @@
 {% import "common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Change my email address" %}
+    {{ "Change my email address" | trans }}
 {% endblock %}
 
 {% block head %}
@@ -18,41 +18,41 @@
             {{ auth_macro.flashes() }}
             <form method="POST" action="{{ path("reset_email") }}" id="mainform" name="changeEmail" class="form-horizontal">
                 <div class="control-group">
-                    <label class="control-label" for="form_login">{% trans "admin::compte-utilisateur identifiant" %}</label>
+                    <label class="control-label" for="form_login">{{ "admin::compte-utilisateur identifiant" | trans }}</label>
                     <div class="controls">
                         <p id="form_login" style="line-height: 30px;">{{ app["authentication"].getUser().get_login() }}</p>
                     </div>
                 </div>
                 <div class="control-group">
-                    <label class="control-label" for="form_password">{% trans "admin::compte-utilisateur mot de passe" %}</label>
+                    <label class="control-label" for="form_password">{{ "admin::compte-utilisateur mot de passe" | trans }}</label>
                     <div class="controls">
                         <input type="password" id="form_password" name="form_password" autocomplete="off" />
                         <div class="error-view"></div>
                     </div>
                 </div>
                 <div class="control-group">
-                    <label class="control-label" for="form_email">{% trans "admin::compte-utilisateur nouvelle adresse email" %}</label>
+                    <label class="control-label" for="form_email">{{ "admin::compte-utilisateur nouvelle adresse email" | trans }}</label>
                     <div class="controls">
                         <input type="text" id="form_email" name="form_email" />
                         <div class="error-view"></div>
                     </div>
                 </div>
                 <div class="control-group">
-                    <label class="control-label" for="form_email_confirm">{% trans "admin::compte-utilisateur confirmer la nouvelle adresse email" %}</label>
+                    <label class="control-label" for="form_email_confirm">{{ "admin::compte-utilisateur confirmer la nouvelle adresse email" | trans }}</label>
                     <div class="controls">
                         <input type="text" id="form_email_confirm" name="form_email_confirm" autocomplete="off" />
                         <div class="error-view"></div>
                     </div>
                 </div>
                 <div class="form-actions" style="background-color: transparent;">
-                    <input type="submit" class="btn btn-success" value="{% trans "boutton::valider" %}" style="margin: 20px auto;" />
-                    <input type="button" class="btn" value="{% trans "boutton::annuler" %}" onclick="self.location.replace('/account/');" />
+                    <input type="submit" class="btn btn-success" value="{{ "boutton::valider" | trans }}" style="margin: 20px auto;" />
+                    <input type="button" class="btn" value="{{ "boutton::annuler" | trans }}" onclick="self.location.replace('/account/');" />
                 </div>
             </form>
             <div class="well well-small alert-info">
-                {% trans "admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ?"%}
+                {{ "admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ?" | trans }}
                 <br />
-                {% trans "admin::compte-utilisateur: Votre adresse e-mail sera utilisee lors de la perte de votre mot de passe afin de pouvoir le reinitialiser, il est important que vous soyez la seule personne a pouvoir la changer."%}
+                {{ "admin::compte-utilisateur: Votre adresse e-mail sera utilisee lors de la perte de votre mot de passe afin de pouvoir le reinitialiser, il est important que vous soyez la seule personne a pouvoir la changer." | trans }}
             </div>
         </div>
     </div>
diff --git a/templates/web/account/sessions.html.twig b/templates/web/account/sessions.html.twig
index ee8dc9673e..fbb46657c0 100644
--- a/templates/web/account/sessions.html.twig
+++ b/templates/web/account/sessions.html.twig
@@ -1,7 +1,7 @@
 {% extends 'account/base.html.twig' %}
 
 {% block title %}
-    {% trans 'Access history' %}
+    {{ 'Access history' | trans }}
 {% endblock %}
 
 {% set selected = "sessions" %}
@@ -17,16 +17,16 @@
                      <tr>
                         <th></th>
                         <th>
-                            {% trans 'Date de connexion' %}
+                            {{ 'Date de connexion' | trans }}
                         </th>
                         <th>
-                            {% trans 'Dernier access' %}
+                            {{ 'Dernier access' | trans }}
                         </th>
                         <th>
-                            {% trans 'IP' %}
+                            {{ 'IP' | trans }}
                         </th>
                         <th>
-                            {% trans 'Browser' %}
+                            {{ 'Browser' | trans }}
                         </th>
                     </tr>
                 </thead>
@@ -38,7 +38,7 @@
                                 {% if app['session'].get('session_id') != row.Id() %}
                                     <a href="{{ path('delete_session', {"id": row.Id()}) }}" title="{% trans %}End Activity{% endtrans %}" class="btn btn-inverse btn-small delete-session"><i class="icon-remove"> {% trans %}End Activity{% endtrans %}</i></a>
                                 {% else  %}
-                                    {% trans 'Current session' %}
+                                    {{ 'Current session' | trans }}
                                 {% endif %}
                             </td>
                             <td>
diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig
index a90ee6e652..56bfa4267f 100644
--- a/templates/web/admin/collection/collection.html.twig
+++ b/templates/web/admin/collection/collection.html.twig
@@ -8,19 +8,19 @@
 
 <div class="page-header">
     <h1>
-        {% trans 'phraseanet:: collection' %} {{ collection.get_label(app['locale.I18n']) }}
+        {{ 'phraseanet:: collection' | trans }} {{ collection.get_label(app['locale.I18n']) }}
     </h1>
 </div>
 
 {% if app['request'].query.get('success') == '1' %}
     <div class="alert alert-success">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        {% trans 'Successful update' %}
+        {{ 'Successful update' | trans }}
     </div>
 {% elseif app['request'].query.get('success') == '0' %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <strong>{% trans 'An error occured' %}</strong>
+        <strong>{{ 'An error occured' | trans }}</strong>
         {% if errorMsg is not none %}
             {{ errorMsg }}
         {% endif %}
@@ -28,15 +28,15 @@
 {% endif %}
 
 <ul class="unstyled">
-    <li>{% trans 'phraseanet:: adresse' %} : {{ collection.get_databox().get_serialized_server_info() }}</li>
-    <li>{% trans 'admin::base:collection: numero de collection distante' %} : {{ collection.get_coll_id() }}</li>
-    <li>{% trans 'admin::base:collection: etat de la collection' %} : {{ collection.is_active() ? "admin::base:collection: activer la collection"| trans : "admin::base:collection: descativer la collection"|trans }}</li>
-    <li>{{ collection.get_record_amount() }} records <a class="ajax" target="rights" href="{{ path('admin_collection_display_document_details', { 'bas_id' : collection.get_base_id() }) }}">{% trans 'phraseanet:: details' %}</a></li>
+    <li>{{ 'phraseanet:: adresse' | trans }} : {{ collection.get_databox().get_serialized_server_info() }}</li>
+    <li>{{ 'admin::base:collection: numero de collection distante' | trans }} : {{ collection.get_coll_id() }}</li>
+    <li>{{ 'admin::base:collection: etat de la collection' | trans }} : {{ collection.is_active() ? "admin::base:collection: activer la collection"| trans : "admin::base:collection: descativer la collection"|trans }}</li>
+    <li>{{ collection.get_record_amount() }} records <a class="ajax" target="rights" href="{{ path('admin_collection_display_document_details', { 'bas_id' : collection.get_base_id() }) }}">{{ 'phraseanet:: details' | trans }}</a></li>
 </ul>
 
 {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
 <div class="well well-small">
-    <h5>{% trans 'admin::collection:: Gestionnaires des commandes' %}</h5>
+    <h5>{{ 'admin::collection:: Gestionnaires des commandes' | trans }}</h5>
     <form id="admin_adder" action="{{ path('admin_collection_submit_order_admins', { 'bas_id' : bas_id }) }}" method="post" style="margin:0;">
         {% if admins | length > 0 %}
             <ul class="unstyled">
@@ -52,27 +52,27 @@
         {% endif %}
 
         <div class="input-append">
-            <input class="admin_adder" placeholder="{% trans 'setup:: ajouter un administrateur des commandes' %}"/>
+            <input class="admin_adder" placeholder="{{ 'setup:: ajouter un administrateur des commandes' | trans }}"/>
             <input type="hidden" name="admins[]"/>
-            <input type="submit" class="btn btn-warning" value="{% trans 'boutton::valider' %}" />
+            <input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" />
         </div>
     </form>
 </div>
 
 <div class="well well-small action-block">
-    <h5>{% trans 'admin::collection:: presentation des elements lors de la diffusion aux utilisateurs externes (publications)' %}</h5>
+    <h5>{{ 'admin::collection:: presentation des elements lors de la diffusion aux utilisateurs externes (publications)' | trans }}</h5>
     <form method="post" action="{{ path('admin_collection_submit_publication', { 'bas_id' : bas_id }) }}" style="margin:0;">
         <label class="radio" for="pub_wm_none">
             <input id="pub_wm_none" type="radio" name="pub_wm" {{ collection.get_pub_wm() == 'none' ? 'checked' : ''}} value="none"  />
-            {% trans 'admin::colelction::presentation des elements : rien' %}
+            {{ 'admin::colelction::presentation des elements : rien' | trans }}
         </label>
         <label class="radio"  for="pub_wm_wm">
             <input id="pub_wm_wm" type="radio" name="pub_wm" {{ collection.get_pub_wm() == 'wm' ? 'checked' : ''}} value="wm"    />
-            {% trans 'admin::colelction::presentation des elements : watermark' %}
+            {{ 'admin::colelction::presentation des elements : watermark' | trans }}
         </label>
         <label class="radio"  for="pub_wm_stamp">
             <input id="pub_wm_stamp" type="radio" name="pub_wm" {{ collection.get_pub_wm() == 'stamp' ? 'checked' : ''}} value="stamp" />
-            {% trans 'admin::colelction::presentation des elements : stamp' %}
+            {{ 'admin::colelction::presentation des elements : stamp' | trans }}
         </label>
     </form>
 </div>
@@ -96,7 +96,7 @@
                 <div class="span2">
                     <button class="btn" type="submit">
                         <img src="/skins/icons/edit_0.gif" />
-                        {% trans 'Set labels' %}
+                        {{ 'Set labels' | trans }}
                     </button>
                 </div>
             </div>
@@ -110,7 +110,7 @@
             <input name="name" class="span3" type="text" size="16">
             <button class="btn reload-tree submiter" type="submit">
                 <img src="/skins/icons/edit_0.gif" />
-                {% trans 'admin::base:collection: renommer la collection' %}
+                {{ 'admin::base:collection: renommer la collection' | trans }}
             </button>
         </div>
     </form>
@@ -123,16 +123,16 @@
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}">
-        <button class="btn confirm submiter" data-confirm-msg="{% trans 'admin::base:collection: etes vous sur de vider la collection ?' %}">
+        <button class="btn confirm submiter" data-confirm-msg="{{ 'admin::base:collection: etes vous sur de vider la collection ?' | trans }}">
             <img src="/skins/icons/trash.png" />
-            {% trans 'admin::base:collection: vider la collection' %}
+            {{ 'admin::base:collection: vider la collection' | trans }}
         </button>
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_delete', { 'bas_id' : bas_id }) }}">
-        <button class="btn confirm submiter reload-tree" data-confirm-msg="{% trans 'admin::collection: Confirmez vous la suppression de cette collection ?' %}">
+        <button class="btn confirm submiter reload-tree" data-confirm-msg="{{ 'admin::collection: Confirmez vous la suppression de cette collection ?' | trans }}">
             <img src="/skins/icons/delete.gif" />
-            {% trans 'boutton::supprimer' %}
+            {{ 'boutton::supprimer' | trans }}
         </button>
     </form>
 </div>
@@ -140,19 +140,19 @@
 
 {# mini logo #}
 <div class="well well-small action-block">
-    <h5>{% trans 'admin::base:collection: minilogo actuel' %}</h5>
+    <h5>{{ 'admin::base:collection: minilogo actuel' | trans }}</h5>
     {% if collection.getLogo(bas_id, app) is not empty %}
         <div class="thumbnail" style="width:120px;height:24px;margin-top:5px;margin-bottom:5px">{{ collection.getLogo(bas_id, app) | raw }}</div>
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
             <form method="post" action="{{ path('admin_collection_delete_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
                 <button class="btn btn-danger btn-mini" >
                     <i class="icon-trash icon-white"></i>
-                    {% trans 'boutton::supprimer' %}
+                    {{ 'boutton::supprimer' | trans }}
                 </button>
             </form>
         {% endif%}
     {% elseif app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
-        <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
+        <span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
         <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
             <span class="btn btn-success fileinput-button">
                 <i class="icon-plus icon-white"></i>
@@ -165,19 +165,19 @@
 
 {# watermark #}
 <div class="well well-small action-block">
-    <h5>{% trans "Watermark" %}</h5>
+    <h5>{{ "Watermark" | trans }}</h5>
     {% if collection.getWatermark(bas_id) is not empty %}
         <div class="thumbnail">{{ collection.getWatermark(bas_id)| raw }}</div>
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
             <form method="post" action="{{ path('admin_collection_delete_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
                 <button class="btn btn-danger btn-mini">
                     <i class="icon-trash icon-white"></i>
-                    {% trans 'boutton::supprimer' %}
+                    {{ 'boutton::supprimer' | trans }}
                 </button>
             </form>
         {% endif%}
     {% elseif app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
-        <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
+        <span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
         <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
             <span class="btn btn-success fileinput-button">
                 <i class="icon-plus icon-white"></i>
@@ -190,19 +190,19 @@
 
 {# stamp logo #}
 <div class="well well-small action-block">
-    <h5>{% trans "Stamp logo" %}</h5>
+    <h5>{{ "Stamp logo" | trans }}</h5>
     {% if collection.getStamp(bas_id) is not empty %}
         <div class="thumbnail" style="max-height:120px;max-width:260px">{{ collection.getStamp(bas_id)| raw }}</div>
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
             <form method="post" action="{{ path('admin_collection_delete_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
                 <button class="btn btn-danger btn-mini">
                     <i class="icon-trash icon-white"></i>
-                    {% trans 'boutton::supprimer' %}
+                    {{ 'boutton::supprimer' | trans }}
                 </button>
             </form>
         {% endif%}
     {% elseif app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
-        <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
+        <span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
         <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
             <span class="btn btn-success fileinput-button">
                 <i class="icon-plus icon-white"></i>
@@ -215,19 +215,19 @@
 
 {# Bandeau de présentation #}
 <div class="well well-small action-block">
-    <h5>{% trans 'admin::base:collection: image de presentation : ' %}</h5>
+    <h5>{{ 'admin::base:collection: image de presentation : ' | trans }}</h5>
     {% if collection.getPresentation(bas_id) is not empty %}
         <div class="thumbnail" style="width:650px;height:200px">{{ collection.getPresentation(bas_id)| raw }}</div>
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
             <form method="post" action="{{ path('admin_collection_delete_banner', { 'bas_id' : bas_id }) }}" style="margin:0;">
                 <button class="btn btn-danger btn-mini">
                     <i class="icon-trash icon-white"></i>
-                    {% trans 'boutton::supprimer' %}
+                    {{ 'boutton::supprimer' | trans }}
                 </button>
             </form>
         {% endif%}
     {% elseif app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %}
-        <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
+        <span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
         <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_banner', { 'bas_id' : bas_id }) }}" style="margin:0;">
             <span class="btn btn-success fileinput-button">
                 <i class="icon-plus icon-white"></i>
diff --git a/templates/web/admin/collection/create.html.twig b/templates/web/admin/collection/create.html.twig
index 227c7d0b9b..89f3847987 100644
--- a/templates/web/admin/collection/create.html.twig
+++ b/templates/web/admin/collection/create.html.twig
@@ -1,17 +1,17 @@
 <div class="page-header">
-    <h1>{% trans 'admin::base:collection: Creer une collection' %}</h1>
+    <h1>{{ 'admin::base:collection: Creer une collection' | trans }}</h1>
 </div>
 
 {% if app['request'].get('error') == 'name' %}
         <div class="alert alert-error">
             <a class="close" data-dismiss="alert" href="#">×</a>
-            {% trans 'admin:: La collection n\'a pas ete creee : vous devez donner un nom a votre collection' %}
+            {{ 'admin:: La collection n\'a pas ete creee : vous devez donner un nom a votre collection' | trans }}
         </div>
 
 {% elseif app['request'].get('error') == 'error' %}
         <div class="alert alert-error">
             <a class="close" data-dismiss="alert" href="#">×</a>
-            {% trans 'An error occured, please retry or contact an admin if problem persist' %}
+            {{ 'An error occured, please retry or contact an admin if problem persist' | trans }}
         </div>
 {% endif %}
 
@@ -19,13 +19,13 @@
     <form class="form-horizontal" method='post' action='{{ path('admin_database_submit_collection', {'databox_id': app['request'].get('databox_id')}) }}'>
         <fieldset>
             <div class="control-group">
-                <label class="control-label" for="cnm">{% trans 'admin::base:collection: Nom de la nouvelle collection : ' %}</label>
+                <label class="control-label" for="cnm">{{ 'admin::base:collection: Nom de la nouvelle collection : ' | trans }}</label>
                 <div class="controls">
                     <input id="cnm" name="name" class="input-xlarge" type="text">
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="ccusrothercoll">{% trans "admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces " %}</label>
+                <label class="control-label" for="ccusrothercoll">{{ "admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces " | trans }}</label>
                 <div class="controls">
                     <input type="checkbox" id="ccusrothercoll" name="ccusrothercoll">
                 </div>
@@ -34,7 +34,7 @@
                 <div class="controls">
                      {% if app['acl'].get(app['authentication'].getUser()).get_granted_base(["canadmin"]) | length > 0 %}
                         <select id="othcollsel" name="othcollsel" disabled>
-                            <option>{% trans "choisir" %}</option>
+                            <option>{{ "choisir" | trans }}</option>
                             {% for collection in app['acl'].get(app['authentication'].getUser()).get_granted_base(["canadmin"]) %}
                                <option value="{{ collection.get_base_id() }}">{{ collection.get_label(app['locale.I18n']) }}</option>
                             {% endfor %}
@@ -43,8 +43,8 @@
                 </div>
             </div>
             <div class="form-actions">
-                <button class="btn btn-primary" type="submit">{% trans 'boutton::valider' %}</button>
-                <a href='{{ path('admin_database', {'databox_id': app['request'].get('databox_id')}) }}' target='right' class="btn ajax">{% trans 'boutton::annuler' %}</a>
+                <button class="btn btn-primary" type="submit">{{ 'boutton::valider' | trans }}</button>
+                <a href='{{ path('admin_database', {'databox_id': app['request'].get('databox_id')}) }}' target='right' class="btn ajax">{{ 'boutton::annuler' | trans }}</a>
             </div>
         </fieldset>
     </form>
diff --git a/templates/web/admin/collection/details.html.twig b/templates/web/admin/collection/details.html.twig
index 9f529d4049..e60986f9c9 100644
--- a/templates/web/admin/collection/details.html.twig
+++ b/templates/web/admin/collection/details.html.twig
@@ -1,14 +1,14 @@
 <div class="header">
-    <h1>{{ collection.get_label(app['locale.I18n']) }} <small style="font-size:16px">{% trans "Details" %}</small></h1>
+    <h1>{{ collection.get_label(app['locale.I18n']) }} <small style="font-size:16px">{{ "Details" | trans }}</small></h1>
 </div>
 
 <table class="table table-bordered">
     <thead>
         <tr>
-            <th>{% trans 'admin::base: objet' %}</th>
-            <th>{% trans 'admin::base: nombre' %}</th>
-            <th>{% trans 'admin::base: poids' %} (Mo)</th>
-            <th>{% trans 'admin::base: poids' %} (Go)</th>
+            <th>{{ 'admin::base: objet' | trans }}</th>
+            <th>{{ 'admin::base: nombre' | trans }}</th>
+            <th>{{ 'admin::base: poids' | trans }} (Mo)</th>
+            <th>{{ 'admin::base: poids' | trans }} (Go)</th>
         </tr>
     </thead>
     <tbody>
@@ -24,7 +24,7 @@
         <tfoot>
             <tr>
                 <th>
-                    {% trans 'Total' %}
+                    {{ 'Total' | trans }}
                 </th>
                 <th>
                     {{ totals['totobj'] }}
@@ -41,5 +41,5 @@
 </table>
 
 <div>
-    <a style="text-decoration:none" class="btn" href="{{ path('admin_display_collection', { 'bas_id' : collection.get_base_id() }) }}">{% trans 'boutton::retour' %}</a>
+    <a style="text-decoration:none" class="btn" href="{{ path('admin_display_collection', { 'bas_id' : collection.get_base_id() }) }}">{{ 'boutton::retour' | trans }}</a>
 </div>
\ No newline at end of file
diff --git a/templates/web/admin/collection/reorder.html.twig b/templates/web/admin/collection/reorder.html.twig
index fefbf8401c..844204c022 100644
--- a/templates/web/admin/collection/reorder.html.twig
+++ b/templates/web/admin/collection/reorder.html.twig
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h1>{% trans 'Reorder collections' %}</h1>
+    <h1>{{ 'Reorder collections' | trans }}</h1>
 </div>
 
 <table id="table-order">
@@ -13,9 +13,9 @@
         </td>
          <td valign="center" align="left">
              <ul style="list-style:none;">
-                <li><button class="btn" id="upbutton" disabled><i class="icon-chevron-up"></i>{% trans 'admin::base:collorder: monter' %}</button></li>
-                <li><button class="btn" id="downbutton" disabled ><i class="icon-chevron-down"></i>{% trans 'admin::base:collorder: descendre' %}</button></li>
-                <li><a href="#" id="natcase-reorder">{% trans 'admin::base:collorder: reinitialiser en ordre alphabetique' %}</a></li>
+                <li><button class="btn" id="upbutton" disabled><i class="icon-chevron-up"></i>{{ 'admin::base:collorder: monter' | trans }}</button></li>
+                <li><button class="btn" id="downbutton" disabled ><i class="icon-chevron-down"></i>{{ 'admin::base:collorder: descendre' | trans }}</button></li>
+                <li><a href="#" id="natcase-reorder">{{ 'admin::base:collorder: reinitialiser en ordre alphabetique' | trans }}</a></li>
             </ul>
         </td>
     </tr>
@@ -26,7 +26,7 @@
         <td colspan="2" valign="center" align="left">
             <div class="form-actions">
                 <button class="btn btn-primary" id="apply">
-                    {% trans 'boutton::valider' %}
+                    {{ 'boutton::valider' | trans }}
                 </button>
             </div>
         </td>
diff --git a/templates/web/admin/collection/suggested_value.html.twig b/templates/web/admin/collection/suggested_value.html.twig
index fabcad9964..306ab8e616 100644
--- a/templates/web/admin/collection/suggested_value.html.twig
+++ b/templates/web/admin/collection/suggested_value.html.twig
@@ -10,19 +10,19 @@
 </form>
 
 <div class="page-header">
-    <h1>{% trans 'Suggested values' %}</h1>
+    <h1>{{ 'Suggested values' | trans }}</h1>
 </div>
 
 
 {% if app['request'].query.get('success') == '1' %}
     <div class="alert alert-success">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        {% trans 'Successful update' %}
+        {{ 'Successful update' | trans }}
     </div>
 {% elseif app['request'].query.get('success') == '0' %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <strong>{% trans 'An error occured' %}</strong>
+        <strong>{{ 'An error occured' | trans }}</strong>
     </div>
 {% endif %}
 
@@ -31,7 +31,7 @@
         <tr>
             <td>
                 <div style='background-color:#FFFFFF'>
-                    <b>{% trans 'phraseanet::chargement' %}</b>
+                    <b>{{ 'phraseanet::chargement' | trans }}</b>
                 </div>
             </td>
         </tr>
@@ -51,7 +51,7 @@
         </td>
 
         <td style="text-align:center;height:30px;font-size:12px; border:0px;background-position: 0px 0px;background-repeat: repeat-x" nowrap>
-            {% trans 'admin::sugval: Valeurs suggerees/Preferences de la collection' %} {{ app['request'].attributes.get('bas_id')|bas_labels(app) }}
+            {{ 'admin::sugval: Valeurs suggerees/Preferences de la collection' | trans }} {{ app['request'].attributes.get('bas_id')|bas_labels(app) }}
         </td>
 
         <td style="height:30px;width:20px;font-size:12px;border:0px; text-align:right">
@@ -62,8 +62,8 @@
 
     <tr style="background-color:#aaaaaa; border:#cccccc 1px solid;"  >
         <td colspan="3" style=" border:#aaaaaa 1px solid;padding-left:3px;text-align:right">
-            <a href="#" id="linkviewxml" onClick="view('XML');return(false);" class='btn btn-mini'>{% trans 'boutton::vue xml'%}</a>
-            <a href="#" id="linkviewgraph" onClick="view('GRAPH');return(false);"  class='btn btn-mini' style="display:none">{% trans 'boutton::vue graphique'%}</a>
+            <a href="#" id="linkviewxml" onClick="view('XML');return(false);" class='btn btn-mini'>{{ 'boutton::vue xml' | trans }}</a>
+            <a href="#" id="linkviewgraph" onClick="view('GRAPH');return(false);"  class='btn btn-mini' style="display:none">{{ 'boutton::vue graphique' | trans }}</a>
         </td>
     </tr>
 
@@ -75,7 +75,7 @@
                 <table border="0" id="tabsgv" style="width:100%; background-color:#c9c9c9;">
                     <tr>
                         <td valign="top" style="text-align:center;">
-                            {% trans'admin::sugval: champs' %}
+                            {{ 'admin::sugval: champs' | trans }}
                             <select  name=usrbases id="nomchamPH" onKeyUp="javascript:write_valsug();" onChange="javascript:savenomaff();makeRestrict();maketextaffich();makeEmpty();write_valsug();"   onclick="javascript: makeRestrict();desactivall4VS(); write_valsug();" >
                                 {% for field in databox.get_meta_structure() %}
                                     {% if not field.is_readonly %}
@@ -88,10 +88,10 @@
                     <tr>
                         <td valign="top" style="text-align:center;">
                             <div class="btn-group">
-                                <input class='btn' type="submit" value="{% trans'admin::base:collorder: monter' %}" disabled onclick="javascript:modifordre(true);" id="bout_mont" name="bout_mont">
-                                <input class='btn' type="submit" value="{% trans'admin::base:collorder: descendre' %}"  disabled onclick="javascript:modifordre(false);" id="bout_desc" name="bout_desc">
-                                <input class='btn' type="submit" value="{% trans'boutton::supprimer' %}" disabled onclick="javascript:supprimer();" ondblclick="javascript:supprimer();" id="bout_supp" name="bout_supp">
-                                <input class='btn' type="submit" value="{% trans'admin::base:collorder: reinitialiser en ordre alphabetique' %}" onclick="javascript:trialph();" ondblclick="javascript:trialph();" id="bout_trialph" name="bout_trialph">
+                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: monter' | trans }}" disabled onclick="javascript:modifordre(true);" id="bout_mont" name="bout_mont">
+                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: descendre' | trans }}"  disabled onclick="javascript:modifordre(false);" id="bout_desc" name="bout_desc">
+                                <input class='btn' type="submit" value="{{ 'boutton::supprimer' | trans }}" disabled onclick="javascript:supprimer();" ondblclick="javascript:supprimer();" id="bout_supp" name="bout_supp">
+                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: reinitialiser en ordre alphabetique' | trans }}" onclick="javascript:trialph();" ondblclick="javascript:trialph();" id="bout_trialph" name="bout_trialph">
                             </div>
                         </td>
                     </tr>
@@ -108,7 +108,7 @@
                             <table style="width:100%;">
                                 <tr>
                                     <td style="width:100%"><input type="text" id="valajout" onKeyUp="verifAndactiv();" onclick="desactivall4VS();" style="width:99%"></td>
-                                    <td style="width:100px" ><input class='btn' type="submit" value="{% trans'boutton::ajouter' %}" disabled style="width:100px" onclick="javascript:ajouter();" id="bout_add" name="bout_add"></td>
+                                    <td style="width:100px" ><input class='btn' type="submit" value="{{ 'boutton::ajouter' | trans }}" disabled style="width:100px" onclick="javascript:ajouter();" id="bout_add" name="bout_add"></td>
                                 </tr>
                             </table>
                         </td>
@@ -127,7 +127,7 @@
 
         </td>
         <td style="height:30px; background-position: 0px 0px; background-repeat: repeat-x; font-size:12px;text-align:center;">
-            <b><a class='btn' href="javascript:void();" onclick="valid();return(false);"  id="genevalid" style="color:#000000; text-decoration:none">{% trans'boutton::valider' %}</a></b>
+            <b><a class='btn' href="javascript:void();" onclick="valid();return(false);"  id="genevalid" style="color:#000000; text-decoration:none">{{ 'boutton::valider' | trans }}</a></b>
         </td>
         <td style="height:30px;width:20px;font-size:12px; background-position:left ;">
         </td>
@@ -920,4 +920,4 @@ $(document).ready(function(){
     $("#iddivloading").hide();
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/templates/web/admin/dashboard.html.twig b/templates/web/admin/dashboard.html.twig
index cd874128b2..2be6fb5197 100644
--- a/templates/web/admin/dashboard.html.twig
+++ b/templates/web/admin/dashboard.html.twig
@@ -2,7 +2,7 @@
     <h2>{{ requirements.getName() }}</h2>
     <ul class="setup unstyled">
         {% if requirements.getRequirements() is not empty %}
-            <li><strong>{% trans 'Requirements' %}</strong></li>
+            <li><strong>{% trans %}Requirements{% endtrans %}</strong></li>
             {% for requirement in requirements.getRequirements() %}
                 <li class="{% if not requirement.isFulfilled() %}{% if not requirement.isOptional() %}blocker{% else %}non-blocker{% endif %}{% else %}good-enough{% endif %}">
                     {{ requirement.getTestMessage }}
@@ -16,7 +16,7 @@
             {% endfor %}
         {% endif %}
         {% if requirements.getRecommendations() is not empty %}
-            <li><strong>{% trans 'Recommendations' %}</strong></li>
+            <li><strong>{% trans %}Recommendations{% endtrans %}</strong></li>
             {% for requirement in requirements.getRecommendations() %}
                 <li class="{% if not requirement.isFulfilled() %}{% if not requirement.isOptional() %}blocker{% else %}non-blocker{% endif %}{% else %}good-enough{% endif %}">
                     {{ requirement.getTestMessage }}
@@ -30,7 +30,7 @@
             {% endfor %}
         {% endif %}
         {% if requirements.getInformations() is not empty %}
-            <li><strong>{% trans 'Informations' %}</strong></li>
+            <li><strong>{% trans %}Informations{% endtrans %}</strong></li>
             {% for information in requirements.getInformations() %}
                 <li>
                     {{ information.getName() }} : {{ information.getValue() }}
@@ -89,14 +89,14 @@
 
 {% if cache_flushed %}
     <div class="well well-small">
-        {% trans 'all caches services have been flushed' %}
+        {% trans %}all caches services have been flushed{% endtrans %}
     </div>
 {% endif %}
 
 <div class="board_section">
     <form id="admin_adder" action="{{ path('admin_dashboard_add_admins') }}" method="post" class="form-inline">
         <fieldset>
-            <legend>{% trans 'setup:: administrateurs de l\'application' %}</legend>
+            <legend>{% trans %}setup:: administrateurs de l\'application{% endtrans %}</legend>
             <ul class="unstyled">
                 {% for usr_id, usr_login in admins %}
                     <li>
@@ -108,16 +108,16 @@
                 {% endfor %}
             </ul>
             <div class="input-append" style="margin-left:20px">
-                <input class="admin_adder input-large" placeholder="{% trans 'Add an admin' %}"/>
-                <input type="submit" class="btn btn-warning" value="{% trans 'boutton::valider' %}" />
+                <input class="admin_adder input-large" placeholder="{% trans %}Add an admin{% endtrans %}"/>
+                <input type="submit" class="btn btn-warning" value="{% trans %}boutton::valider{% endtrans %}" />
             </div>
             <input type="hidden" class="new" name="admins[]" />
         </fieldset>
     </form>
     <form id="admin_reset" action="{{ path('admin_dashboard_reset_admin_rights') }}" method="post" class="form-inline" style="display:inline">
         <fieldset>
-            <legend>{% trans 'setup:: Reinitialisation des droits admins' %}</legend>
-            <input type="submit" class="btn btn-warning" value="{% trans 'boutton::reinitialiser' %}" />
+            <legend>{% trans %}setup:: Reinitialisation des droits admins{% endtrans %}</legend>
+            <input type="submit" class="btn btn-warning" value="{% trans %}boutton::reinitialiser{% endtrans %}" />
         </fieldset>
     </form>
 </div>
@@ -126,16 +126,16 @@
     <div class="section">
         <form id="mail_checker" method="post" action="{{ path('admin_dashboard_test_mail') }}" target="_self" class="form-inline">
             <fieldset>
-                <legend>{% trans 'setup::Tests d\'envois d\'emails' %}</legend>
+                <legend>{% trans %}setup::Tests d\'envois d\'emails{% endtrans %}</legend>
                 <div class="input-append">
-                    <input name="email" class="span3" id="appendedInputButton" type="text" placeholder="{% trans %}Email{% endtrans %}">
-                    <input type="submit" class="btn btn-warning" value="{% trans 'Send' %}"/>
+                    <input class="span3" id="appendedInputButton" type="text" placeholder="{% trans %}Email{% endtrans %}">
+                    <input type="submit" class="btn btn-warning" value="{% trans %}Send{% endtrans %}"/>
                 </div>
             </fieldset>
         </form>
         {% if email_status %}
             <div class="alert-info">
-                <p>{% trans %}Email test result : {{ email_status }}{% endtrans %}</p>
+                <p>{% trans with { '%email_status%' : email_status } %}Email test result : %email_status%{% endtrans %}</p>
             </div>
         {% endif %}
     </div>
diff --git a/templates/web/admin/databases.html.twig b/templates/web/admin/databases.html.twig
index 7d8ea95060..94ff6ae3db 100644
--- a/templates/web/admin/databases.html.twig
+++ b/templates/web/admin/databases.html.twig
@@ -7,12 +7,12 @@
 {% if app['request'].query.get('success') == '1' %}
     <div class="alert alert-success">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        {% trans 'Successful update' %}
+        {{ 'Successful update' | trans }}
     </div>
 {% elseif app['request'].query.get('success') == '0' %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <strong>{% trans 'An error occured' %}</strong>
+        <strong>{{ 'An error occured' | trans }}</strong>
         {% if error_msg is not none %}
             {{ error_msg }}
         {% endif %}
@@ -22,7 +22,7 @@
 {% if app['request'].query.get('notice') == 'restart' %}
     <div class="alert">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        {% trans 'Do not forget to restart the tasks scheduler' %}
+        {{ 'Do not forget to restart the tasks scheduler' | trans }}
     </div>
 {% endif %}
 
@@ -33,7 +33,7 @@
             {% for key, value in sbas %}
                 <li>
                     <a href='{{ path('admin_database', {'databox_id': key}) }}' target='_self'>
-                      <img src="{{ value['image'] }}" /> {{ value['name'] }} ({% trans "version" %} {{ value['version'] }}) {{ value['server_info'] }}
+                      <img src="{{ value['image'] }}" /> {{ value['name'] }} ({{ "version" | trans }} {{ value['version'] }}) {{ value['server_info'] }}
                     </a>
                 </li>
             {% endfor %}
@@ -45,12 +45,12 @@
 
 {% if app['acl'].get(app['authentication'].getUser()).is_admin() %}
     <div class="db_infos">
-        <h2>{% trans 'admin::base: Version' %}</h2>
+        <h2>{{ 'admin::base: Version' | trans }}</h2>
 
         {% if not app['phraseanet.configuration-tester'].isUpToDate() %}
-            <p>{% trans 'update::Votre application necessite une mise a jour vers : ' %} {{ app['phraseanet.version'].getNumber() }}</p>
+            <p>{{ 'update::Votre application necessite une mise a jour vers : ' | trans }} {{ app['phraseanet.version'].getNumber() }}</p>
         {% else %}
-            <p>{% trans 'update::Votre version est a jour : ' %} {{ app['phraseanet.version'].getNumber() }}</p>
+            <p>{{ 'update::Votre version est a jour : ' | trans }} {{ app['phraseanet.version'].getNumber() }}</p>
         {% endif %}
 
         {% if recommendations | length > 0%}
@@ -63,7 +63,7 @@
         {% endif %}
 
         {% if advices | length > 0 %}
-            <b>{% trans 'Propositions de modifications des tables' %}</b>
+            <b>{{ 'Propositions de modifications des tables' | trans }}</b>
             {% for advice in advices %}
                 <blockquote>{{ advice['sql'] }}</blockquote>
             {% endfor %}
@@ -71,31 +71,31 @@
 
         <form action="{{ path('admin_databases_upgrade') }}" method="post" >
             <input type="hidden" value="" name="upgrade" />
-            <input type="submit" class="btn btn-warning" value="{% trans 'update::Verifier els tables' %}" />
+            <input type="submit" class="btn btn-warning" value="{{ 'update::Verifier els tables' | trans }}" />
         </form>
     </div>
 
     <div class="db_infos">
-        <h2>{% trans 'admin::base: creer une base' %}</h2>
+        <h2>{{ 'admin::base: creer une base' | trans }}</h2>
         <div id="create_base">
             <form class="form-vertical" method="post" action="{{ path('admin_database_new') }}">
                 <label class="checkbox">
                     <input type="checkbox" name="new_settings" onchange="if(this.checked == true)$('#server_opts').slideDown();else $('#server_opts').slideUp();" />
-                    {% trans 'phraseanet:: Creer une base sur un serveur different de l\'application box' %}
+                    {{ 'phraseanet:: Creer une base sur un serveur different de l\'application box' | trans }}
                 </label>
                 <div id="server_opts" style="display:none;">
-                    <label>{% trans 'phraseanet:: hostname' %}</label>
+                    <label>{{ 'phraseanet:: hostname' | trans }}</label>
                     <input name="new_hostname" value="" type="text" />
-                    <label>{% trans 'phraseanet:: port' %}</label>
+                    <label>{{ 'phraseanet:: port' | trans }}</label>
                     <input name="new_port" value="3306" type="text" />
-                    <label>{% trans 'phraseanet:: user' %}</label>
+                    <label>{{ 'phraseanet:: user' | trans }}</label>
                     <input name="new_user" value="" type="text" />
-                    <label>{% trans 'phraseanet:: password' %}</label>
+                    <label>{{ 'phraseanet:: password' | trans }}</label>
                     <input name="new_password" value="" type="password" />
                 </div>
-                <label>{% trans 'phraseanet:: dbname' %}</label>
+                <label>{{ 'phraseanet:: dbname' | trans }}</label>
                 <input name="new_dbname" value="" type="text" />
-                <label>{% trans 'phraseanet:: Modele de donnees' %}</label>
+                <label>{{ 'phraseanet:: Modele de donnees' | trans }}</label>
                 <select name="new_data_template">
                     {% for file in files %}
                         {% if file.isFile() %}
@@ -103,33 +103,33 @@
                         {% endif %}
                     {% endfor %}
                 </select>
-                <input type="submit" class="btn" value="{% trans 'boutton::creer' %}" />
+                <input type="submit" class="btn" value="{{ 'boutton::creer' | trans }}" />
             </form>
         </div>
     </div>
 
     <div class="db_infos">
-        <h2>{% trans 'admin::base: Monter une base' %}</h2>
+        <h2>{{ 'admin::base: Monter une base' | trans }}</h2>
         <div id="mount_base">
             <form method="post" action="{{ path('admin_database_mount') }}">
                 <label class="checkbox">
                     <input type="checkbox" name="new_settings" onchange="if(this.checked == true)$('#servermount_opts').slideDown();else $('#servermount_opts').slideUp();" />
-                    {% trans "phraseanet:: Monter une base provenant d\'un serveur different de l\'application box" %}
+                    {{ "phraseanet:: Monter une base provenant d\'un serveur different de l\'application box" | trans }}
                 </label>
                 <div id="servermount_opts" style="display:none;">
-                    <label>{% trans 'phraseanet:: hostname' %}</label>
+                    <label>{{ 'phraseanet:: hostname' | trans }}</label>
                     <input name="new_hostname" value="" type="text" />
-                    <label>{% trans 'phraseanet:: port' %}</label>
+                    <label>{{ 'phraseanet:: port' | trans }}</label>
                     <input name="new_port" value="3306" type="text" />
-                    <label>{% trans 'phraseanet:: user' %}</label>
+                    <label>{{ 'phraseanet:: user' | trans }}</label>
                     <input name="new_user" value="" type="text" />
-                    <label>{% trans 'phraseanet:: password' %}</label>
+                    <label>{{ 'phraseanet:: password' | trans }}</label>
                     <input name="new_password" value="" type="password" />
                 </div>
-                <label>{% trans 'phraseanet:: dbname' %}</label>
+                <label>{{ 'phraseanet:: dbname' | trans }}</label>
                 <input type="text" name="new_dbname" value="" />
                 <input type="hidden" name="mount_base" value="yes" />
-                <input type="submit" class="btn" value="{% trans 'boutton::monter' %}" />
+                <input type="submit" class="btn" value="{{ 'boutton::monter' | trans }}" />
             </form>
         </div>
     </div>
diff --git a/templates/web/admin/databox/cgus.html.twig b/templates/web/admin/databox/cgus.html.twig
index c56eb79c90..ec601c40dc 100644
--- a/templates/web/admin/databox/cgus.html.twig
+++ b/templates/web/admin/databox/cgus.html.twig
@@ -1,14 +1,14 @@
 <div class="page-header">
-    <h1>{% trans'Terms Of Use' %}</h1>
+    <h1>{{ 'Terms Of Use' | trans }}</h1>
 </div>
 
 <form target="_self" method="post" action="{{ path('admin_database_submit_cgus', {'databox_id': app['request'].attributes.get('databox_id')}) }}" class="form-inline">
     <div class='well'>
         <label for="valid" class='checkbox'>
             <input type="checkbox" value="1" id="valid" name="valid"/>
-            {% trans'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' %}
+            {{ 'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' | trans }}
         </label>
-        <input class='btn btn-warning' type="submit" value="{% trans'Mettre a jour' %}"/>
+        <input class='btn btn-warning' type="submit" value="{{ 'Mettre a jour' | trans }}"/>
     </div>
     <div id="tabs">
         <ul>
diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig
index f4c79c452e..b68ed80ff6 100644
--- a/templates/web/admin/databox/databox.html.twig
+++ b/templates/web/admin/databox/databox.html.twig
@@ -11,12 +11,12 @@
 {% if app['request'].query.get('success') == '1' %}
     <div class="alert alert-success">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        {% trans 'forms::operation effectuee OK' %}
+        {{ 'forms::operation effectuee OK' | trans }}
     </div>
 {% elseif app['request'].query.get('success') == '0' %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <strong>{% trans 'An error occured' %}</strong>
+        <strong>{{ 'An error occured' | trans }}</strong>
         {% if errorMsg is not none %}
             {{ errorMsg }}
         {% endif %}
@@ -29,14 +29,14 @@
     </li>
 
     <li>
-        {% trans 'admin::base: Alias' %} : <span id="viewname">{{ databox.get_label(app['locale.I18n']) }}</span>
+        {{ 'admin::base: Alias' | trans }} : <span id="viewname">{{ databox.get_label(app['locale.I18n']) }}</span>
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_sbas(databox.get_sbas_id(), "bas_manage") %}
             <img src="/skins/icons/edit_0.gif" id="show-view-name" />
             <div class="well well-small" id="change-view-name" style="display:none;">
                 <form method="post" action="{{ path('admin_database_rename', {'databox_id': databox.get_sbas_id()}) }}">
                     <div class="input-append">
                         <input id="db-view-name" name="viewname" class="span2" type="text" size="16">
-                        <button class="btn" type="submit">{% trans 'Rename' %}</button>
+                        <button class="btn" type="submit">{{ 'Rename' | trans }}</button>
                     </div>
                 </form>
             </div>
@@ -44,24 +44,24 @@
     </li>
 
     <li>
-        {% trans 'admin::base: nombre d\'enregistrements sur la base :' %}
+        {{ 'admin::base: nombre d\'enregistrements sur la base :' | trans }}
         <span id="nrecords">{{ databox.get_record_amount() }}</span>
 
-        (<a href="{{ path('admin_database_display_document_details', {'databox_id': databox.get_sbas_id()}) }}" class="ajax" target="rights">{% trans 'phraseanet:: details'%}</a>)
+        (<a href="{{ path('admin_database_display_document_details', {'databox_id': databox.get_sbas_id()}) }}" class="ajax" target="rights">{{ 'phraseanet:: details' | trans }}</a>)
     </li>
 
     {% if showDetail %}
         <li>
-            {% trans 'admin::base: nombre de mots uniques sur la base : ' %}
+            {{ 'admin::base: nombre de mots uniques sur la base : ' | trans }}
             {{ databox.get_unique_keywords() }}
         </li>
         <li>
-            {% trans 'admin::base: nombre de mots indexes sur la base' %}
+            {{ 'admin::base: nombre de mots indexes sur la base' | trans }}
             {{ databox.get_index_amount() }}
         </li>
         {% if app['phraseanet.registry'].get('GV_thesaurus') %}
             <li>
-            {% trans 'admin::base: nombre de termes de Thesaurus indexes :' %}
+            {{ 'admin::base: nombre de termes de Thesaurus indexes :' | trans }}
             {{ databox.get_thesaurus_hits() }}
             </li>
         {% endif %}
@@ -71,7 +71,7 @@
 <div id="INDEX_P_BAR" style="margin-bottom:20px;">
     <div style="height: 35px;">
         <p>
-            {% trans "admin::base: document indexes en utilisant la fiche xml" %} :
+            {{ "admin::base: document indexes en utilisant la fiche xml" | trans }} :
             <span id="xml_indexed"></span>
         </p>
         <div id="xml_indexed_bar"></div>
@@ -79,7 +79,7 @@
     </div>
     <div style="height: 35px;">
         <p>
-            {% trans "admin::base: document indexes en utilisant le thesaurus" %} :
+            {{ "admin::base: document indexes en utilisant le thesaurus" | trans }} :
             <span id="thesaurus_indexed"></span>
         </p>
         <div id="thesaurus_indexed_bar"></div>
@@ -92,7 +92,7 @@
          <form method="post" action="{{ path('admin_database_set_indexable', {'databox_id': databox.get_sbas_id()}) }}" style="margin:0;">
              <label class="checkbox" for="is_indexable">
                 <input type="checkbox" id="is_indexable" name="indexable" value="1" {{ app['phraseanet.appbox'].is_databox_indexable(databox) ? 'checked' : ''}} />
-                {% trans "admin::base: Cette base est indexable" %}
+                {{ "admin::base: Cette base est indexable" | trans }}
             </label>
         </form>
     </div>
@@ -116,7 +116,7 @@
                     <div class="span2">
                         <button class="btn" type="submit">
                             <img src="/skins/icons/edit_0.gif" />
-                            {% trans 'Set labels' %}
+                            {{ 'Set labels' | trans }}
                         </button>
                     </div>
                 </div>
@@ -127,42 +127,42 @@
     <div class="well well-small">
         <a style="display:inline-block; margin-right:3px; text-decoration: none;" target="right" class="ajax btn" href="{{ path('admin_database_display_new_collection_form', {'databox_id': databox.get_sbas_id()}) }}">
             <img src="/skins/icons/create_coll.png" />
-            {% trans "admin::base:collection: Creer une collection" %}
+            {{ "admin::base:collection: Creer une collection" | trans }}
         </a>
 
         <form style="display:inline;" method="post" action="{{ path('admin_database_clear_logs', {'databox_id': databox.get_sbas_id()}) }}">
             <button type="button" class="btn submiter confirm"
-                    data-confirm-msg="{% trans 'admin::base: Confirmer la suppression de tous les logs' %}">
+                    data-confirm-msg="{{ 'admin::base: Confirmer la suppression de tous les logs' | trans }}">
                 <img src="/skins/icons/clearLogs.png" />
-                {% trans "admin::base: supprimer tous les logs" %}
+                {{ "admin::base: supprimer tous les logs" | trans }}
             </button>
         </form>
 
         <form style="display:inline;" method="post" action="{{ path('admin_database_unmount', {'databox_id': databox.get_sbas_id()}) }}">
-            <button class="btn confirm" data-confirm-msg="{% trans 'admin::base: Confirmer vous l\'arret de la publication de la base' %}">
+            <button class="btn confirm" data-confirm-msg="{{ 'admin::base: Confirmer vous l\'arret de la publication de la base' | trans }}">
                 <img src="/skins/icons/db-remove.png" />
-                {% trans "admin::base: arreter la publication de la base" %}
+                {{ "admin::base: arreter la publication de la base" | trans }}
             </button>
         </form>
 
         <form style="display:inline;" method="post" action="{{ path('admin_database_empty', {'databox_id': databox.get_sbas_id()}) }}">
-            <button type="button" class="btn submiter confirm" data-confirm-msg="{% trans 'admin::base: Confirmer le vidage complet de la base' %}">
+            <button type="button" class="btn submiter confirm" data-confirm-msg="{{ 'admin::base: Confirmer le vidage complet de la base' | trans }}">
                 <img src="/skins/icons/trash.png" />
-                {% trans "admin::base: vider la base" %}
+                {{ "admin::base: vider la base" | trans }}
             </button>
         </form>
 
          <form style="display:inline;" method="post" action="{{ path('admin_database_delete', {'databox_id': databox.get_sbas_id()}) }}">
-            <button type="button" class="btn submiter confirm reload-tree" data-confirm-msg="{% trans 'admin::base: Confirmer la suppression de la base' %}">
+            <button type="button" class="btn submiter confirm reload-tree" data-confirm-msg="{{ 'admin::base: Confirmer la suppression de la base' | trans }}">
                 <img src="/skins/icons/delete.gif" />
-                {% trans "admin::base: supprimer la base" %}
+                {{ "admin::base: supprimer la base" | trans }}
             </button>
          </form>
     </div>
 
     <form method="post" action="{{ path('admin_database_reindex', {'databox_id': databox.get_sbas_id()}) }}">
-        <button type="button" class="btn submiter confirm" data-confirm-msg="{% trans 'Confirmez-vous la re-indexation de la base ?' %}">
-            {% trans "base:: re-indexer" %}
+        <button type="button" class="btn submiter confirm" data-confirm-msg="{{ 'Confirmez-vous la re-indexation de la base ?' | trans }}">
+            {{ "base:: re-indexer" | trans }}
         </button>
     </form>
 
@@ -170,18 +170,18 @@
         <div class="well well-small">
             <a href="#" class="btn" id="show-mount-coll">
                 <img src="/skins/icons/create_coll.png" />
-                {% trans "admin::base:collection: Monter une collection" %}
+                {{ "admin::base:collection: Monter une collection" | trans }}
             </a>
             <div class="well well-small" id="mount-coll" style="display:none;">
                 <ul>
                 {% for collId, name in databox.get_mountable_colls() %}
                     <li>
                         <form class="form-inline" method="post" action="{{ path('admin_database_mount_collection', {'databox_id': databox.get_sbas_id(), 'collection_id' : collId }) }}">
-                            {% trans "Monter" %} {{ name }}
+                            {{ "Monter" | trans }} {{ name }}
                             {% if app['acl'].get(app['authentication'].getUser()).get_granted_base(["canadmin"]) | length > 0 %}
-                                <label for="othcollsel">{% trans "admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces " %}</label>
+                                <label for="othcollsel">{{ "admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces " | trans }}</label>
                                 <select id="othcollsel" name="othcollsel" >
-                                    <option>{% trans "choisir" %}</option>
+                                    <option>{{ "choisir" | trans }}</option>
                                     {% for collection in databox.get_collections() %}
                                         <option value="{{ collection.get_base_id() }}">{{ collection. get_name() }}</option>
                                     {% endfor %}
@@ -189,7 +189,7 @@
                             {% endif %}
                             <a href="#" class="btn btn-mini submiter">
                                 <img src="/skins/icons/create_coll.png" />
-                                {% trans "admin::base:collection: Monter une collection" %}
+                                {{ "admin::base:collection: Monter une collection" | trans }}
                             </a>
                         </form>
                     </li>
@@ -204,7 +204,7 @@
         <div class="well well-small">
             <a href="#" class="btn" id="show-activate-coll">
                 <img src="/skins/icons/create_coll.png"/>
-                {% trans "Activer une collection" %}
+                {{ "Activer une collection" | trans }}
             </a>
             <div class="well well-small" id="activate-coll" style="display:none;">
                 <ul>
@@ -212,7 +212,7 @@
                     <li>
                         <form class='form-inline' method="post" action="{{ path('admin_collection_enable', {'bas_id': baseId}) }}">
                             {{ baseId|bas_labels(app) }}
-                            <a href="#" class="btn btn-mini submiter">{% trans "Activer" %}></a>
+                            <a href="#" class="btn btn-mini submiter">{{ "Activer" | trans }}></a>
                         </form>
                     </li>
                 {% endfor %}
@@ -224,20 +224,20 @@
 
 <div class="logo_box">
     <hr>
-    <h4>{% trans "admin::base: logo impression PDF" %}</h4>
+    <h4>{{ "admin::base: logo impression PDF" | trans }}</h4>
     <div id="printLogoDIV_OK">
         <img class="thumbnail" id="printLogo" src="/custom/minilogos/logopdf_{{ databox.get_sbas_id() }}.jpg" />
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_sbas(databox.get_sbas_id(), "bas_manage") %}
             <form method="post" target="right" action="{{ path('admin_database_delete_logo', {'databox_id': databox.get_sbas_id()}) }}" >
-                <button class="btn btn-mini btn-danger">{% trans "admin::base:collection: supprimer le logo" %}</button>
+                <button class="btn btn-mini btn-danger">{{ "admin::base:collection: supprimer le logo" | trans }}</button>
             </form>
         {% endif %}
     </div>
     <div id="printLogoDIV_NONE">
-        {% trans "admin::base:collection: aucun fichier (minilogo, watermark ...)" %}
+        {{ "admin::base:collection: aucun fichier (minilogo, watermark ...)" | trans }}
         {% if app['acl'].get(app['authentication'].getUser()).has_right_on_sbas(databox.get_sbas_id(), "bas_manage") %}
             <input id="fileupload" class="no-ajax" type="file" name="newLogoPdf" data-url="{{ path('admin_database_submit_logo', {'databox_id': databox.get_sbas_id()}) }}" accept="image/jpg, image/jpeg">
-            <i>{% trans "admin::base: envoyer un logo (jpeg 35px de hauteur max)" %}</i>
+            <i>{{ "admin::base: envoyer un logo (jpeg 35px de hauteur max)" | trans }}</i>
         {% endif %}
     </div>
 </div>
@@ -252,7 +252,7 @@
             data: {},
             success: function(data){
                 if(data.viewname === '') {
-                    $("#viewname").html("{% trans 'admin::base: aucun alias' %}");
+                    $("#viewname").html("{{ 'admin::base: aucun alias' | trans }}");
                 } else {
                     $("#viewname").html(data.viewname);
                 }
diff --git a/templates/web/admin/databox/details.html.twig b/templates/web/admin/databox/details.html.twig
index 271aa140a7..d57c551085 100644
--- a/templates/web/admin/databox/details.html.twig
+++ b/templates/web/admin/databox/details.html.twig
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h1>{{ databox.get_serialized_server_info() }}<small style="font-size:16px;">{% trans "Details" %}</small></h1>
+    <h1>{{ databox.get_serialized_server_info() }}<small style="font-size:16px;">{{ "Details" | trans }}</small></h1>
 </div>
 
 <table class="table table-bordered detail-table">
@@ -9,18 +9,18 @@
                 {% if app['request'].query.get('sort') == 'col' %}
                     <img src="/skins/icons/tsort_desc.gif">
                 {% endif %}
-                {% trans 'Collection' %}
+                {{ 'Collection' | trans }}
             </th>
 
             <th class="obj">
                 {% if app['request'].query.get('sort') == 'obj' %}
                     <img src="/skins/icons/tsort_desc.gif">
                 {% endif %}
-                {% trans 'Subdef' %}
+                {{ 'Subdef' | trans }}
             </th>
 
-            <th>{% trans 'Number' %}</th>
-            <th>{% trans 'Weight' %}</th>
+            <th>{{ 'Number' | trans }}</th>
+            <th>{{ 'Weight' | trans }}</th>
         </tr>
     </thead>
     <tbody>
@@ -61,5 +61,5 @@
 </table>
 
 <div>
-    <a style="text-decoration:none" class="btn" href="{{ path('admin_database', { 'databox_id' : databox.get_sbas_id() }) }}">{% trans 'boutton::retour' %}</a>
+    <a style="text-decoration:none" class="btn" href="{{ path('admin_database', { 'databox_id' : databox.get_sbas_id() }) }}">{{ 'boutton::retour' | trans }}</a>
 </div>
\ No newline at end of file
diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index bd07ab7253..13e096a08a 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -95,11 +95,11 @@
   <div class="tabs PNB" style="bottom:40px;">
     <ul>
       <li>
-        <a href="#rights_tab">{% trans 'Rights' %}</a>
+        <a href="#rights_tab">{{ 'Rights' | trans }}</a>
       </li>
       {% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
       <li>
-        <a href="#user_infos_tab">{% trans 'Infos' %}</a>
+        <a href="#user_infos_tab">{{ 'Infos' | trans }}</a>
       </li>
       {% endif %}
     </ul>
@@ -113,9 +113,9 @@
 
                 {% if main_user.is_special is not empty %}
                   {% if main_user.get_login() == 'invite' %}
-                    {% trans 'Reglages:: reglages d acces guest' %}
+                    {{ 'Reglages:: reglages d acces guest' | trans }}
                   {% elseif main_user.get_login() == 'autoregister' %}
-                    {% trans 'Reglages:: reglages d inscitpition automatisee' %}
+                    {{ 'Reglages:: reglages d inscitpition automatisee' | trans }}
                   {% endif %}
                 {% else %}
                   {% set display_name = main_user.get_display_name() %}
@@ -131,14 +131,14 @@
               {% endif %}
             </td>
             <td style="text-align:right;">
-              {% trans 'Apply a template' %}
+              {{ 'Apply a template' | trans }}
               <select name="template">
-                <option value="">{% trans 'boutton::choisir' %}</option>
+                <option value="">{{ 'boutton::choisir' | trans }}</option>
                 {% for template in templates %}
                 <option value="{{ template.get_id() }}">{{ template.get_display_name() }}</option>
                 {% endfor %}
               </select>
-               <button class="btn" type='button' id='reset_rights'>{% trans 'Delete all users rights' %}</button>
+               <button class="btn" type='button' id='reset_rights'>{{ 'Delete all users rights' | trans }}</button>
             </td>
           </tr>
         </table>
@@ -325,16 +325,16 @@
                     <input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
                   </div>
                 </td>
-                <td style="text-align:center;width:19px;" title="{% trans 'Allowed to publish' %}">
+                <td style="text-align:center;width:19px;" title="{{ 'Allowed to publish' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'bas_chupub', users, 'sbas')}}
                 </td>
-                <td style="text-align:center;width:19px;" title="{% trans 'Manage Thesaurus' %}">
+                <td style="text-align:center;width:19px;" title="{{ 'Manage Thesaurus' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'bas_modif_th', users, 'sbas')}}
                 </td>
-                <td style="text-align:center;width:19px;" title="{% trans 'Manage Database' %}">
+                <td style="text-align:center;width:19px;" title="{{ 'Manage Database' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'bas_manage', users, 'sbas')}}
                 </td>
-                <td style="text-align:center;width:19px;" title="{% trans 'Manage DB fields' %}">
+                <td style="text-align:center;width:19px;" title="{{ 'Manage DB fields' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'bas_modify_struct', users, 'sbas')}}
                 </td>
                 <td style="text-align:center;width:48px;"></td>
@@ -344,28 +344,28 @@
                 <td style="overflow:hidden;white-space:nowrap;">
                   {{rights['base_id']|bas_labels(app)}}
                 </td>
-                <td class="users_col case_right_access" title="{% trans 'Access' %}">
+                <td class="users_col case_right_access" title="{{ 'Access' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'access', users, 'base')}}
                 </td>
-                <td class="users_col case_right_actif" title="{% trans 'Active' %}">
+                <td class="users_col case_right_actif" title="{{ 'Active' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'actif', users, 'base')}}
                 </td>
-                <td class="users_col case_right_canputinalbum" title="{% trans 'Allowed to add in basket' %}">
+                <td class="users_col case_right_canputinalbum" title="{{ 'Allowed to add in basket' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canputinalbum', users, 'base')}}
                 </td>
-                <td class="users_col case_right_candwnldpreview" title="{% trans 'Access to preview' %}">
+                <td class="users_col case_right_candwnldpreview" title="{{ 'Access to preview' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'candwnldpreview', users, 'base')}}
                 </td>
-                <td class="users_col case_right_nowatermark" title="{% trans 'Remove watermark' %}">
+                <td class="users_col case_right_nowatermark" title="{{ 'Remove watermark' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'nowatermark', users, 'base')}}
                 </td>
-                <td class="users_col case_right_candwnldhd" title="{% trans 'Access to HD' %}">
+                <td class="users_col case_right_candwnldhd" title="{{ 'Access to HD' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'candwnldhd', users, 'base')}}
                 </td>
-                <td class="users_col case_right_cancmd" title="{% trans 'Allowed to order' %}">
+                <td class="users_col case_right_cancmd" title="{{ 'Allowed to order' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'cancmd', users, 'base')}}
                 </td>
-                <td class="users_col case_right_quota" title="{% trans 'Set download quotas' %}">
+                <td class="users_col case_right_quota" title="{{ 'Set download quotas' | trans }}">
                   <div class="quota_trigger quota_{{rights['base_id']}} base_{{rights['base_id']}}">
                     {% if rights['restrict_dwnld'] > 0 %}
                     <img src="/skins/icons/user_details_on.png" />
@@ -375,7 +375,7 @@
                     <input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/>
                   </div>
                 </td>
-                <td class="users_col case_right_time" title="{% trans 'Set time restrictions' %}">
+                <td class="users_col case_right_time" title="{{ 'Set time restrictions' | trans }}">
                   <div class="time_trigger time_{{rights['base_id']}} base_{{rights['base_id']}}">
                     {% if rights['time_limited'] > 0 %}
                     <img src="/skins/icons/user_details_on.png" />
@@ -385,7 +385,7 @@
                     <input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/>
                   </div>
                 </td>
-                <td class="users_col case_right_masks" title="{% trans 'Set statuses restrictions' %}">
+                <td class="users_col case_right_masks" title="{{ 'Set statuses restrictions' | trans }}">
                   <div class="masks_trigger quotatime_{{rights['base_id']}} base_{{rights['base_id']}}">
                     {% if rights['masks'] > 0 %}
                     <img src="/skins/icons/user_details_on.png" />
@@ -398,34 +398,34 @@
 
                 <td style="text-align:center;width:100px;"></td>
 
-                <td class="users_col case_right_canaddrecord" title="{% trans 'Allowed to add' %}">
+                <td class="users_col case_right_canaddrecord" title="{{ 'Allowed to add' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canaddrecord', users, 'base')}}
                 </td>
-                <td class="users_col case_right_canmodifrecord" title="{% trans 'Allowed to edit' %}">
+                <td class="users_col case_right_canmodifrecord" title="{{ 'Allowed to edit' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canmodifrecord', users, 'base')}}
                 </td>
-                <td class="users_col case_right_chgstatus" title="{% trans 'Allowed to change statuses' %}">
+                <td class="users_col case_right_chgstatus" title="{{ 'Allowed to change statuses' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'chgstatus', users, 'base')}}
                 </td>
-                <td class="users_col case_right_candeleterecord" title="{% trans 'Allowed to delete' %}">
+                <td class="users_col case_right_candeleterecord" title="{{ 'Allowed to delete' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'candeleterecord', users, 'base')}}
                 </td>
-                <td class="users_col case_right_imgtools" title="{% trans 'Access to image tools' %}">
+                <td class="users_col case_right_imgtools" title="{{ 'Access to image tools' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'imgtools', users, 'base')}}
                 </td>
-                <td class="users_col case_right_canadmin" title="{% trans 'Manage users' %}">
+                <td class="users_col case_right_canadmin" title="{{ 'Manage users' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canadmin', users, 'base')}}
                 </td>
-                <td class="users_col case_right_canreport" title="{% trans 'Allowed to access report' %}">
+                <td class="users_col case_right_canreport" title="{{ 'Allowed to access report' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canreport', users, 'base')}}
                 </td>
-                <td class="users_col case_right_canpush" title="{% trans 'Allowed to push' %}">
+                <td class="users_col case_right_canpush" title="{{ 'Allowed to push' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'canpush', users, 'base')}}
                 </td>
-                <td class="users_col case_right_manage" title="{% trans 'Manage collection' %}">
+                <td class="users_col case_right_manage" title="{{ 'Manage collection' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'manage', users, 'base')}}
                 </td>
-                <td class="users_col case_right_modify" title="{% trans 'Manage values lists' %}">
+                <td class="users_col case_right_modify" title="{{ 'Manage values lists' | trans }}">
                   {{_self.format_checkbox(app['authentication'].getUser(), rights, 'modify_struct', users, 'base')}}
                 </td>
                 <td colspan="5">
@@ -445,7 +445,7 @@
         <table>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur identifiant' %}
+              {{ 'admin::compte-utilisateur identifiant' | trans }}
             </td>
             <td>
               <input type="text" value="{{main_user.get_login()}}" readonly="readonly" />
@@ -453,19 +453,19 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur sexe' %}
+              {{ 'admin::compte-utilisateur sexe' | trans }}
             </td>
             <td>
               <select name="gender">
-                <option {% if main_user.get_gender() == 0 %}selected="selected"{% endif %} value="0" >{% trans 'admin::compte-utilisateur:sexe: mademoiselle' %}</option>
-                <option {% if main_user.get_gender() == 1 %}selected="selected"{% endif %} value="1" >{% trans 'admin::compte-utilisateur:sexe: madame' %}</option>
-                <option {% if main_user.get_gender() == 2 %}selected="selected"{% endif %} value="2" >{% trans 'admin::compte-utilisateur:sexe: monsieur' %}</option>
+                <option {% if main_user.get_gender() == 0 %}selected="selected"{% endif %} value="0" >{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
+                <option {% if main_user.get_gender() == 1 %}selected="selected"{% endif %} value="1" >{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
+                <option {% if main_user.get_gender() == 2 %}selected="selected"{% endif %} value="2" >{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
               </select>
             </td>
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur prenom' %}
+              {{ 'admin::compte-utilisateur prenom' | trans }}
             </td>
             <td>
               <input type="text" name="first_name" value="{{main_user.get_firstname()}}"/>
@@ -473,7 +473,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur nom' %}
+              {{ 'admin::compte-utilisateur nom' | trans }}
             </td>
             <td>
               <input type="text" name="last_name" value="{{main_user.get_lastname()}}"/>
@@ -481,7 +481,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur email' %}
+              {{ 'admin::compte-utilisateur email' | trans }}
             </td>
             <td>
               <input type="text" name="email" value="{{main_user.get_email()}}"/>
@@ -489,7 +489,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur adresse' %}
+              {{ 'admin::compte-utilisateur adresse' | trans }}
             </td>
             <td>
               <input type="text" name="address" value="{{main_user.get_address()}}"/>
@@ -497,7 +497,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur code postal' %}
+              {{ 'admin::compte-utilisateur code postal' | trans }}
             </td>
             <td>
               <input type="text" name="zip" value="{{main_user.get_zipcode()}}"/>
@@ -505,7 +505,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur ville' %}
+              {{ 'admin::compte-utilisateur ville' | trans }}
             </td>
             <td>
               <input type="text" value="{{ main_user.get_geonameid() }}" class="geoname_field" name="geonameid" />
@@ -513,7 +513,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur poste' %}
+              {{ 'admin::compte-utilisateur poste' | trans }}
             </td>
             <td>
               <input type="text" name="function" value="{{main_user.get_position()}}"/>
@@ -521,7 +521,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur societe' %}
+              {{ 'admin::compte-utilisateur societe' | trans }}
             </td>
             <td>
               <input type="text" name="company" value="{{main_user.get_company()}}"/>
@@ -529,7 +529,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur activite' %}
+              {{ 'admin::compte-utilisateur activite' | trans }}
             </td>
             <td>
               <input type="text" name="activite" value="{{main_user.get_job()}}"/>
@@ -538,7 +538,7 @@
 
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur telephone' %}
+              {{ 'admin::compte-utilisateur telephone' | trans }}
             </td>
             <td>
               <input type="text" name="telephone" value="{{main_user.get_tel()}}"/>
@@ -546,7 +546,7 @@
           </tr>
           <tr>
             <td>
-              {% trans 'admin::compte-utilisateur fax' %}
+              {{ 'admin::compte-utilisateur fax' | trans }}
             </td>
             <td>
               <input type="text" name="fax" value="{{main_user.get_fax()}}"/>
@@ -558,8 +558,8 @@
     {% endif %}
   </div>
   <div class="PNB10" style="top:auto;height:20px;">
-    <button class="users_rights_valid btn">{% trans 'boutton::valider' %}</button>
-    <a href="{{ path('admin_users_search') }}" class="users_rights_cancel btn" style="text-decoration:none">{% trans 'boutton::retour' %}</a>
+    <button class="users_rights_valid btn">{{ 'boutton::valider' | trans }}</button>
+    <a href="{{ path('admin_users_search') }}" class="users_rights_cancel btn" style="text-decoration:none">{{ 'boutton::retour' | trans }}</a>
   </div>
 </div>
 
@@ -576,7 +576,7 @@
     $('div.tabs').tabs();
 
     $('#users_rights_form button#reset_rights').bind('click', function(){
-        if(confirm("{% trans 'Are you sure you want to reset rights?' %}"))
+        if(confirm("{{ 'Are you sure you want to reset rights?' | trans }}"))
         {
           var users = $('#users_rights_form input[name="users"]').val();
 
diff --git a/templates/web/admin/editusers_quotas.html.twig b/templates/web/admin/editusers_quotas.html.twig
index 330997f154..0e9a321aec 100644
--- a/templates/web/admin/editusers_quotas.html.twig
+++ b/templates/web/admin/editusers_quotas.html.twig
@@ -36,7 +36,7 @@
 {% endif %}
 
 
-<h1>{% trans 'Quotas' %}</h1>
+<h1>{{ 'Quotas' | trans }}</h1>
 <div>
 {% set base = collection.get_databox().get_label(app['locale.I18n']) %}
 {% trans %}Base {{base}}{% endtrans %}
@@ -46,7 +46,7 @@
 {% trans %}Collection {{collection}}{% endtrans %}
 </div>
 <form>
-  <div>{% trans 'Restrictions de telechargement' %}</div>
+  <div>{{ 'Restrictions de telechargement' | trans }}</div>
 
   <table>
     <tr>
@@ -54,13 +54,13 @@
         <div class="switch_quota {{class}}"></div>
       </td>
       <td>
-        {% trans 'Restriction' %}
+        {{ 'Restriction' | trans }}
       </td>
     </tr>
   </table>
 
-  <div>{% trans 'Droits' %} <input name="droits" {% if readonly %}readonly="readonly"{% endif %} type="text" value="{{droits}}" /> {% trans 'par mois' %}</div>
-  <div>{% trans 'Reste' %} <input name="restes" {% if readonly %}readonly="readonly"{% endif %} type="text" value="{{restes}}" /></div>
+  <div>{{ 'Droits' | trans }} <input name="droits" {% if readonly %}readonly="readonly"{% endif %} type="text" value="{{droits}}" /> {{ 'par mois' | trans }}</div>
+  <div>{{ 'Reste' | trans }} <input name="restes" {% if readonly %}readonly="readonly"{% endif %} type="text" value="{{restes}}" /></div>
   <input type="hidden" name="base_id" value="{{base_id}}"/>
   <input type="hidden" name="users" value="{{users_serial}}"/>
 </form>
diff --git a/templates/web/admin/editusers_timelimit.html.twig b/templates/web/admin/editusers_timelimit.html.twig
index d628890fc9..1bfd48c7c5 100644
--- a/templates/web/admin/editusers_timelimit.html.twig
+++ b/templates/web/admin/editusers_timelimit.html.twig
@@ -1,4 +1,4 @@
-<h1>{% trans 'Limite temporelle' %}</h1>
+<h1>{{ 'Limite temporelle' | trans }}</h1>
 <div>
 {% set base = collection.get_databox().get_label(app['locale.I18n']) %}
 {% trans %}Base {{base}}{% endtrans %}
@@ -16,18 +16,18 @@
         </div>
       </td>
       <td>
-        {% trans 'Activer' %}
+        {{ 'Activer' | trans }}
       </td>
     </tr>
     <tr>
       <td colspan="2">
-        {% trans 'De' %}
+        {{ 'De' | trans }}
         <input type="text" class="dmin datepicker" name="dmin" {% if datas.time_limited == 0 %}readonly="readonly"{% endif %} value="{{datas.limited_from}}" />
       </td>
     </tr>
     <tr>
       <td colspan="2">
-        {% trans 'A' %}
+        {{ 'A' | trans }}
         <input type="text" class="dmax datepicker" name="dmax" {% if datas.time_limited == 0 %}readonly="readonly"{% endif %} value="{{datas.limited_to}}" />
       </td>
     </tr>
diff --git a/templates/web/admin/editusers_timelimit_sbas.html.twig b/templates/web/admin/editusers_timelimit_sbas.html.twig
index 332fffc8d4..31c5c67a44 100644
--- a/templates/web/admin/editusers_timelimit_sbas.html.twig
+++ b/templates/web/admin/editusers_timelimit_sbas.html.twig
@@ -1,4 +1,4 @@
-<h1>{% trans 'Limite temporelle' %}</h1>
+<h1>{{ 'Limite temporelle' | trans }}</h1>
 <div>
 {% set base = databox.get_viewname() %}
 {% trans %}Base {{base}}{% endtrans %}
@@ -12,18 +12,18 @@
         </div>
       </td>
       <td>
-        {% trans 'Activer' %}
+        {{ 'Activer' | trans }}
       </td>
     </tr>
     <tr>
       <td colspan="2">
-        {% trans 'De' %}
+        {{ 'De' | trans }}
         <input type="text" class="dmin datepicker" name="dmin" {% if datas.time_limited == 0 %}readonly="readonly"{% endif %} value="{{datas.limited_from}}" />
       </td>
     </tr>
     <tr>
       <td colspan="2">
-        {% trans 'A' %}
+        {{ 'A' | trans }}
         <input type="text" class="dmax datepicker" name="dmax" {% if datas.time_limited == 0 %}readonly="readonly"{% endif %} value="{{datas.limited_to}}" />
       </td>
     </tr>
diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig
index 8bad226ce3..a03479166a 100644
--- a/templates/web/admin/fields/templates.html.twig
+++ b/templates/web/admin/fields/templates.html.twig
@@ -219,8 +219,8 @@
                     <td><label for="thumbtitle">{% trans %}Display thumbnails{% endtrans %}</label></td>
                     <td>
                         <select id="thumbtitle">
-                            <option value="1" <%= field.thumbtitle == "1" ? "selected" : "" %> >{% trans 'Tous' %}</option>
-                            <option value="0" <%= field.thumbtitle == "0" ? "selected" : "" %> >{% trans 'Aucun' %}</option>
+                            <option value="1" <%= field.thumbtitle == "1" ? "selected" : "" %> >{{ 'Tous' | trans }}</option>
+                            <option value="0" <%= field.thumbtitle == "0" ? "selected" : "" %> >{{ 'Aucun' | trans }}</option>
                             {% for code, language in languages %}
                                 <option value="{{ code }}" <%= field.thumbtitle == "{{ code }}" ? "selected" : "" %> >{{ language}}</option>
                             {% endfor %}
diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index b82375fd2f..93e3e1b37a 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -217,24 +217,24 @@
     <div id="quotas_dialog"></div>
     <div id="masks_dialog"></div>
     <div id="time_dialog"></div>
-    <div id="user_add_dialog" title="{% trans 'Ajouter un nouvel utilisateur' %}">
+    <div id="user_add_dialog" title="{{ 'Ajouter un nouvel utilisateur' | trans }}">
         <form>
-            <label for="new_user_mail">{% trans 'Adresse email du nouvel utilisateur' %}</label>
+            <label for="new_user_mail">{{ 'Adresse email du nouvel utilisateur' | trans }}</label>
             <input id="new_user_mail"  type="text" name="value" />
             <label class="checkbox" for="send_credentials">
                 <input type="checkbox" checked="checked" name="send_credentials" id="send_credentials" value="1" />
-                {% trans "Send an email to the user to setup his password" %}
+                {{ "Send an email to the user to setup his password" | trans }}
             </label>
             <label class="checkbox" for="validate_mail">
                 <input type="checkbox" checked="checked" name="validate_mail" id="validate_mail" value="1" />
-                {% trans "Require email validation to activate the account" %}
+                {{ "Require email validation to activate the account" | trans }}
             </label>
             <img src="/skins/icons/loaderFFF.gif" class="new_user_loader" style="display:none;"/>
         </form>
     </div>
-    <div id="template_add_dialog" title="{% trans 'Creer un modele' %}">
+    <div id="template_add_dialog" title="{{ 'Creer un modele' | trans }}">
         <form>
-            <label>{% trans 'Nom du nouveau modele' %}</label>
+            <label>{{ 'Nom du nouveau modele' | trans }}</label>
             <input type="text" name="value" />
             <img src="/skins/icons/loaderFFF.gif" class="new_user_loader" style="display:none;"/>
         </form>
diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig
index 7a913af0e6..16a3c93489 100644
--- a/templates/web/admin/publications/fiche.html.twig
+++ b/templates/web/admin/publications/fiche.html.twig
@@ -7,7 +7,7 @@
         <div class="error alert alert-error">{{ error }}</div>
     {% endif %}
     {% if feed.isOwner(app['authentication'].getUser()) %}
-        <h2>{% trans 'Edition' %}</h2>
+        <h2>{{ 'Edition' | trans }}</h2>
         <div class="control-group">
             <div id="pub_icon">
                 <div class="thumb_wrapper">
@@ -85,22 +85,22 @@
 
         <form class="no-ajax form_publication form-vertical" name="form_publication" enctype="multipart/form-data" method="post" action="{{ path('admin_feeds_feed_update', { 'id' : feed.getId() }) }}">
             <div class="control-group">
-                <label class="control-label" for="edit_pub_titre">{% trans 'Titre' %} :</label>
+                <label class="control-label" for="edit_pub_titre">{{ 'Titre' | trans }} :</label>
                 <div class="controls">
                     <input id="edit_pub_titre" class="required_text input-large" maxlength="128" name="title" type="text" value="{{ feed.getTitle() }}" />
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="edit_pub_subtitre">{% trans 'Sous-titre' %} :</label>
+                <label class="control-label" for="edit_pub_subtitre">{{ 'Sous-titre' | trans }} :</label>
                 <div class="controls">
-                    <input placeholder="{% trans 'Short description' %}" id="edit_pub_subtitre" class="input-large" maxlength="512" name="subtitle" type="text" value="{{ feed.getSubtitle() }}" />
+                    <input placeholder="{{ 'Short description' | trans }}" id="edit_pub_subtitre" class="input-large" maxlength="512" name="subtitle" type="text" value="{{ feed.getSubtitle() }}" />
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label" for="edit_pub_base_id">{% trans 'Etendue de la publication' %} :</label>
+                <label class="control-label" for="edit_pub_base_id">{{ 'Etendue de la publication' | trans }} :</label>
                 <div class="controls">
                     <select id="edit_pub_base_id" class="input-large" name="base_id" {% if feed.isPublic() %}disabled="disabled"{% endif %}>
-                        <option value="">{% trans 'Non-Restreinte (publique)' %}</option>
+                        <option value="">{{ 'Non-Restreinte (publique)' | trans }}</option>
                         {% for databox in app['acl'].get(app['authentication'].getUser()).get_granted_sbas('bas_chupub') %}
                             <optgroup label="{{ databox.get_label(app['locale.I18n']) }}">
                                 {% for collection in databox.get_collections() %}
@@ -115,25 +115,25 @@
                 <div class="controls">
                 <label class="checkbox" for="edit_pub_public">
                     <input type="checkbox" id="edit_pub_public" class="input-large" name="public" value="1" {% if feed.isPublic() %}checked="checked"{% endif %} />
-                    {% trans 'Publique' %}
+                    {{ 'Publique' | trans }}
                 </label>
                 </div>
             </div>
             <div>
-                <button class="btn btn-warning" type="submit">{% trans 'boutton::valider' %}</button>
-                <a href="{{ path('admin_feeds_list') }}" class="btn" style="text-decoration:none;">{% trans 'boutton::annuler' %}</a>
+                <button class="btn btn-warning" type="submit">{{ 'boutton::valider' | trans }}</button>
+                <a href="{{ path('admin_feeds_list') }}" class="btn" style="text-decoration:none;">{{ 'boutton::annuler' | trans }}</a>
             </div>
         </form>
         <br />
         <div style="width: 500px;">
-            <h2>{% trans 'Liste des personnes habilitees a publier sur ce fil' %}</h2>
+            <h2>{{ 'Liste des personnes habilitees a publier sur ce fil' | trans }}</h2>
             <table class="admintable">
                 <thead>
                     <tr>
-                        <th valign="center" align="left">{% trans 'Id' %}</th>
+                        <th valign="center" align="left">{{ 'Id' | trans }}</th>
                         <th valign="center" align="left"></th>
-                        <th valign="center" align="left">{% trans 'Email' %}</th>
-                        <th valign="center" align="center">{% trans 'Owner' %}</th>
+                        <th valign="center" align="left">{{ 'Email' | trans }}</th>
+                        <th valign="center" align="center">{{ 'Owner' | trans }}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -154,7 +154,7 @@
                             {% else %}
                                 <form class="no-ajax form_publication" method="post" action="{{ path('admin_feeds_feed_remove_publisher', { 'id' : feed.getId() }) }}" style="margin:0;">
                                     <input type="hidden" value="{{ publisher.getId() }}" name="publisher_id"/>
-                                    <button class="btn btn-mini">{% trans 'boutton::supprimer' %}</button>
+                                    <button class="btn btn-mini">{{ 'boutton::supprimer' | trans }}</button>
                                 </form>
                             {% endif %}
                         </td>
@@ -165,9 +165,9 @@
             <div>
                 <form class="no-ajax form_publication" id="publisher_adder" method="post" action="{{ path('admin_feeds_feed_add_publisher', { 'id' : feed.getId() }) }}">
                     <div class="control-group">
-                        <label class="control-label">{% trans 'Ajouter un publisher' %} :</label>
+                        <label class="control-label">{{ 'Ajouter un publisher' | trans }} :</label>
                         <div class="controls">
-                            <input placeholder="{% trans 'Name or email' %}" class="publish_adder"/>
+                            <input placeholder="{{ 'Name or email' | trans }}" class="publish_adder"/>
                             <input type="hidden" name="usr_id"/>
                         </div>
                     </div>
@@ -214,8 +214,8 @@
         </script>
 
     {% else %}
-        {% trans 'You are not the feed owner' %}
-        <a href="{{ path('admin_feeds_list') }}">{% trans 'boutton::retour' %}</a>
+        {{ 'You are not the feed owner' | trans }}
+        <a href="{{ path('admin_feeds_list') }}">{{ 'boutton::retour' | trans }}</a>
     {% endif %}
 </div>
 
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig
index 9448294895..c72b979f61 100644
--- a/templates/web/admin/publications/list.html.twig
+++ b/templates/web/admin/publications/list.html.twig
@@ -4,25 +4,25 @@
 
 <form style="max-width:500px" class="no-ajax form_publication form-horizontal" method="post" action="{{ path('admin_feeds_create') }}">
     <fieldset>
-        <legend>{% trans 'Ajouter une publication' %}</legend>
+        <legend>{{ 'Ajouter une publication' | trans }}</legend>
         <div class="control-group">
-            <label class="control-label" for="add_pub_titre">{% trans 'Titre' %}</label>
+            <label class="control-label" for="add_pub_titre">{{ 'Titre' | trans }}</label>
             <div class="controls">
-                <input type="text" id="add_pub_titre" class="required_text input-large" placeholder="{% trans 'Feed name' %}" maxlength="128" name="title" />
+                <input type="text" id="add_pub_titre" class="required_text input-large" placeholder="{{ 'Feed name' | trans }}" maxlength="128" name="title" />
             </div>
         </div>
 
         <div class="control-group">
-            <label class="control-label" for="add_pub_subtitre">{% trans 'Sous-titre' %}</label>
+            <label class="control-label" for="add_pub_subtitre">{{ 'Sous-titre' | trans }}</label>
             <div class="controls">
-                <input type="text" id="add_pub_subtitre" class="input-large" placeholder="{% trans 'Short description' %}" maxlength="512" name="subtitle" />
+                <input type="text" id="add_pub_subtitre" class="input-large" placeholder="{{ 'Short description' | trans }}" maxlength="512" name="subtitle" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="add_pub_base_id">{% trans 'Etendue de la publication' %}</label>
+            <label class="control-label" for="add_pub_base_id">{{ 'Etendue de la publication' | trans }}</label>
             <div class="controls">
                 <select id="add_pub_base_id" class="input-large" name="base_id">
-                    <option value="">{% trans 'Non-Restreinte (publique)' %}</option>
+                    <option value="">{{ 'Non-Restreinte (publique)' | trans }}</option>
                     {% for databox in app['acl'].get(app['authentication'].getUser()).get_granted_sbas('bas_chupub') %}
                         <optgroup label="{{ databox.get_label(app['locale.I18n']) }}">
                             {% for collection in databox.get_collections() %}
@@ -37,12 +37,12 @@
             <div class="controls">
                 <label class="checkbox" for="add_pub_public">
                     <input type="checkbox" id="add_pub_public" name="public" value="1" />
-                    {% trans 'Publique' %}
+                    {{ 'Publique' | trans }}
                 </label>
             </div>
         </div>
         <div class="form-actions">
-            <button type="submit" class="btn btn-warning">{% trans 'boutton::valider' %}</button>
+            <button type="submit" class="btn btn-warning">{{ 'boutton::valider' | trans }}</button>
         </div>
     </fieldset>
 </form>
@@ -51,10 +51,10 @@
     <thead>
         <tr>
             <th style="width:40px;"></th>
-            <th>{% trans 'Titre' %}</th>
-            <th style="width:150px; text-align: center;">{% trans 'Date Creation' %}</th>
-            <th style="width:220px; text-align: center;">{% trans 'Restriction' %}</th>
-            <th style="width:80px; text-align: center;">{% trans 'Public' %}</th>
+            <th>{{ 'Titre' | trans }}</th>
+            <th style="width:150px; text-align: center;">{{ 'Date Creation' | trans }}</th>
+            <th style="width:220px; text-align: center;">{{ 'Restriction' | trans }}</th>
+            <th style="width:80px; text-align: center;">{{ 'Public' | trans }}</th>
             <th style="width:80px;"></th>
         </tr>
     </thead>
@@ -86,13 +86,13 @@
                 </td>
                 <td valign="center" align="center">
                     {% if feed.isPublic() %}
-                        <img src="/skins/icons/ligth-on.png" title="{% trans 'This feed is public' %}"/>
+                        <img src="/skins/icons/ligth-on.png" title="{{ 'This feed is public' | trans }}"/>
                     {% endif %}
                 </td>
                 <td valign="center" align="center">
                     {% if feed.isOwner(app['authentication'].getUser()) %}
                         <form class="no-ajax form_publication" action="{{ path('admin_feeds_feed_delete', { 'id' : feed.getId() }) }}" method="post" style="margin:0;">
-                            <button class="feed_remover btn btn-mini">{% trans 'boutton::supprimer' %}</button>
+                            <button class="feed_remover btn btn-mini">{{ 'boutton::supprimer' | trans }}</button>
                         </form>
                     {% endif %}
                 </td>
@@ -104,7 +104,7 @@
 <script type="text/javascript">
   $(document).ready(function(){
     $('button.feed_remover').bind('click', function(event){
-      if(!confirm('{% trans 'Une fois la publication supprimee, les donnees publiees seront definitivement perdues. Continuer ?' %}'))
+      if(!confirm('{{ 'Une fois la publication supprimee, les donnees publiees seront definitivement perdues. Continuer ?' | trans }}'))
       {
         event.stopPropagation();
         return false;
diff --git a/templates/web/admin/publications/wrapper.html.twig b/templates/web/admin/publications/wrapper.html.twig
index 0689aaad22..b171659e63 100644
--- a/templates/web/admin/publications/wrapper.html.twig
+++ b/templates/web/admin/publications/wrapper.html.twig
@@ -1,5 +1,5 @@
 <div class="page-header">
-     <h1>{% trans 'Publications' %}</h1>
+     <h1>{{ 'Publications' | trans }}</h1>
 </div>
 
 <div>
@@ -26,7 +26,7 @@
 
         if(error === true)
         {
-          alert('{% trans 'Vous devez remplir les champs requis' %}');
+          alert('{{ 'Vous devez remplir les champs requis' | trans }}');
           return false;
         }
 
diff --git a/templates/web/admin/search-engine/phrasea.html.twig b/templates/web/admin/search-engine/phrasea.html.twig
index bc28c50f2a..88871479d2 100644
--- a/templates/web/admin/search-engine/phrasea.html.twig
+++ b/templates/web/admin/search-engine/phrasea.html.twig
@@ -1,14 +1,14 @@
 <div class="page-header">
-    <h1>{% trans 'Phrasea search-engine configuration' %}</h1>
+    <h1>{{ 'Phrasea search-engine configuration' | trans }}</h1>
 </div>
 
 <form method="post" action="{{ path('admin_searchengine_post') }}">
     <fieldset>
-        <legend>{% trans 'Stemming' %}</legend>
-        {% trans 'Enable stemming' %} <input type="checkbox" name="stemming_enabled" value="1" {% if configuration['stemming_enabled'] %}checked="checked"{% endif %} />
+        <legend>{{ 'Stemming' | trans }}</legend>
+        {{ 'Enable stemming' | trans }} <input type="checkbox" name="stemming_enabled" value="1" {% if configuration['stemming_enabled'] %}checked="checked"{% endif %} />
     </fieldset>
     <fieldset>
-        <legend>{% trans 'Default sort' %}</legend>
+        <legend>{{ 'Default sort' | trans }}</legend>
         <select name="default_sort">
             {% for sort, sort_name in available_sort %}
                 <option value="{{ sort }}" {%if configuration['default_sort'] == sort %}selected="selected"{% endif %}>{{ sort_name }}</option>
@@ -16,6 +16,6 @@
         </select>
     </fieldset>
     <div class="form-actions">
-        <button type="submit" class="btn btn-warning">{% trans 'boutton::valider' %}</button>
+        <button type="submit" class="btn btn-warning">{{ 'boutton::valider' | trans }}</button>
     </div>
 </form>
diff --git a/templates/web/admin/search-engine/sphinx-search.html.twig b/templates/web/admin/search-engine/sphinx-search.html.twig
index f6b290c7b0..5ae9b85257 100644
--- a/templates/web/admin/search-engine/sphinx-search.html.twig
+++ b/templates/web/admin/search-engine/sphinx-search.html.twig
@@ -1,26 +1,26 @@
-<h1>{% trans 'SphinxSearch search-engine configuration' %}</h1>
+<h1>{{ 'SphinxSearch search-engine configuration' | trans }}</h1>
 
 <form method="post" action="{{ path('admin_searchengine_post') }}">
-    <div>{% trans 'Sphinx Search connection configuration' %}</div>
+    <div>{{ 'Sphinx Search connection configuration' | trans }}</div>
 
-    <div>{% trans 'Sphinx Search server' %}</div>
+    <div>{{ 'Sphinx Search server' | trans }}</div>
     <input type="text" name="host" value="{{ configuration['host'] | default('127.0.0.1') }}"/>
     <input type="text" name="port" value="{{ configuration['port'] | default('93') }}"/>
-    <div>{% trans 'Sphinx Search RealTime server' %}</div>
+    <div>{{ 'Sphinx Search RealTime server' | trans }}</div>
     <input type="text" name="rt_host" value="{{ configuration['rt_host'] }}"/>
     <input type="text" name="rt_port" value="{{ configuration['rt_port'] }}"/>
 
-    <div>{% trans 'Charset to use for indexation' %}</div>
+    <div>{{ 'Charset to use for indexation' | trans }}</div>
     {% for charset, charsetObject in charsets %}
     <input type="checkbox" name="charset_tables[]" value="{{ charset }}" {% if charset in configuration['charset_tables'] %}checked="checked"{% endif %} > {{ charsetObject.get_name() }}
     {% endfor %}
     <br/><br/>
-    <div>{% trans 'Date fields available for search' %}</div>
+    <div>{{ 'Date fields available for search' | trans }}</div>
     {% for field in date_fields %}
     <input type="checkbox" name="date_fields[]" value="{{ field }}" {% if field in configuration['date_fields'] %}checked="checked"{% endif %} > {{ field }}
     {% endfor %}
 
-    <button type="submit" class="btn btn-warning" >{% trans 'boutton::valider' %}</button>
+    <button type="submit" class="btn btn-warning" >{{ 'boutton::valider' | trans }}</button>
 </form>
 
 <textarea style="font-family: monospace;width:90%;height:70%">{{ configfile }}</textarea>
\ No newline at end of file
diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig
index 4f65e89b7d..fa2294278c 100644
--- a/templates/web/admin/setup.html.twig
+++ b/templates/web/admin/setup.html.twig
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h1>{% trans 'Setup' %}</h1>
+    <h1>{{ 'Setup' | trans }}</h1>
 </div>
 
 {% if update_post_datas is not none %}
@@ -134,7 +134,7 @@
     {% endfor %}
     <div class="well well-large">
         <div style="max-width: 400px;margin: 0 auto 10px;">
-            <input type="submit" class="btn btn-warning btn-block btn-large" value="{% trans 'boutton::valider' %}"/>
+            <input type="submit" class="btn btn-warning btn-block btn-large" value="{{ 'boutton::valider' | trans }}"/>
         </div>
     </div>
 </form>
diff --git a/templates/web/admin/statusbit.html.twig b/templates/web/admin/statusbit.html.twig
index 08e741bb40..588b038d4a 100644
--- a/templates/web/admin/statusbit.html.twig
+++ b/templates/web/admin/statusbit.html.twig
@@ -2,16 +2,16 @@
 {% set databox_id = databox.get_sbas_id() %}
 
 <h1>
-    {% trans 'phraseanet::status bit' %}
+    {{ 'phraseanet::status bit' | trans }}
 </h1>
 
 <table class="table table-striped table-condensed">
     <thead>
-        <th style="width:30px;">{% trans 'status:: numero de bit' %}</th>
+        <th style="width:30px;">{{ 'status:: numero de bit' | trans }}</th>
         <th style="width:60px;" colspan='2'></th>
-        <th>{% trans 'status:: nom' %}</th>
-        <th>{% trans 'status:: cherchable par tous' %}</th>
-        <th>{% trans 'status:: Affichable pour tous' %}</th>
+        <th>{{ 'status:: nom' | trans }}</th>
+        <th>{{ 'status:: cherchable par tous' | trans }}</th>
+        <th>{{ 'status:: Affichable pour tous' | trans }}</th>
     </thead>
     <tbody>
         {% for bit in range(4, 31) %}
@@ -78,7 +78,7 @@
                     if (data.success) {
                         $(".treeview li.selected a").trigger("click");
                     } else {
-                        alert('{% trans 'An error occurred' %}');
+                        alert('{{ 'An error occurred' | trans }}');
                     }
                 }
             });
diff --git a/templates/web/admin/statusbit/edit.html.twig b/templates/web/admin/statusbit/edit.html.twig
index d0eb8186b2..d1c45303c3 100644
--- a/templates/web/admin/statusbit/edit.html.twig
+++ b/templates/web/admin/statusbit/edit.html.twig
@@ -6,16 +6,16 @@
 {% endif %}
 
 <h1 style='padding-left:30px;'>
-    {% trans 'status:: numero de bit' %} {{ app['request'].get('bit') }}
+    {{ 'status:: numero de bit' | trans }} {{ app['request'].get('bit') }}
 </h1>
 
 <form id="fileupload" class="form-horizontal" target="_self" enctype="multipart/form-data" method="post" action="{{ path('database_submit_statusbit', { 'databox_id' : app['request'].get('databox_id'), 'bit' : app['request'].get('bit') }) }}">
     <div class="row-fluid">
         <div class="span12 well">
-            <span class="label">{% trans'admin::status: case A'%}</span>
+            <span class="label">{{ 'admin::status: case A' | trans }}</span>
             <div class="row-fluid">
                 <label class="control-label" for="label_off">
-                    {% trans'admin::status: texte a afficher'%}
+                    {{ 'admin::status: texte a afficher' | trans }}
                 </label>
                 <div class="controls">
                     <input id="label_off" name="label_off" class="input-xlarge" type="text" value="{{ status['labeloff'] }}">
@@ -34,7 +34,7 @@
             </div>
             <div class="row-fluid">
                 <label class="control-label">
-                    {% trans 'Labels'%}
+                    {{ 'Labels' | trans }}
                 </label>
                 <div class="controls">
                 {% for code, language in app['locales.I18n.available'] %}
@@ -64,7 +64,7 @@
             </div>
             <div class="row-fluid">
                 <label class="control-label" for="delete_icon_off">
-                    {% trans'admin::status:: aucun symbole'%}
+                    {{ 'admin::status:: aucun symbole' | trans }}
                 </label>
                 <div class="controls">
                     <label class="checkbox">
@@ -76,10 +76,10 @@
     </div>
     <div class="row-fluid">
         <div class="span12 well">
-            <span class="label">{% trans'admin::status: case B'%}</span>
+            <span class="label">{{ 'admin::status: case B' | trans }}</span>
             <div class="row-fluid">
                 <label class="control-label" for="label_on">
-                    {% trans'admin::status: texte a afficher'%}
+                    {{ 'admin::status: texte a afficher' | trans }}
                 </label>
                 <div class="controls">
                     <input id="label_on" name="label_on" class="input-xlarge" type="text" value="{{ status['labelon'] }}">
@@ -98,7 +98,7 @@
             </div>
             <div class="row-fluid">
                 <label class="control-label">
-                    {% trans 'Labels'%}
+                    {{ 'Labels' | trans }}
                 </label>
                 <div class="controls">
                 {% for code, language in app['locales.I18n.available'] %}
@@ -128,7 +128,7 @@
             </div>
             <div class="row-fluid">
                 <label class="control-label" for="delete_icon_on">
-                    {% trans'admin::status:: aucun symbole'%}
+                    {{ 'admin::status:: aucun symbole' | trans }}
                 </label>
                 <div class="controls">
                     <label class="checkbox">
@@ -142,11 +142,11 @@
         <div class="span12">
             <label class="checkbox">
                 <input id="printable" name="printable" type="checkbox" {{ status['printable'] is defined and status['printable'] == '1' ? "checked" : "" }}>
-                        {% trans'status:: Afficher le status dans les feuilles de reponses pour tous les utilisateurs' %}
+                        {{ 'status:: Afficher le status dans les feuilles de reponses pour tous les utilisateurs' | trans }}
             </label>
             <label class="checkbox">
                 <input id="searchable" name="searchable" type="checkbox" {{ status['searchable'] is defined and status['searchable'] == '1' ? "checked" : "" }}>
-                            {% trans'status:: retrouver sous forme de filtre dans la recherche' %}
+                            {{ 'status:: retrouver sous forme de filtre dans la recherche' | trans }}
             </label>
         </div>
     </div>
@@ -154,10 +154,10 @@
         <div  class=" span12">
             <div class="form-actions">
                 <button id="form_submitter" class="btn btn-primary" type="button">
-                    {% trans 'boutton::valider' %}
+                    {{ 'boutton::valider' | trans }}
                 </button>
                 <a style='text-decoration:none;' target='right' class="btn" href="{{ path('database_display_statusbit', { 'databox_id' : app['request'].get('databox_id') }) }}">
-                    {% trans 'boutton::retour' %}
+                    {{ 'boutton::retour' | trans }}
                 </a>
             </div>
         </div>
diff --git a/templates/web/admin/structure.html.twig b/templates/web/admin/structure.html.twig
index 63d1613f26..fb7610d744 100644
--- a/templates/web/admin/structure.html.twig
+++ b/templates/web/admin/structure.html.twig
@@ -1,8 +1,8 @@
 {% if updateOk %}
     <div class="alert alert-info">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <h4 class="alert-heading">{% trans 'Updated structure' %}</h4>
-        {% trans 'Structure has been successfully updated' %}
+        <h4 class="alert-heading">{{ 'Updated structure' | trans }}</h4>
+        {{ 'Structure has been successfully updated' | trans }}
     </div>
 {% endif %}
 
@@ -10,8 +10,8 @@
 {% if errorsStructure %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
-        <h4 class="alert-heading">{% trans 'Structure errors' %}</h4>
-        {% trans 'admin::base: xml invalide, les changements ne seront pas appliques' %}
+        <h4 class="alert-heading">{{ 'Structure errors' | trans }}</h4>
+        {{ 'admin::base: xml invalide, les changements ne seront pas appliques' | trans }}
     </div>
 
     <div class="well">
@@ -25,12 +25,12 @@
 {% endif %}
 
 <div class="page-header">
-    <h1>{% trans 'admin::base: structure' %}</h1>
+    <h1>{{ 'admin::base: structure' | trans }}</h1>
 </div>
 
 <form method="POST" action="{{ path('database_submit_stucture', { 'databox_id' : databox.get_sbas_id() }) }}">
     <TEXTAREA nowrap style="width:99%; height:450px; white-space:pre" name="structure">{{ structure  }}</TEXTAREA>
     <div class="form-actions">
-        <button class="btn btn-primary" type="submit">{% trans 'boutton::valider' %}</button>
+        <button class="btn btn-primary" type="submit">{{ 'boutton::valider' | trans }}</button>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/web/admin/subdefs.html.twig b/templates/web/admin/subdefs.html.twig
index 4bcd5ddc9b..701be545da 100644
--- a/templates/web/admin/subdefs.html.twig
+++ b/templates/web/admin/subdefs.html.twig
@@ -166,11 +166,11 @@
 {% endblock %}
 
 {% block content %}
-<button id="create-subdef" class="btn btn-warning">{% trans 'Create new subdef' %}</button>
-<div id="dialog-delete-subdef" title="{% trans 'Delete the subdef ?' %}" style="display:none;">
+<button id="create-subdef" class="btn btn-warning">{{ 'Create new subdef' | trans }}</button>
+<div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
     <p>
         <span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>
-        {% trans 'These subdef will be permanently deleted and cannot be recovered. Are you sure?' %}
+        {{ 'These subdef will be permanently deleted and cannot be recovered. Are you sure?' | trans }}
     </p>
 </div>
 
@@ -178,13 +178,13 @@
     <p class="validateTips"></p>
     <form>
         <fieldset>
-            <label for="name">{% trans 'Subdef name' %}</label>
+            <label for="name">{{ 'Subdef name' | trans }}</label>
             <input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" value=""/><br/>
-            <label for="accessclass">{% trans 'classe d\'acces' %}</label>
+            <label for="accessclass">{{ 'classe d\'acces' | trans }}</label>
             <select name="accessclass" id="accessclass">
-                <option value="document">{% trans 'document' %}</option>
-                <option value="preview" selected="selected">{% trans 'preview' %}</option>
-                <option value="thumbnail">{% trans 'tout le monde' %}</option>
+                <option value="document">{{ 'document' | trans }}</option>
+                <option value="preview" selected="selected">{{ 'preview' | trans }}</option>
+                <option value="thumbnail">{{ 'tout le monde' | trans }}</option>
             </select>
         </fieldset>
     </form>
@@ -207,7 +207,7 @@
                     <tbody>
                         <tr>
                             <td style="width:120px;">
-                                <h2>{{subdefname}}</h2><button class="subdef_deleter">{% trans 'boutton::supprimer' %}</button>
+                                <h2>{{subdefname}}</h2><button class="subdef_deleter">{{ 'boutton::supprimer' | trans }}</button>
                                 <input type="hidden" name="subdef" value="{{subdefgroup}}_{{subdefname}}"/>
                             </td>
                             <td style="width:250px;"></td>
@@ -222,20 +222,20 @@
                             </tr>
                         {% endfor %}
                         <tr>
-                            <td>{% trans 'Telechargeable' %}</td>
+                            <td>{{ 'Telechargeable' | trans }}</td>
                             <td><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_downloadable" {% if subdef.is_downloadable() %}checked="checked"{% endif %} value="1" /></td>
                             <td></td>
                         </tr>
                         <tr>
                             <td>
-                                {% trans 'classe' %}
+                                {{ 'classe' | trans }}
                             </td>
                             <td>
                                 <select name="{{subdefgroup}}_{{subdefname}}_class">
-                                    <option>{% trans 'classe' %}</option>
-                                    <option value="document" {% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{% trans 'document' %}</option>
-                                    <option value="preview" {% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{% trans 'preview' %}</option>
-                                    <option value="thumbnail" {% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{% trans 'tout le monde' %}</option>
+                                    <option>{{ 'classe' | trans }}</option>
+                                    <option value="document" {% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{{ 'document' | trans }}</option>
+                                    <option value="preview" {% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{{ 'preview' | trans }}</option>
+                                    <option value="thumbnail" {% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{{ 'tout le monde' | trans }}</option>
                                 </select>
                             </td>
                             <td></td>
@@ -251,7 +251,7 @@
                         </tr>
                         <tr>
                             <td>
-                                {% trans 'Write Metas' %}
+                                {{ 'Write Metas' | trans }}
                             </td>
                             <td>
                                 <input type="checkbox" value="yes" {% if subdef.meta_writeable() %}checked="checked"{% endif %} name="{{subdefgroup}}_{{subdefname}}_meta"/>
@@ -260,11 +260,11 @@
                         </tr>
                         <tr>
                             <td>
-                                {% trans 'mediatype' %}
+                                {{ 'mediatype' | trans }}
                             </td>
                             <td>
                                 <select onchange="select_mediatype('{{subdefgroup}}{{subdefname}}', this);" name="{{subdefgroup}}_{{subdefname}}_mediatype">
-                                    <option>{% trans 'Choisir' %}</option>
+                                    <option>{{ 'Choisir' | trans }}</option>
                                     {% for subdefType in subdef.getAvailableSubdefTypes() %}
                                         <option value="{{ subdefType.getType() }}" {% if subdef.getSubdefType.getType() == subdefType.getType() %}selected="selected"{% endif %}>{{ subdefType.getType() }}</option>
                                     {% endfor %}
@@ -304,14 +304,14 @@
                                     </script>
                                 {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_ENUM') %}
                                     <select name="{{varname}}">
-                                        <option value="">{% trans 'Choisir' %}</option>
+                                        <option value="">{{ 'Choisir' | trans }}</option>
                                         {% for pot_value in option.getAvailableValues() %}
                                             <option value="{{ pot_value }}" {% if pot_value == option.getValue() %}selected="selected"{% endif %}>{{ pot_value }}</option>
                                         {% endfor %}
                                     </select>
                                 {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_BOOLEAN') %}
-                                    <input name="{{varname}}" type="radio" value="yes" {% if option.getValue() %}checked="checked"{% endif %} /> {% trans 'yes' %}
-                                    <input name="{{varname}}" type="radio" value="no" {% if option.getValue() is empty %}checked="checked"{% endif %}/> {% trans 'no' %}
+                                    <input name="{{varname}}" type="radio" value="yes" {% if option.getValue() %}checked="checked"{% endif %} /> {{ 'yes' | trans }}
+                                    <input name="{{varname}}" type="radio" value="no" {% if option.getValue() is empty %}checked="checked"{% endif %}/> {{ 'no' | trans }}
                                 {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_MULTI') %}
                                     {% for pot_value, selected in option.Value(true) %}
                                         <input type="checkbox" name="{{varname}}[]" value="{{ pot_value }}" {% if selected %}checked="checked"{% endif %}/><label>{{ pot_value }}</label>
@@ -337,7 +337,7 @@
     <input type="hidden" name="add_subdef[group]" value=""/>
     <input type="hidden" name="add_subdef[name]" value=""/>
     <input type="hidden" name="add_subdef[class]" value=""/>
-    <button type="submit" class="btn btn-primary">{% trans 'boutton::valider' %}</button>
+    <button type="submit" class="btn btn-primary">{{ 'boutton::valider' | trans }}</button>
 </form>
 
 <div style="display:none;">
diff --git a/templates/web/admin/task-manager/list.html.twig b/templates/web/admin/task-manager/list.html.twig
index 0fcf2fc12c..1306c4c469 100644
--- a/templates/web/admin/task-manager/list.html.twig
+++ b/templates/web/admin/task-manager/list.html.twig
@@ -28,7 +28,7 @@
 </style>
 
 <div class="page-header">
-    <h1>{% trans 'admin::tasks: planificateur de taches' %}
+    <h1>{{ 'admin::tasks: planificateur de taches' | trans }}
         <small style="font-size:16px;">
             {% set updateTime %}
                 <span id="pingTime"></span>
@@ -45,10 +45,10 @@
         <tr>
             <th class="menu"></th>
             <th class="id">ID</th>
-            <th class="information">{% trans 'Informations' %}</th>
-            <th class="status">{% trans 'admin::tasks: statut de la tache' %}</th>
-            <th class="process-id">{% trans 'admin::tasks: process_id de la tache' %}</th>
-            <th class="taskname">{% trans 'admin::tasks: nom de la tache' %}</th>
+            <th class="information">{{ 'Informations' | trans }}</th>
+            <th class="status">{{ 'admin::tasks: statut de la tache' | trans }}</th>
+            <th class="process-id">{{ 'admin::tasks: process_id de la tache' | trans }}</th>
+            <th class="taskname">{{ 'admin::tasks: nom de la tache' | trans }}</th>
         </tr>
     </thead>
     <tbody>
@@ -60,13 +60,13 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li>
-                            <a method="POST" href="{{ path ('admin_tasks_scheduler_start') }}">{% trans 'Start' %}</a>
+                            <a method="POST" href="{{ path ('admin_tasks_scheduler_start') }}">{{ 'Start' | trans }}</a>
                         </li>
                         <li>
-                            <a method="POST" href="{{ path ('admin_tasks_scheduler_stop') }}">{% trans 'Stop' %}</a>
+                            <a method="POST" href="{{ path ('admin_tasks_scheduler_stop') }}">{{ 'Stop' | trans }}</a>
                         </li>
                         <li>
-                            <a href="{{ path ('admin_tasks_scheduler_log') }}">{% trans 'Logs' %}</a>
+                            <a href="{{ path ('admin_tasks_scheduler_log') }}">{{ 'Logs' | trans }}</a>
                         </li>
                     </ul>
                 </div>
@@ -75,7 +75,7 @@
             <td class="information"></td>
             <td class="status"></td>
             <td class="process-id"></td>
-            <td class="taskname" style="font-weight:bold;">{% trans 'admin::tasks: planificateur de taches' %}</td>
+            <td class="taskname" style="font-weight:bold;">{{ 'admin::tasks: planificateur de taches' | trans }}</td>
         </tr>
         {% for task in tasks %}
         <tr id="task_{{ task.getId() }}" class="{% if loop.index is odd %}odd{% else %}even{% endif %}">
@@ -87,27 +87,27 @@
                     <ul class="dropdown-menu">
                         <li>
                             <a href="{{ path('admin_tasks_task_show', { 'task' : task.getId() }) }}">
-                                {% trans 'Edit' %}
+                                {{ 'Edit' | trans }}
                             </a>
                         </li>
                         <li>
                             <a method="POST" href="{{ path('admin_tasks_task_start', { 'task' : task.getId() }) }}">
-                                {% trans 'Start' %}
+                                {{ 'Start' | trans }}
                             </a>
                         </li>
                         <li>
                             <a method="POST" href="{{ path('admin_tasks_task_stop', { 'task' : task.getId() }) }}">
-                                {% trans 'Stop' %}
+                                {{ 'Stop' | trans }}
                             </a>
                         </li>
                         <li>
                             <a method="POST" href="{{ path('admin_tasks_task_delete', { 'task' : task.getId() }) }}">
-                                {% trans 'Delete' %}
+                                {{ 'Delete' | trans }}
                             </a>
                         </li>
                         <li>
                             <a href="{{ path('admin_tasks_task_log', { 'task' : task.getId() }) }}">
-                                {% trans 'Logs' %}
+                                {{ 'Logs' | trans }}
                             </a>
                         </li>
                     </ul>
@@ -126,7 +126,7 @@
 <form id="form-create-task" method="post" name="form-create-task" action="{{ path('admin_tasks_task_create') }}">
     <select name="job-name">
         <option value="">
-            {% trans 'admin::tasks: Nouvelle tache' %}
+            {{ 'admin::tasks: Nouvelle tache' | trans }}
         </option>
         {% for job in available_jobs %}
             <option value="{{ job.getJobId() }}">{{ job.getName() }}</option>
diff --git a/templates/web/admin/task-manager/log.html.twig b/templates/web/admin/task-manager/log.html.twig
index 1a48ad6ef3..b9efb1864a 100644
--- a/templates/web/admin/task-manager/log.html.twig
+++ b/templates/web/admin/task-manager/log.html.twig
@@ -1,10 +1,10 @@
 <h4>
     <a href="{{ path('admin_tasks_list') }} ">
-        < {% trans 'Return' %}
+        < {{ 'Return' | trans }}
     </a>
     {{ logname }}
     <a href="{{ path('admin_tasks_scheduler_log', { 'clr' : logfile.getPath() }) }} ">
-        {% trans 'Clear' %}
+        {{ 'Clear' | trans }}
     </a>
 </h4>
 <pre>
diff --git a/templates/web/admin/task-manager/task-editor/archive.html.twig b/templates/web/admin/task-manager/task-editor/archive.html.twig
index f746c2c852..79f296929f 100644
--- a/templates/web/admin/task-manager/task-editor/archive.html.twig
+++ b/templates/web/admin/task-manager/task-editor/archive.html.twig
@@ -2,7 +2,7 @@
 
 {% block form %}
 <div class="control-group">
-    <label class="control-label">{% trans 'task::archive:archivage sur base/collection/' %}</label>
+    <label class="control-label">{{ 'task::archive:archivage sur base/collection/' | trans }}</label>
     <div class="controls">
         <select class="formElem" name="base_id">
             <option value="">...</option>
@@ -15,23 +15,23 @@
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::_common_:hotfolder' %}</label>
+    <label class="control-label">{{ 'task::_common_:hotfolder' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="hotfolder" value="">
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::archive:delai de \'repos\' avant traitement' %}</label>
+    <label class="control-label">{{ 'task::archive:delai de \'repos\' avant traitement' | trans }}</label>
     <div class="controls">
         <input class="formElem input-small" type="text" name="cold" value="">
-        <span class="help-inline">{% trans 'task::_common_:secondes (unite temporelle)' %}</span>
+        <span class="help-inline">{{ 'task::_common_:secondes (unite temporelle)' | trans }}</span>
     </div>
 </div>
 <div class="control-group">
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="move_archived">
-            {% trans 'task::archive:deplacer les fichiers archives dans _archived' %}
+            {{ 'task::archive:deplacer les fichiers archives dans _archived' | trans }}
         </label>
     </div>
 </div>
@@ -39,7 +39,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="move_error">
-            {% trans 'task::archive:deplacer les fichiers non-archives dans _error' %}
+            {{ 'task::archive:deplacer les fichiers non-archives dans _error' | trans }}
         </label>
     </div>
 </div>
@@ -47,7 +47,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="copy_spe">
-            {% trans 'task::archive:copier les fichiers \'.phrasea.xml\' et \'.grouping.xml\' dans _archived' %}
+            {{ 'task::archive:copier les fichiers \'.phrasea.xml\' et \'.grouping.xml\' dans _archived' | trans }}
         </label>
     </div>
 </div>
@@ -55,7 +55,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="delfolder">
-            {% trans 'task::archive:supprimer les repertoires apres archivage' %}
+            {{ 'task::archive:supprimer les repertoires apres archivage' | trans }}
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/task-manager/task-editor/ftp-pull.html.twig b/templates/web/admin/task-manager/task-editor/ftp-pull.html.twig
index 706e243884..e97bfb5857 100644
--- a/templates/web/admin/task-manager/task-editor/ftp-pull.html.twig
+++ b/templates/web/admin/task-manager/task-editor/ftp-pull.html.twig
@@ -2,55 +2,55 @@
 
 {% block form %}
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:proxy' %}</label>
+    <label class="control-label">{{ 'task::ftp:proxy' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="proxy" />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:proxy port' %}</label>
+    <label class="control-label">{{ 'task::ftp:proxy port' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="proxyport" />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:host' %}</label>
+    <label class="control-label">{{ 'task::ftp:host' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="host" />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:port' %}</label>
+    <label class="control-label">{{ 'task::ftp:port' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="port"  />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:user' %}</label>
+    <label class="control-label">{{ 'task::ftp:user' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="user"  />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:password' %}</label>
+    <label class="control-label">{{ 'task::ftp:password' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="password" name="password"  />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:chemin distant' %}</label>
+    <label class="control-label">{{ 'task::ftp:chemin distant' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="ftppath"  />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:localpath' %}</label>
+    <label class="control-label">{{ 'task::ftp:localpath' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="localpath"  />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:mode passif' %}</label>
+    <label class="control-label">{{ 'task::ftp:mode passif' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="checkbox" name="passive" />
     </div>
@@ -59,7 +59,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="ssl" />
-            {% trans 'task::ftp:utiliser SSL' %}
+            {{ 'task::ftp:utiliser SSL' | trans }}
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/task-manager/task-editor/ftp.html.twig b/templates/web/admin/task-manager/task-editor/ftp.html.twig
index b812d87ea9..a3caf494a5 100644
--- a/templates/web/admin/task-manager/task-editor/ftp.html.twig
+++ b/templates/web/admin/task-manager/task-editor/ftp.html.twig
@@ -2,13 +2,13 @@
 
 {% block form %}
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:proxy' %}</label>
+    <label class="control-label">{{ 'task::ftp:proxy' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="proxy" />
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'task::ftp:proxy port' %}</label>
+    <label class="control-label">{{ 'task::ftp:proxy port' | trans }}</label>
     <div class="controls">
         <input class="formElem" type="text" name="proxyport" />
     </div>
diff --git a/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig b/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig
index eb1eebb59b..5dfb22f350 100644
--- a/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig
+++ b/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig
@@ -2,63 +2,63 @@
 
 {% block form %}
 <div class="control-group">
-    <label class="control-label">{% trans 'MySQL Host' %}</label>
+    <label class="control-label">{{ 'MySQL Host' | trans }}</label>
     <div class="controls">
         <input type="text" name="host" value="">
     </div>
-    <label class="control-label">{% trans 'MySQL Port' %}</label>
+    <label class="control-label">{{ 'MySQL Port' | trans }}</label>
     <div class="controls">
         <input type="text" name="port" value="">
     </div>
-    <label class="control-label">{% trans 'MySQL Database' %}</label>
+    <label class="control-label">{{ 'MySQL Database' | trans }}</label>
     <div class="controls">
         <input type="text" name="base" value="">
     </div>
-    <label class="control-label">{% trans 'MySQL Login' %}</label>
+    <label class="control-label">{{ 'MySQL Login' | trans }}</label>
     <div class="controls">
         <input type="text" name="user" value="">
     </div>
-    <label class="control-label">{% trans 'MySQL password' %}</label>
+    <label class="control-label">{{ 'MySQL password' | trans }}</label>
     <div class="controls">
         <input type="password" name="password" value="">
     </div>
-    <label class="control-label">{% trans 'MySQL connection charset' %}</label>
+    <label class="control-label">{{ 'MySQL connection charset' | trans }}</label>
     <div class="controls">
         <input type="text" name="charset" class="input-small" value="">
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'Socket port' %}</label>
+    <label class="control-label">{{ 'Socket port' | trans }}</label>
     <div class="controls">
         <input type="text" name="socket" class="input-small" value="">
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'Debug binary mask' %}</label>
+    <label class="control-label">{{ 'Debug binary mask' | trans }}</label>
     <div class="controls">
         <input type="text" name="debugmask" class="input-small" value="">
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'Default language for thesaurus candidates' %}</label>
+    <label class="control-label">{{ 'Default language for thesaurus candidates' | trans }}</label>
     <div class="controls">
         <input type="text" name="clng" class="input-small" value="">
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'Enable stemming languages' %}</label>
+    <label class="control-label">{{ 'Enable stemming languages' | trans }}</label>
     <div class="controls">
         <input type="text" name="stem" class="input-small" value="">
-        <span class="help-inline">{% trans 'example : fr,en' %}</span>
+        <span class="help-inline">{{ 'example : fr,en' | trans }}</span>
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label">{% trans 'Sort records with an empty field' %}</label>
+    <label class="control-label">{{ 'Sort records with an empty field' | trans }}</label>
     <div class="controls">
         <select name="sortempty">
-            <option value="">{% trans 'Hide records' %}</option>
-            <option value="A">{% trans 'At the beginning' %}</option>
-            <option value="Z">{% trans 'At the end' %}</option>
+            <option value="">{{ 'Hide records' | trans }}</option>
+            <option value="A">{{ 'At the beginning' | trans }}</option>
+            <option value="Z">{{ 'At the end' | trans }}</option>
         </select>
     </div>
 </div>
@@ -66,7 +66,7 @@
     <div class="controls">
         <label class="checkbox">
             <input type="checkbox" name="nolog">
-            {% trans 'Do not log, output to console' %}
+            {{ 'Do not log, output to console' | trans }}
         </label>
     </div>
 </div>
@@ -74,8 +74,8 @@
     <div class="controls">
         <label class="checkbox">
             <input type="checkbox" name="winsvc_run">
-            {% trans 'Run as application, not as service' %}
-        <span class="help-inline">({% trans 'Windows specific' %})</span>
+            {{ 'Run as application, not as service' | trans }}
+        <span class="help-inline">({{ 'Windows specific' | trans }})</span>
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/task-manager/task-editor/record-mover.html.twig b/templates/web/admin/task-manager/task-editor/record-mover.html.twig
index 6fa94a1e60..121720922f 100644
--- a/templates/web/admin/task-manager/task-editor/record-mover.html.twig
+++ b/templates/web/admin/task-manager/task-editor/record-mover.html.twig
@@ -56,7 +56,7 @@
 <div class="control-group">
     <div class="controls">
         <label class="checkbox">
-            <input class="formElem" type="checkbox" name="logsql" />{% trans 'Log changes' %}
+            <input class="formElem" type="checkbox" name="logsql" />{{ 'Log changes' | trans }}
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/task-manager/task-editor/subdefs.html.twig b/templates/web/admin/task-manager/task-editor/subdefs.html.twig
index a35d2ef546..71f9616cf7 100644
--- a/templates/web/admin/task-manager/task-editor/subdefs.html.twig
+++ b/templates/web/admin/task-manager/task-editor/subdefs.html.twig
@@ -5,7 +5,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="embedded" value="1">
-            {% trans 'Try to extract embedded thumbnails' %}
+            {{ 'Try to extract embedded thumbnails' | trans }}
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/task-manager/task-editor/task.html.twig b/templates/web/admin/task-manager/task-editor/task.html.twig
index 7ba17c1577..a07031485f 100644
--- a/templates/web/admin/task-manager/task-editor/task.html.twig
+++ b/templates/web/admin/task-manager/task-editor/task.html.twig
@@ -13,24 +13,24 @@
 
             {{ form_rest(form) }}
 
-            <a href="{{ path('admin_tasks_list') }}">{% trans 'Cancel' %}</a>
+            <a href="{{ path('admin_tasks_list') }}">{{ 'Cancel' | trans }}</a>
             <button type="submit" class="btn btn-success btn-trigger " id="taskSaveButton">
-                {% trans "Save" %}
+                {{ "Save" | trans }}
             </button>
         </form>
 
         <div>
-            {% trans 'admin::tasks: Nombre de crashes : ' %} <span id="crash-counter">{{ task.getCrashed() }}</span>
+            {{ 'admin::tasks: Nombre de crashes : ' | trans }} <span id="crash-counter">{{ task.getCrashed() }}</span>
             <button class="btn btn-success" id="taskResetCrashCounterButton">
-                {% trans 'admin::tasks: reinitialiser el compteur de crashes' %}
+                {{ 'admin::tasks: reinitialiser el compteur de crashes' | trans }}
             </button>
         </div>
     </div>
 
     <div id="taskTabs">
         <ul>
-            <li><a href="#taskXmlTab">{% trans 'boutton::vue xml' %}</a></li>
-            <li><a href="#taskGuiTab">{% trans 'boutton::vue graphique' %}</a></li>
+            <li><a href="#taskXmlTab">{{ 'boutton::vue xml' | trans }}</a></li>
+            <li><a href="#taskGuiTab">{{ 'boutton::vue graphique' | trans }}</a></li>
         </ul>
 
         <div id="taskGuiTab" >
diff --git a/templates/web/admin/task-manager/task-editor/write-metadata.html.twig b/templates/web/admin/task-manager/task-editor/write-metadata.html.twig
index 0e619c6038..2594a8ce73 100644
--- a/templates/web/admin/task-manager/task-editor/write-metadata.html.twig
+++ b/templates/web/admin/task-manager/task-editor/write-metadata.html.twig
@@ -5,7 +5,7 @@
     <div class="controls">
         <label class="checkbox">
             <input class="formElem" type="checkbox" name="cleardoc">
-            {% trans 'task::writemeta:effacer les metadatas non presentes dans la structure' %}
+            {{ 'task::writemeta:effacer les metadatas non presentes dans la structure' | trans }}
         </label>
     </div>
 </div>
diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig
index f7c04eaee9..22e74f9223 100644
--- a/templates/web/admin/tree.html.twig
+++ b/templates/web/admin/tree.html.twig
@@ -6,7 +6,7 @@
   <li>
     <a target="right" href="{{ path('admin_dashbord') }}" class="ajax">
       <img src="/skins/admin/Dashboard.png" />
-      <span>{% trans 'Tableau de bord' %}</span>
+      <span>{{ 'Tableau de bord' | trans }}</span>
     </a>
   </li>
   {% else %}
@@ -24,7 +24,7 @@
   </li>
   <li>
     <a target="right" href="{{ path('admin_searchengine_get') }}">
-      <span>{% trans 'SearchEngine settings' %}</span>
+      <span>{{ 'SearchEngine settings' | trans }}</span>
     </a>
   </li>
   {% endif %}
@@ -32,7 +32,7 @@
   <li class="{% if feature == 'connected' %}selected{% endif %}">
     <a target="right" href="{{ path('admin_connected_users') }}" class="ajax zone_online_users">
       <img src="/skins/admin/Connected.png" />
-      <span>{% trans 'admin::utilisateurs: utilisateurs connectes' %}</span>
+      <span>{{ 'admin::utilisateurs: utilisateurs connectes' | trans }}</span>
     </a>
   </li>
 
@@ -40,13 +40,13 @@
   <li class="{% if feature == 'users' %}selected{% endif %}">
     <a target="right" href="{{ path('admin_users_search') }}" class="ajax zone_editusers">
       <img src="/skins/admin/Users.png" />
-      <span>{% trans 'admin::utilisateurs: utilisateurs' %}</span>
+      <span>{{ 'admin::utilisateurs: utilisateurs' | trans }}</span>
     </a>
   </li>
   <li class="{% if feature == 'registrations' %}selected{% endif %}">
     <a target="right" href="{{ path('users_display_demands') }}" class="ajax">
       <img src="/skins/admin/Demandes.png" />
-      <span>{% trans 'admin::utilisateurs: demandes en cours' %}</span>
+      <span>{{ 'admin::utilisateurs: demandes en cours' | trans }}</span>
     </a>
   </li>
   {% endif %}
@@ -55,7 +55,7 @@
   <li class="">
     <a target="right" href="{{ path('admin_feeds_list') }}" class="ajax">
       <img src="/skins/icons/rss16.png" />
-      <span>{% trans 'Publications' %}</span>
+      <span>{{ 'Publications' | trans }}</span>
     </a>
   </li>
   {% endif %}
@@ -64,7 +64,7 @@
   <li class="{% if feature == 'taskmanager' %}selected{% endif %}">
     <a target="right" href="{{ path('admin_tasks_list') }}" class="ajax">
       <img src="/skins/admin/TaskManager.png" />
-      <span>{% trans 'admin::utilisateurs: gestionnaire de taches' %}</span>
+      <span>{{ 'admin::utilisateurs: gestionnaire de taches' | trans }}</span>
     </a>
   </li>
   {% endif %}
@@ -73,7 +73,7 @@
     <div class="{% if feature == 'bases' %}selected{% endif %}" style="padding:0 0 2px 0;">
       <a id="TREE_DATABASES" target="right" href="{{ path('admin_databases') }}" class="ajax">
         <img src="/skins/admin/DatabasesAvailable.png" />
-        <span>{% trans 'admin::utilisateurs: bases de donnees' %}</span>
+        <span>{{ 'admin::utilisateurs: bases de donnees' | trans }}</span>
       </a>
     </div>
     <ul>
@@ -107,36 +107,36 @@
           <li>
             <a target="right" class="ajax" href="{{ path('database_display_stucture', { 'databox_id' : sbas_id }) }}">
               <img src="/skins/icons/miniadjust01.gif"/>
-              <span>{% trans 'admin::structure: reglage de la structure' %}</span>
+              <span>{{ 'admin::structure: reglage de la structure' | trans }}</span>
             </a>
           </li>
           <li>
             <a target="right" href="{{ path('admin_fields', {'sbas_id': sbas_id}) }}" class="ajax">
               <img src="/skins/icons/miniadjust01.gif"/>
-              <span>{% trans 'CHAMPS' %}</span>
+              <span>{{ 'CHAMPS' | trans }}</span>
             </a>
           </li>
           <li>
             <a target="right" href="{{ path('admin_subdefs_subdef', { 'sbas_id' : sbas_id } ) }}">
               <img src="/skins/icons/miniadjust01.gif"/>
-              <span>{% trans 'SUBDEFS' %}</span>
+              <span>{{ 'SUBDEFS' | trans }}</span>
             </a>
           </li>
           <li>
             <a target="right" href="{{ path('database_display_statusbit', { 'databox_id' : sbas_id } ) }}" class="ajax">
               <img src="/skins/icons/miniadjust02.gif"/>
-              <span>{% trans 'admin::status: reglage des status' %}</span>
+              <span>{{ 'admin::status: reglage des status' | trans }}</span>
             </a>
           </li>
           <li>
             <a target="right" href="{{ path('admin_database_display_cgus', { 'databox_id' : sbas_id } ) }}" class="ajax">
-              <span>{% trans 'admin:: CGUs' %}</span>
+              <span>{{ 'admin:: CGUs' | trans }}</span>
             </a>
           </li>
           <li>
               <a target="right" href="{{ path('admin_database_display_collections_order', { 'databox_id' : sbas_id } ) }}" class="ajax">
               <img src="/skins/icons/miniadjust03.gif"/>
-              <span>{% trans 'admin::collection: ordre des collections' %}</span>
+              <span>{{ 'admin::collection: ordre des collections' | trans }}</span>
             </a>
           </li>
         {% endif %}
@@ -153,7 +153,7 @@
           <li>
             <a target="right" href="{{ path('admin_users_search', { 'sbas_id' : [ sbas_id ] }) }}" class="ajax">
               <img src="/skins/admin/Users.png"/>
-              <span>{% trans 'admin::utilisateurs: utilisateurs' %}</span>
+              <span>{{ 'admin::utilisateurs: utilisateurs' | trans }}</span>
             </a>
           </li>
         {% endif %}
@@ -175,7 +175,7 @@
               <li>
                 <a target="right" href="{{ path('admin_collection_display_suggested_values', { 'bas_id' : collection.get_base_id() }) }}" class="ajax">
                   <img src="/skins/icons/foldph20open_0.gif"/>
-                  <span>{% trans 'admin::base: preferences de collection' %}</span>
+                  <span>{{ 'admin::base: preferences de collection' | trans }}</span>
                 </a>
               </li>
             {% endif %}
@@ -187,7 +187,7 @@
               <li>
                 <a target="right" href="{{ path('admin_users_search', { 'base_id' : [ collection.get_base_id() ] }) }}" class="ajax">
                   <img src="/skins/admin/Users.png"/>
-                  <span>{% trans 'admin::utilisateurs: utilisateurs' %}</span>
+                  <span>{{ 'admin::utilisateurs: utilisateurs' | trans }}</span>
                 </a>
               </li>
               {% endif %}
diff --git a/templates/web/admin/user/demand.html.twig b/templates/web/admin/user/demand.html.twig
index a06bb5935b..10b2a168c6 100644
--- a/templates/web/admin/user/demand.html.twig
+++ b/templates/web/admin/user/demand.html.twig
@@ -179,13 +179,13 @@
 </script>
 
 <div class="page-header">
-     <h1>{% trans 'admin:: demandes en cours' %}</h1>
+     <h1>{{ 'admin:: demandes en cours' | trans }}</h1>
 </div>
 
 {% if app['request'].query.get('success') == '1' %}
         <div class="alert alert-success">
             <a class="close" data-dismiss="alert" href="#">×</a>
-            {% trans 'Requests for the application registrations were recorded successfully' %}
+            {{ 'Requests for the application registrations were recorded successfully' | trans }}
         </div>
 {% endif %}
 
@@ -193,25 +193,25 @@
     <form id="accept-demand" action="{{ path('users_submit_demands') }}" method="post">
         <div class="btn-group btn-all-action">
             <button data-event="deny" class="btn deny-checker" type="button">
-                <img title="{% trans 'admin:: refuser l\'acces' %}" src="/skins/icons/delete.gif"/>
+                <img title="{{ 'admin:: refuser l\'acces' | trans }}" src="/skins/icons/delete.gif"/>
             </button>
             <button data-event="accept" class="btn accept-checker" type="button">
-                <img title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src="/skins/icons/cmdok.gif"/>
+                <img title="{{ 'admin:: donner les droits de telechargement et consultation de previews' | trans }}" src="/skins/icons/cmdok.gif"/>
             </button>
             <button data-event="hd" class="btn accept-hd-checker" type="button">
-                <span title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
+                <span title="{{ 'admin:: donner les droits de telechargements de preview et hd' | trans }}">HD</span>
             </button>
             <button data-event="watermark" class="btn accept-watermark-checker" type="button">
-                <span title="{% trans 'admin:: watermarquer les documents' %}">W</span>
+                <span title="{{ 'admin:: watermarquer les documents' | trans }}">W</span>
             </button></td>
         </div>
 
         <table class="table table-condensed" style="margin:0; table-layout:fixed;">
             <thead>
                 <tr>
-                    <th>{% trans 'Informations' %}</th>
-                    <th>{% trans 'admin::collection' %}</th>
-                    <th>{% trans 'Models' %}</th>
+                    <th>{{ 'Informations' | trans }}</th>
+                    <th>{{ 'admin::collection' | trans }}</th>
+                    <th>{{ 'Models' | trans }}</th>
                 </tr>
             </thead>
         </table>
@@ -230,21 +230,21 @@
                             <td>
                                 {% set colls = tableColls[row['usr_id']] %}
                                 <dl class="dl-horizontal">
-                                    <dt>{% trans 'admin::compte-utilisateur identifiant' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur identifiant' | trans }}</dt>
                                     <dd>{{ row['usr_login'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur nom' %} / {% trans 'admin::compte-utilisateur prenom' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur nom' | trans }} / {{ 'admin::compte-utilisateur prenom' | trans }}</dt>
                                     <dd>{{ row['usr_nom'] }}  {{ row['usr_prenom'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur email' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur email' | trans }}</dt>
                                     <dd>{{ row['usr_mail'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur societe' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur societe' | trans }}</dt>
                                     <dd>{{ row['societe'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur poste' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur poste' | trans }}</dt>
                                     <dd>{{ row['fonction'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur activite' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur activite' | trans }}</dt>
                                     <dd>{{ row['activite'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur telephone' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur telephone' | trans }}</dt>
                                     <dd>{{ row['tel'] }}</dd>
-                                    <dt>{% trans 'admin::compte-utilisateur adresse' %}</dt>
+                                    <dt>{{ 'admin::compte-utilisateur adresse' | trans }}</dt>
                                     <dd>{{ row['adresse'] }}</dd>
                                     <dd>{{ row['cpostal'] }}</dd>
                                     <dd>{{ row['ville'] }}</dd>
@@ -258,25 +258,25 @@
                                     </h1>
                                     {% set btn_value = row['usr_id'] ~ "_" ~  basId %}
                                     <div class="btn-group btn-single-action" style="margin:auto auto 5px 0;">
-                                        <button data-event="deny" value="{{ btn_value }}" type="button" name="deny[]" class="btn deny-checker" title="{% trans 'admin:: refuser l\'acces' %}">
-                                            <img title="{% trans 'admin:: refuser l\'acces' %}" src='/skins/icons/delete.gif' />
+                                        <button data-event="deny" value="{{ btn_value }}" type="button" name="deny[]" class="btn deny-checker" title="{{ 'admin:: refuser l\'acces' | trans }}">
+                                            <img title="{{ 'admin:: refuser l\'acces' | trans }}" src='/skins/icons/delete.gif' />
                                         </button>
-                                        <button data-event="accept" value="{{ btn_value }}" type="button" name="accept[]" class="btn accept-checker" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}">
-                                            <img title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src='/skins/icons/cmdok.gif' />
+                                        <button data-event="accept" value="{{ btn_value }}" type="button" name="accept[]" class="btn accept-checker" title="{{ 'admin:: donner les droits de telechargement et consultation de previews' | trans }}">
+                                            <img title="{{ 'admin:: donner les droits de telechargement et consultation de previews' | trans }}" src='/skins/icons/cmdok.gif' />
                                         </button>
-                                        <button data-event="hd" value="{{ btn_value }}" type="button" name="accept_hd[]" class="btn accept-hd-checker" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">
-                                            <span title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
+                                        <button data-event="hd" value="{{ btn_value }}" type="button" name="accept_hd[]" class="btn accept-hd-checker" title="{{ 'admin:: donner les droits de telechargements de preview et hd' | trans }}">
+                                            <span title="{{ 'admin:: donner les droits de telechargements de preview et hd' | trans }}">HD</span>
                                         </button>
-                                        <button data-event="watermark" value="{{ btn_value }}" type="button" name="watermark[]" class="btn accept-watermark-checker" title="{% trans 'admin:: watermarquer les documents' %}">
-                                            <span title="{% trans 'admin:: watermarquer les documents' %}">W</span>
+                                        <button data-event="watermark" value="{{ btn_value }}" type="button" name="watermark[]" class="btn accept-watermark-checker" title="{{ 'admin:: watermarquer les documents' | trans }}">
+                                            <span title="{{ 'admin:: watermarquer les documents' | trans }}">W</span>
                                         </button>
                                     </div>
                                 {% endfor %}
                             </td>
                             <td>
-                                <div>{% trans 'admin:: appliquer le modele' %}</div>
+                                <div>{{ 'admin:: appliquer le modele' | trans }}</div>
                                 <select name="template[]" id="model_{{ row['usr_id'] }}" onchange="modelChecker('{{ row['usr_id'] }}')">
-                                    <option value="">{% trans 'None' %}</option>
+                                    <option value="">{{ 'None' | trans }}</option>
                                     {% for model in models %}
                                         <option value="{{ row['usr_id'] }}_{{ model['usr_id'] }}">{{ model['usr_login'] }}</option>
                                     {% endfor %}
@@ -289,9 +289,9 @@
         </div>
 
         <div class="form-actions">
-            <button type="button" class="btn btn-primary submit">{% trans 'boutton::valider' %}</button>
+            <button type="button" class="btn btn-primary submit">{{ 'boutton::valider' | trans }}</button>
         </div>
     </form>
  {% else %}
-    {% trans 'No application for registration has been recorded' %}
+    {{ 'No application for registration has been recorded' | trans }}
  {% endif %}
diff --git a/templates/web/admin/user/import/file.html.twig b/templates/web/admin/user/import/file.html.twig
index 85232f803f..4098ebe43f 100644
--- a/templates/web/admin/user/import/file.html.twig
+++ b/templates/web/admin/user/import/file.html.twig
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h1>{% trans 'Upload a csv file for users creation' %}</h1>
+    <h1>{{ 'Upload a csv file for users creation' | trans }}</h1>
 </div>
 
 {% if app['request'].query.get('error') is not none %}
@@ -7,15 +7,15 @@
     <div class="alert alert-error">
         <button class="close" data-dismiss="alert" type="button">×</button>
         {% if error == 'file-invalid' %}
-            {% trans 'An error occured while upload the file. Please retry' %}
+            {{ 'An error occured while upload the file. Please retry' | trans }}
         {% elseif error == 'row-login' %}
-            {% trans 'Row login is missing, script has stopped' %}
+            {{ 'Row login is missing, script has stopped' | trans }}
         {% elseif error == 'row-pwd' %}
-            {% trans 'Row password is missing, script has stopped' %}
+            {{ 'Row password is missing, script has stopped' | trans }}
         {% elseif error == 'row-mail' %}
-            {% trans 'Row mail is missing, script has stopped' %}
+            {{ 'Row mail is missing, script has stopped' | trans }}
         {% elseif error == 'no-user' %}
-            {% trans 'The file does not contains any user to add' %}
+            {{ 'The file does not contains any user to add' | trans }}
         {% endif %}
     </div>
 {% endif %}
@@ -33,17 +33,17 @@
 
 <div>
     <div class="well well-small">
-        <a target="_blank" href="{{ path('users_import_csv') }}" class="no-ajax"> <i class="icon-share"></i> {% trans  'You can  download an example by clicking here' %}</a>
+        <a target="_blank" href="{{ path('users_import_csv') }}" class="no-ajax"> <i class="icon-share"></i> {{ 'You can  download an example by clicking here' | trans }}</a>
     </div>
     <div class="well well-small">
-        <a target="_blank" href="{{ path('users_import_rtf') }}" class="no-ajax"> <i class="icon-share"></i> {% trans 'You can download the documentation here' %}</a>
+        <a target="_blank" href="{{ path('users_import_rtf') }}" class="no-ajax"> <i class="icon-share"></i> {{ 'You can download the documentation here' | trans }}</a>
     </div>
     <span class="btn btn-success fileinput-button">
         <i class="icon-plus icon-white"></i>
         <span>{% trans %}Select files...{% endtrans %}</span>
         <input id="fileupload" type="file" name="files" data-url="/admin/users/import/file/" accept="text/csv, text/rtf">
     </span>
-    <a href="{{ path('admin_users_search') }}" class="btn ajax">{% trans 'boutton::retour' %}</a>
+    <a href="{{ path('admin_users_search') }}" class="btn ajax">{{ 'boutton::retour' | trans }}</a>
 </div>
 
 <script>
@@ -68,4 +68,4 @@ $(function () {
         }
     });
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/templates/web/admin/user/import/view.html.twig b/templates/web/admin/user/import/view.html.twig
index b13200c927..106f26a095 100644
--- a/templates/web/admin/user/import/view.html.twig
+++ b/templates/web/admin/user/import/view.html.twig
@@ -26,7 +26,7 @@
     {# Hide wrapper if there are errors #}
     <div class="wrapper {% if errors|length > 0 %}hidden{% endif %}">
         <div class="page-header">
-            <h1>{% trans 'Apply a model' %} <small>({{ nb_user_to_add }} {% trans 'Users' %})</small></h1>
+            <h1>{{ 'Apply a model' | trans }} <small>({{ nb_user_to_add }} {{ 'Users' | trans }})</small></h1>
         </div>
 
         <form method="post" name="importform2" action="{{ path('users_submit_import') }}" ENCTYPE="multipart/form-data" >
@@ -38,17 +38,17 @@
             {% endfor %}
             </select>
             <div class="form-actions">
-                <button class="btn btn-primary" type="submit">{% trans 'boutton::valider' %}</button>
+                <button class="btn btn-primary" type="submit">{{ 'boutton::valider' | trans }}</button>
                 <a href="{{ path('users_display_import_file') }}" target="right" class="btn">{% trans %}Cancel{% endtrans %}</a>
             </div>
         </form>
     </div>
 {% elseif models|length == 0 %}
         <div class="alert alert-block">
-            {% trans 'You need define a model before importing a list of users' %}
+            {{ 'You need define a model before importing a list of users' | trans }}
         </div>
 {% elseif nb_user_to_add == 0 %}
         <div class="alert alert-block">
-            {% trans 'There is no user to add.' %}
+            {{ 'There is no user to add.' | trans }}
         </div>
 {% endif %}
\ No newline at end of file
diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig
index 5b1496a54c..212e9641ea 100644
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -20,61 +20,61 @@
 {% endif %}
 
 <div class="page-header">
-    <h1>{% trans 'Users' %}</h1>
+    <h1>{{ 'Users' | trans }}</h1>
 </div>
 
 <div id="users_page">
         <p class="admin_head_opts">
-            <a class="user_adder" href="#">{% trans 'admin::user: nouvel utilisateur' %}</a>
-            <a class="template_adder" href="#">{% trans 'admin::user: nouveau template' %}</a>
-            <a href="{{ path('users_display_import_file') }}" target='right'>{% trans 'admin::user: import d\'utilisateurs' %}</a> /
-            <a href="#"  onclick="exportlist();return(false);">{% trans 'admin::user: export d\'utilisateurs' %}</a>
-            <a class="invite_modifier" href="#">{% trans 'Reglages:: reglages d acces guest' %}</a>
+            <a class="user_adder" href="#">{{ 'admin::user: nouvel utilisateur' | trans }}</a>
+            <a class="template_adder" href="#">{{ 'admin::user: nouveau template' | trans }}</a>
+            <a href="{{ path('users_display_import_file') }}" target='right'>{{ 'admin::user: import d\'utilisateurs' | trans }}</a> /
+            <a href="#"  onclick="exportlist();return(false);">{{ 'admin::user: export d\'utilisateurs' | trans }}</a>
+            <a class="invite_modifier" href="#">{{ 'Reglages:: reglages d acces guest' | trans }}</a>
             <input type="hidden" value="{{invite_user.get_id()}}" name="invite_user_id"/>
-            <a class="autoregister_modifier" href="#">{% trans 'Reglages:: reglages d inscitpition automatisee' %}</a>
+            <a class="autoregister_modifier" href="#">{{ 'Reglages:: reglages d inscitpition automatisee' | trans }}</a>
             <input type="hidden" value="{{autoregister_user.get_id()}}" name="autoregister_user_id"/>
         </p>
 
         <form id="users_page_search" method="post" action="{{ path('admin_users_search') }}" target="_self" class="form-inline">
             <fieldset class="admin_head_opts">
-            <span>{% trans 'Filter' %}</span>
+            <span>{{ 'Filter' | trans }}</span>
                 <select name="like_field" class="input-medium">
-                    <option {% if parm['like_field'] == "usr_login" %}selected="selected"{% endif %} value="usr_login">{% trans 'Push::filter on login' %}</option>
-                    <option {% if parm['like_field'] == "name" %}selected="selected"{% endif %} value="name">{% trans 'First/Last Name' %}</option>
-                    <option {% if parm['like_field'] == "pays" %}selected="selected"{% endif %} value="pays">{% trans 'Push::filter on countries' %}</option>
-                    <option {% if parm['like_field'] == "societe" %}selected="selected"{% endif %} value="societe">{% trans 'Push::filter on companies' %}</option>
-                    <option {% if parm['like_field'] == "usr_mail" %}selected="selected"{% endif %} value="usr_mail">{% trans 'Push::filter on emails' %}</option>
+                    <option {% if parm['like_field'] == "usr_login" %}selected="selected"{% endif %} value="usr_login">{{ 'Push::filter on login' | trans }}</option>
+                    <option {% if parm['like_field'] == "name" %}selected="selected"{% endif %} value="name">{{ 'First/Last Name' | trans }}</option>
+                    <option {% if parm['like_field'] == "pays" %}selected="selected"{% endif %} value="pays">{{ 'Push::filter on countries' | trans }}</option>
+                    <option {% if parm['like_field'] == "societe" %}selected="selected"{% endif %} value="societe">{{ 'Push::filter on companies' | trans }}</option>
+                    <option {% if parm['like_field'] == "usr_mail" %}selected="selected"{% endif %} value="usr_mail">{{ 'Push::filter on emails' | trans }}</option>
                 </select>
-                <span>{% trans 'Push::filter starts' %}</span>
+                <span>{{ 'Push::filter starts' | trans }}</span>
                 <input type="text" value="{{parm['like_value']}}" name="like_value" class="input-medium">
-                <span>{% trans 'Last applied template' %}</span>
+                <span>{{ 'Last applied template' | trans }}</span>
                 <select name="last_model" class="input-medium">
-                    <option value="">{% trans 'None' %}</option>
+                    <option value="">{{ 'None' | trans }}</option>
                     {% for template in templates %}
                         <option {% if parm['last_model'] == template.get_login() %}selected="selected"{% endif %} value="{{ template.get_login() }}">{{ template.get_login() }}</option>
                     {% endfor %}
                 </select>
-                <button type="submit" class="btn">{% trans 'boutton::chercher' %}</button>
+                <button type="submit" class="btn">{{ 'boutton::chercher' | trans }}</button>
             </fieldset>
         </form>
 
         <form id="users_apply_template" method="post" action="{{ path('admin_users_apply_template') }}" target="_self" class="form-inline pull-left no-ajax" style="margin:0">
             <fieldset class="admin_head_opts">
-                <span>{% trans 'Apply a template' %}</span>
+                <span>{{ 'Apply a template' | trans }}</span>
                 <select name="template_chooser" class="input-medium">
-                    <option value="">{% trans 'boutton::choisir' %}</option>
+                    <option value="">{{ 'boutton::choisir' | trans }}</option>
                     {% for template in templates %}
                         <option value="{{ template.get_id() }}">{{ template.get_display_name() }}</option>
                     {% endfor %}
                 </select>
-                <button type="submit" class="btn">{% trans 'boutton::appliquer' %}</button>
+                <button type="submit" class="btn">{{ 'boutton::appliquer' | trans }}</button>
             </fieldset>
         </form>
 
         <form id="users_reset_rights" method="post" action="{{ path('admin_users_rights_reset') }}" target="_self" class="form-inline pull-right" style="margin:0">
             <fieldset class="admin_head_opts">
                 <input type="hidden" value="" name="users">
-                <button type='button' class="btn btn-warning">{% trans 'Delete all users rights' %}</button>
+                <button type='button' class="btn btn-warning">{{ 'Delete all users rights' | trans }}</button>
             </fieldset>
         </form>
 
@@ -82,42 +82,42 @@
             <thead>
                 <tr>
                     <th style="text-align: center;" class="sortable {{ parm.srt == 'usr_id' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur id utilisateur' %}</span>
+                        <span>{{ 'admin::compte-utilisateur id utilisateur' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="usr_id" />
                     </th>
                     <th class="sortable {{ parm.srt == 'usr_login' ? 'sorted' :  '' }} ">
-                        <span>{% trans 'admin::compte-utilisateur identifiant' %}</span>
+                        <span>{{ 'admin::compte-utilisateur identifiant' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="usr_login" />
                     </th>
                     <th class="sortable {{ parm.srt == 'usr_nom' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'First/Last Name' %}</span>
+                        <span>{{ 'First/Last Name' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="usr_nom" />
                     </th>
                     <th class="sortable {{ parm.srt == 'societe' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur societe' %}</span>
+                        <span>{{ 'admin::compte-utilisateur societe' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="societe" />
                     </th>
                     <th class="sortable {{ parm.srt == 'usr_mail' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur email' %}</span>
+                        <span>{{ 'admin::compte-utilisateur email' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="usr_mail" />
                     </th>
                     <th class="sortable {{ parm.srt == 'pays' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur pays' %}</span>
+                        <span>{{ 'admin::compte-utilisateur pays' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="pays" />
                     </th>
                     <th class="sortable {{ parm.srt == 'lastModel' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur dernier modele applique' %}</span>
+                        <span>{{ 'admin::compte-utilisateur dernier modele applique' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="lastModel" />
                     </th>
                     <th class="sortable {{ parm.srt == 'usr_creationdate' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-                        <span>{% trans 'admin::compte-utilisateur date de creation' %}</span>
+                        <span>{{ 'admin::compte-utilisateur date de creation' | trans }}</span>
                         <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
                         <input type="hidden" name="srt" value="usr_creationdate" />
                     </th>
@@ -128,10 +128,10 @@
                     <tr class="{% if loop.index is odd %}odd{% else %}even{% endif %}" id="user_{{usr.get_id()}}">
                         <td style="text-align: center;">
                             {% if usr.is_template() %}
-                                <img title="{% trans 'This is a template' %}" src="/skins/icons/template.png"/>
+                                <img title="{{ 'This is a template' | trans }}" src="/skins/icons/template.png"/>
                             {% else %}
                                 {% if app['acl'].get(usr).is_phantom() %}
-                                    <img title="{% trans 'This user has no rights' %}" src="/skins/admin/ghost.png"/>
+                                    <img title="{{ 'This user has no rights' | trans }}" src="/skins/admin/ghost.png"/>
                                 {% endif %}
                                 {{usr.get_id()}}
                             {% endif %}
@@ -209,8 +209,8 @@
                     {% set n_par_page = 50 %}
                     <option value="50" {% if parm['per_page'] == 50%}selected="selected"{% endif %}>{% trans %}{{n_par_page}} par page {% endtrans %}</option>
                 </select>
-                <button class="user_modifier btn">{% trans 'boutton::modifier' %}</button>
-                <button class="user_deleter btn">{% trans 'Supprimer' %}</button>
+                <button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
+                <button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>
 
                 <input type="hidden" name="total_results" value="{{users.get_total()}}"/>
                 <input type="hidden" name="page" value="{{users.get_page()}}"/>
@@ -248,7 +248,7 @@
             {% endif %}
             <input name="like_value" value="{{parm.like_value}}" type="hidden" />
             <input name="like_field" value="{{parm.like_field}}" type="hidden" />
-            <button class="btn btn-warning">{% trans 'boutton::exporter' %}</button>
+            <button class="btn btn-warning">{{ 'boutton::exporter' | trans }}</button>
         </form>
 
     <script type="text/javascript">
@@ -269,7 +269,7 @@
 
         if(selectedUsers.length === 0)
         {
-          alert("{% trans 'select at least one user' %}");
+          alert("{{ 'select at least one user' | trans }}");
           return;
         }
 
@@ -278,7 +278,7 @@
           users += $(n).attr("id").split("_").pop() + ';';
         });
 
-        if(confirm("{% trans 'Are you sure you want delete users rights ?' %}"))
+        if(confirm("{{ 'Are you sure you want delete users rights ?' | trans }}"))
         {
           $("#users_reset_rights input[name='users']").val(users);
 
@@ -292,11 +292,11 @@
             success: function(data){
               if(data.error)
               {
-                alert("{% trans 'An error occured' %}");
+                alert("{{ 'An error occured' | trans }}");
               }
               else
               {
-                alert("{% trans 'users rights have been reseted' %}");
+                alert("{{ 'users rights have been reseted' | trans }}");
               }
             }
           });
diff --git a/templates/web/api/auth/end_user_authorization.html.twig b/templates/web/api/auth/end_user_authorization.html.twig
index de2771fb3d..d83808155c 100644
--- a/templates/web/api/auth/end_user_authorization.html.twig
+++ b/templates/web/api/auth/end_user_authorization.html.twig
@@ -40,19 +40,19 @@
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             {% if errorMessage is defined %}
-                                <p class="login_error">{% trans 'Erreur de login / mot de passe' %}</p>
+                                <p class="login_error">{{ 'Erreur de login / mot de passe' | trans }}</p>
                             {% endif %}
                             <p class="login_hello">
                                 {% trans %}
                                 Bonjour, veuillez vous identifier sur {{home_title}} :
                                 {% endtrans %}
                             </p>
-                            <input id="myLogin" name="login" class="span6" type="text" placeholder="{% trans 'admin::compte-utilisateur identifiant' %}" />
-                            <input id="myPass" name="password" class="span6" type="password" placeholder="{% trans 'admin::compte-utilisateur mot de passe' %}" />
-                            <input id="button_login" name="action_login" class="btn btn-inverse btn-large span6" type="submit" value="{% trans 'Se connecter' %}" />
+                            <input id="myLogin" name="login" class="span6" type="text" placeholder="{{ 'admin::compte-utilisateur identifiant' | trans }}" />
+                            <input id="myPass" name="password" class="span6" type="password" placeholder="{{ 'admin::compte-utilisateur mot de passe' | trans }}" />
+                            <input id="button_login" name="action_login" class="btn btn-inverse btn-large span6" type="submit" value="{{ 'Se connecter' | trans }}" />
                         </form>
                         <p>
-                            <a href="#">{% trans 'Probl&egrave;mes de connexion ?' %}</a>
+                            <a href="#">{{ 'Probl&egrave;mes de connexion ?' | trans }}</a>
                         </p>
                     </div>
                 {% else %}
@@ -87,14 +87,14 @@
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             <input type="hidden" name="action_accept" value="1">
-                            <input id="button_access" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Autoriser' %}" />
+                            <input id="button_access" class="btn btn-inverse btn-large span3" type="submit" value="{{ 'Autoriser' | trans }}" />
                         </form>
                         <form method="post" class="access-deny">
                             {% for key,value in auth.getParams %}
                                 <input type="hidden" name="{{key}}" value="{{value}}">
                             {% endfor %}
                             <input type="hidden" name="action_accept" value="0">
-                            <input id="button_deny" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Ne pas autoriser' %}" />
+                            <input id="button_deny" class="btn btn-inverse btn-large span3" type="submit" value="{{ 'Ne pas autoriser' | trans }}" />
                         </form>
                     </div>
                  {% endif %}
diff --git a/templates/web/api/auth/native_app_access_token.html.twig b/templates/web/api/auth/native_app_access_token.html.twig
index b6a13687a0..b1a288f2ae 100644
--- a/templates/web/api/auth/native_app_access_token.html.twig
+++ b/templates/web/api/auth/native_app_access_token.html.twig
@@ -4,9 +4,9 @@
         <meta charset="utf-8" />
         <title>
         {% if error is defined %}
-            {% trans 'Fail' %}
+            {{ 'Fail' | trans }}
         {% else %}
-            {% trans 'Success' %}
+            {{ 'Success' | trans }}
         {% endif %}
             </title>
         <meta name="author" content="Alchemy" />
diff --git a/templates/web/client/answers.html.twig b/templates/web/client/answers.html.twig
index 97e689eeff..1f81a8a3c2 100644
--- a/templates/web/client/answers.html.twig
+++ b/templates/web/client/answers.html.twig
@@ -25,7 +25,7 @@
 </script>
 
 {% set tooltip_html %}
-    <div>{% trans "client::answers: rapport de questions par bases" %}</div>
+    <div>{{ "client::answers: rapport de questions par bases" | trans }}</div>
 {% endset %}
 
 {% set txt %}
@@ -183,13 +183,13 @@
                         <div class="buttons">
                             <div class="minilogos">{{ data['mini_logo']|raw }}</div>
                             {% if data['can_download'] %}
-                                <div class="downloader" title="{% trans 'action : exporter' %}" onclick="evt_dwnl('{{ record.get_serialize_key() }}');"></div>
+                                <div class="downloader" title="{{ 'action : exporter' | trans }}" onclick="evt_dwnl('{{ record.get_serialize_key() }}');"></div>
                             {% endif %}
 
-                            <div class="printer" title="{% trans 'action : print' %}" onClick="evt_print('{{ record.get_serialize_key() }}');"></div>
+                            <div class="printer" title="{{ 'action : print' | trans }}" onClick="evt_print('{{ record.get_serialize_key() }}');"></div>
 
                             {% if data['can_add_to_basket'] %}
-                                <div class="baskAdder" title="{% trans 'action : ajouter au panier' %}" onClick="evt_add_in_chutier({{ record.get_sbas_id() }}, {{ record.get_record_id() }});"></div>
+                                <div class="baskAdder" title="{{ 'action : ajouter au panier' | trans }}" onClick="evt_add_in_chutier({{ record.get_sbas_id() }}, {{ record.get_record_id() }});"></div>
                             {% endif %}
 
                             {% if mod_col != 1 %}
diff --git a/templates/web/client/baskets.html.twig b/templates/web/client/baskets.html.twig
index 314fafc801..79c64a7a6f 100644
--- a/templates/web/client/baskets.html.twig
+++ b/templates/web/client/baskets.html.twig
@@ -21,14 +21,14 @@
                 <td>
                     {% if total_baskets > 0 %}
                         <select id="chutier_name" name="chutier_name" onChange="chg_chu();" style="width:120px;">
-                            <optgroup label="{% trans 'paniers::categories: mes paniers' %}">
+                            <optgroup label="{{ 'paniers::categories: mes paniers' | trans }}">
                                 {% for basket in user_baskets %}
                                     <option class="chut_choice" {% if basket.getId() == selected_basket.getId() %}selected{% endif %} value="{{ basket.getId() }}">
                                         {{ basket.getName() }}
                                     </option>
                                 {% endfor %}
                             </optgroup>
-                            <optgroup label="{% trans 'paniers::categories: paniers recus' %}">
+                            <optgroup label="{{ 'paniers::categories: paniers recus' | trans }}">
                                 {% for basket in recept_user_basket %}
                                     <option class="chut_choice" {% if basket.getId() == selected_basket.getId() %}selected{% endif %} value="{{ basket.getId() }}">
                                         {{ basket.getName() }}
@@ -40,21 +40,21 @@
                 </td>
                 <td style="width:40%">
                     {% if total_baskets > 0 %}
-                        <div class="baskDel" title="{% trans 'action : supprimer' %}" onclick="evt_chutier('DELSSEL');"/></div>
+                        <div class="baskDel" title="{{ 'action : supprimer' | trans }}" onclick="evt_chutier('DELSSEL');"/></div>
                     {% endif %}
-                    <div class="baskCreate" title="{% trans 'action:: nouveau panier' %}" onclick="newBasket();"></div>
+                    <div class="baskCreate" title="{{ 'action:: nouveau panier' | trans }}" onclick="newBasket();"></div>
                     <div style="float:right;position:relative;width:3px;height:16px;"></div>
 
                     {% if total_baskets > 0 and (app['acl'].get(app['authentication'].getUser()).has_right("candwnldhd") or app['acl'].get(app['authentication'].getUser()).has_right("candwnldpreview") or app['acl'].get(app['authentication'].getUser()).has_right("cancmd") > 0) %}
-                        <div class="baskDownload" title="{% trans 'action : exporter' %}" onclick="evt_dwnl();"></div>
+                        <div class="baskDownload" title="{{ 'action : exporter' | trans }}" onclick="evt_dwnl();"></div>
                     {% endif %}
 
                     {% if total_baskets > 0%}
-                        <div class="baskPrint" title="{% trans 'action : print' %}" onclick="evt_print();"></div>
+                        <div class="baskPrint" title="{{ 'action : print' | trans }}" onclick="evt_print();"></div>
                     {% endif %}
 
                     {% if total_baskets > 0 %}
-                        <div class="baskComparator" onclick="openCompare({{ selected_basket.getId() }})" title="{% trans 'action : ouvrir dans le comparateur' %}"></div>
+                        <div class="baskComparator" onclick="openCompare({{ selected_basket.getId() }})" title="{{ 'action : ouvrir dans le comparateur' | trans }}"></div>
                     {% endif %}
                 </td>
             </tr>
@@ -115,13 +115,13 @@
                     <div
                         class="baskOneDel"
                         onclick="evt_del_in_chutier({{ element.getId() }});"
-                        title="{% trans 'action : supprimer' %}">
+                        title="{{ 'action : supprimer' | trans }}">
                     </div>
                     {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'candwnldhd')
                             or app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'candwnldpreview')
                             or app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'cancmd')
                             or app['acl'].get(app['authentication'].getUser()).has_preview_grant(record) %}
-                        <div class="baskOneDownload" onclick="evt_dwnl('{{ record.get_serialize_key() }}');" title="{% trans 'action : exporter' %}"></div>
+                        <div class="baskOneDownload" onclick="evt_dwnl('{{ record.get_serialize_key() }}');" title="{{ 'action : exporter' | trans }}"></div>
                     {% endif %}
                 </div>
             </div>
@@ -148,6 +148,6 @@
     p4.nbNoview = 0;
 
     if(p4.nbNoview > oldNoview) {
-        alert('{% trans 'paniers:: vous avez de nouveaux paniers non consultes' %}');
+        alert('{{ 'paniers:: vous avez de nouveaux paniers non consultes' | trans }}');
     }
 </script>
diff --git a/templates/web/client/home_inter_pub_basket.html.twig b/templates/web/client/home_inter_pub_basket.html.twig
index f47a80da24..74e517d3a9 100644
--- a/templates/web/client/home_inter_pub_basket.html.twig
+++ b/templates/web/client/home_inter_pub_basket.html.twig
@@ -1,6 +1,6 @@
 <div style="height:50px;" class="homePubTitleBox">
     <div style="float:left;width:350px;"><h1 style="font-size:20px;margin-top:15px;">
-            <h1>{% trans "publications:: dernieres publications" %}</h1>
+            <h1>{{ "publications:: dernieres publications" | trans }}</h1>
     </div>
 </div>
 
@@ -22,7 +22,7 @@
                     {% if entry.getUpdatedOn() > entry.getCreatedOn() %}
                         <br/>
                         <span style="font-style:italic;">
-                            {% trans "publications:: derniere mise a jour" %} {{ app['date-formatter'].getPrettyString(entry.getUpdatedOn()) }}
+                            {{ "publications:: derniere mise a jour" | trans }} {{ app['date-formatter'].getPrettyString(entry.getUpdatedOn()) }}
                         </span>
                         <br />
                         <br />
diff --git a/templates/web/client/index.html.twig b/templates/web/client/index.html.twig
index e2739c3515..3cd86a48ab 100644
--- a/templates/web/client/index.html.twig
+++ b/templates/web/client/index.html.twig
@@ -63,19 +63,19 @@
                                                         {% set active_tab = 'ongSearch' %}
                                                     {% endif %}
 
-                                                    <td class="bigTabs {{ tab_active }}" id="ongSearch" onclick="chgOngSearch('ongSearch');">{% trans 'client:: recherche' %}</td>
+                                                    <td class="bigTabs {{ tab_active }}" id="ongSearch" onclick="chgOngSearch('ongSearch');">{{ 'client:: recherche' | trans }}</td>
                                                 {% elseif tab == 2 %}
                                                     {% if tab_active == 'actif' %}
                                                         {% set active_tab = 'ongAdvSearch' %}
                                                     {% endif %}
 
-                                                    <td class="bigTabs {{ tab_active }}" id="ongAdvSearch" onclick="chgOngSearch('ongAdvSearch');return(false);">{% trans 'client:: recherche avancee' %}</td>
+                                                    <td class="bigTabs {{ tab_active }}" id="ongAdvSearch" onclick="chgOngSearch('ongAdvSearch');return(false);">{{ 'client:: recherche avancee' | trans }}</td>
                                                 {% elseif tab == 3 %}
                                                     {% if tab_active == 'actif' %}
                                                         {% set active_tab = 'ongTopic' %}
                                                     {% endif %}
 
-                                                    <td class="bigTabs {{ tab_active }}" id="ongTopic" onclick="chgOngSearch('ongTopic');return(false);"><{% trans 'client:: topics' %}</td>
+                                                    <td class="bigTabs {{ tab_active }}" id="ongTopic" onclick="chgOngSearch('ongTopic');return(false);"><{{ 'client:: topics' | trans }}</td>
                                                 {% endif %}
                                             {% endif %}
                                         {% endfor %}
@@ -92,27 +92,27 @@
                                             <div id="idongAdvSearch" style="display:none;">
                                                 <div>
                                                     <select name="opAdv[]" style="width:54px">
-                                                        <option value="{% trans "phraseanet::technique:: et" %}">{% trans "phraseanet::technique:: et" %}</option>
-                                                        <option value="{% trans "phraseanet::technique:: or" %}">{% trans "phraseanet::technique:: or" %}</option>
-                                                        <option value="{% trans "phraseanet::technique:: except" %}">{% trans "phraseanet::technique:: except" %}</option>
+                                                        <option value="{{ "phraseanet::technique:: et" | trans }}">{{ "phraseanet::technique:: et" | trans }}</option>
+                                                        <option value="{{ "phraseanet::technique:: or" | trans }}">{{ "phraseanet::technique:: or" | trans }}</option>
+                                                        <option value="{{ "phraseanet::technique:: except" | trans }}">{{ "phraseanet::technique:: except" | trans }}</option>
                                                     </select>
                                                     <input type="text" name="qryAdv[]" id="qryAdv1" style="width:185px">
                                                 </div>
                                                 <div>
                                                     <select name="opAdv[]" style="width:54px">
-                                                        <option value="{% trans "phraseanet::technique:: et" %}">{% trans "phraseanet::technique:: et" %}</option>
-                                                        <option value="{% trans "phraseanet::technique:: or" %}">{% trans "phraseanet::technique:: or" %}</option>
-                                                        <option value="{% trans "phraseanet::technique:: except" %}">{% trans "phraseanet::technique:: except" %}</option>
+                                                        <option value="{{ "phraseanet::technique:: et" | trans }}">{{ "phraseanet::technique:: et" | trans }}</option>
+                                                        <option value="{{ "phraseanet::technique:: or" | trans }}">{{ "phraseanet::technique:: or" | trans }}</option>
+                                                        <option value="{{ "phraseanet::technique:: except" | trans }}">{{ "phraseanet::technique:: except" | trans }}</option>
                                                     </select>
                                                     <input type="text" name="qryAdv[]" id="qryAdv2" style="width:185px">
                                                 </div>
                                             </div>
                                             {% if app['phraseanet.registry'].get('GV_client_coll_ckbox') == 'popup' %}
                                                 <div>
-                                                    {% trans "client::recherche: rechercher dans les bases :" %}
+                                                    {{ "client::recherche: rechercher dans les bases :" | trans }}
                                                     {% if app['phraseanet.appbox'].get_databoxes()|length > 0 %}
                                                         <select id="basSelector" onchange="beforeAnswer();" style="width:245px;">
-                                                            <option value="{{ storage_access['collections']|keys|join(';') }}">{% trans "client::recherche: rechercher dans toutes les bases" %}</option>
+                                                            <option value="{{ storage_access['collections']|keys|join(';') }}">{{ "client::recherche: rechercher dans toutes les bases" | trans }}</option>
                                                             {% for sbasId, databoxWrapper in storage_access['databoxes'] %}
                                                                 {% set databox = databoxWrapper['databoxes'] %}
                                                                 {% set collections = databoxWrapper['collections'] %}
@@ -130,7 +130,7 @@
                                                 </div>
                                             {% endif %}
                                             <div>
-                                                <select title="{% trans "phraseanet:: presentation des resultats" %}" name="mod" id="mod" onChange="changeModCol();" >
+                                                <select title="{{ "phraseanet:: presentation des resultats" | trans }}" name="mod" id="mod" onChange="changeModCol();" >
                                                     {% for property in grid_properties %}
                                                         {% set selected = '' %}
                                                         {% if mod_pres is empty %}
@@ -144,13 +144,13 @@
                                                         <option {{ selected }} value="{{ property['h'] ~ 'X' ~ property['w'] }}"> {{ property['name'] }}</option>
                                                     {% endfor %}
                                                 </select>
-                                                <input type="radio" value="0" class="checkbox" {% if app['phraseanet.registry'].get('GV_defaultQuery_type') == 0 %}checked="checked"{% endif %} id="search_type_docs" name="search_type" /><label for="search_type_docs">{% trans "phraseanet::type:: documents" %}</label>
-                                                <input type="radio" value="1" class="checkbox" {% if app['phraseanet.registry'].get('GV_defaultQuery_type') != 0 %}checked="checked"{% endif %} id="search_type_group" name="search_type" /><label for="search_type_group">{% trans "phraseanet::type:: reportages" %}</label>
+                                                <input type="radio" value="0" class="checkbox" {% if app['phraseanet.registry'].get('GV_defaultQuery_type') == 0 %}checked="checked"{% endif %} id="search_type_docs" name="search_type" /><label for="search_type_docs">{{ "phraseanet::type:: documents" | trans }}</label>
+                                                <input type="radio" value="1" class="checkbox" {% if app['phraseanet.registry'].get('GV_defaultQuery_type') != 0 %}checked="checked"{% endif %} id="search_type_group" name="search_type" /><label for="search_type_group">{{ "phraseanet::type:: reportages" | trans }}</label>
                                                 <input type="hidden" name="sort" value="{{ app['phraseanet.registry'].get('GV_phrasea_sort') }}"/>
                                                 <input type="hidden" name="ord" id="searchOrd" value="{{ search_order }}" />
                                             </div>
                                             <div>
-                                                <div style="text-align:center;"><input class="pointer" type="button" onclick="doSearch();" value="{% trans "boutton::rechercher" %}" /></div>
+                                                <div style="text-align:center;"><input class="pointer" type="button" onclick="doSearch();" value="{{ "boutton::rechercher" | trans }}" /></div>
                                             </div>
                                         </div>
                                         <input type="hidden" name="pag" id="formAnswerPage" value="">
@@ -159,17 +159,17 @@
                                         <div class="onglets" style="white-space: nowrap; margin-left: 5px; width: 227px;">
                                             {% if app['phraseanet.registry'].get('GV_client_coll_ckbox') == 'checkbox' %}
                                                 <span id="idOnglet1" class="actif actives" onclick="chgOng(1);">
-                                                    {% trans "phraseanet:: collections" %} <img onclick="removeFilters();" id="filter_danger" src="/skins/icons/alert.png" title="{% trans "client::recherche: cliquez ici pour desactiver tous les filtres de toutes base" %}" style="vertical-align:bottom;width:12px;height:12px;display:none;"/>
+                                                    {{ "phraseanet:: collections" | trans }} <img onclick="removeFilters();" id="filter_danger" src="/skins/icons/alert.png" title="{{ "client::recherche: cliquez ici pour desactiver tous les filtres de toutes base" | trans }}" style="vertical-align:bottom;width:12px;height:12px;display:none;"/>
                                                 </span>
                                             {% endif %}
 
                                             {% if app['phraseanet.registry'].get('GV_thesaurus') %}
                                                 <span id="idOnglet4" class="{{ app['phraseanet.registry'].get('GV_client_coll_ckbox') == 'checkbox' ? "inactif" : "actif" }} actives" onclick="chgOng(4);">
-                                                    {% trans "phraseanet:: propositions" %}
+                                                    {{ "phraseanet:: propositions" | trans }}
                                                 </span>
                                             {% endif %}
                                             <span id="idOnglet5" class="{{ not app['phraseanet.registry'].get('GV_client_coll_ckbox') == 'checkbox' and not app['phraseanet.registry'].get('GV_thesaurus') ? 'actif' : 'inactif' }} actives" onclick="chgOng(5);">
-                                                {% trans "phraseanet:: historique" %}
+                                                {{ "phraseanet:: historique" | trans }}
                                             </span>
                                         </div>
                                     </div>
@@ -178,8 +178,8 @@
                                             <div id="onglet1" style="display:block;height:100%;overflow-x: hidden; overflow-y: auto;" class="searchZone" >
                                                 <div>
                                                     <div style="text-align:center;margin:5px;">
-                                                        <input id="bases_all" class="actives" type="button" value="{% trans 'boutton:: selectionner toutes les bases' %}" onclick="checkBases(true);"/>
-                                                        <input id="bases_none" class="actives" type="button" value="{% trans 'boutton:: selectionner aucune base' %}" onclick="checkBases(false);"/>
+                                                        <input id="bases_all" class="actives" type="button" value="{{ 'boutton:: selectionner toutes les bases' | trans }}" onclick="checkBases(true);"/>
+                                                        <input id="bases_none" class="actives" type="button" value="{{ 'boutton:: selectionner aucune base' | trans }}" onclick="checkBases(false);"/>
                                                     </div>
                                                 </div>
                                                 <div>
@@ -192,7 +192,7 @@
                                                                         <div class="basTitle">
                                                                             <input class="basChecker checkbox" id="basChecker{{ sbasId }}" type="checkbox" onclick="chkSbas({{ sbasId }},this)" />
                                                                             <label for="basChecker{{ sbasId }}">{{ databox.get_label(app['locale.I18n']) }}</label>
-                                                                            <img onclick="removeFilters({{ sbasId }});" id="filter_danger{{ sbasId }}" class="filter_danger" src="/skins/icons/alert.png" title="{% trans "client::recherche: cliquez ici pour desactiver tous les filtres de cette base" %}" style="vertical-align:bottom;width:12px;height:12px;display:none;"/>
+                                                                            <img onclick="removeFilters({{ sbasId }});" id="filter_danger{{ sbasId }}" class="filter_danger" src="/skins/icons/alert.png" title="{{ "client::recherche: cliquez ici pour desactiver tous les filtres de cette base" | trans }}" style="vertical-align:bottom;width:12px;height:12px;display:none;"/>
                                                                         </div>
                                                                         {% set status_bit_filters = '' %}
                                                                         {% for bit, data in databox.get_statusbits() if data['searchable'] %}
@@ -246,10 +246,10 @@
                                                                                                     </tr>
                                                                                                     <tr>
                                                                                                         <td style="width:50%;">
-                                                                                                            {% trans "phraseanet::time:: de" %}
+                                                                                                            {{ "phraseanet::time:: de" | trans }}
                                                                                                         </td>
                                                                                                         <td style="width:50%;">
-                                                                                                            {% trans "phraseanet::time:: a" %}
+                                                                                                            {{ "phraseanet::time:: a" | trans }}
                                                                                                         </td>
                                                                                                     </tr>
                                                                                                     <tr>
@@ -279,23 +279,23 @@
                                                                         {% if  status_bit_filters is not empty or fields_filters is not empty or date_filters is not empty %}
                                                                             <div class="filter">
                                                                                 <span class="actives" onclick="toggleFilter('Filters{{sbasId}}',this);">
-                                                                                    {% trans "client::recherche: filter sur" %}
+                                                                                    {{ "client::recherche: filter sur" | trans }}
                                                                                 </span>
                                                                             </div>
                                                                             <div id="Filters{{ sbasId }}" class="base_filter" style="display:none;">
                                                                                 {% if date_filters is not empty %}
-                                                                                    <div class="filterTitle">{% trans "client::recherche: filtrer par dates" %}</div>
+                                                                                    <div class="filterTitle">{{ "client::recherche: filtrer par dates" | trans }}</div>
                                                                                     {{ date_filters|raw }}
                                                                                 {% endif %}
                                                                                 {% if status_bit_filters is not empty %}
-                                                                                    <div class="filterTitle">{% trans "client::recherche: filtrer par status" %}</div>
+                                                                                    <div class="filterTitle">{{ "client::recherche: filtrer par status" | trans }}</div>
                                                                                     {{ status_bit_filters|raw }}
                                                                                 {% endif %}
                                                                                 {% if fields_filters is not empty %}
-                                                                                    <div class="filterTitle">{% trans "client::recherche: filtrer par champs" %}</div>
+                                                                                    <div class="filterTitle">{{ "client::recherche: filtrer par champs" | trans }}</div>
                                                                                     <div>
                                                                                         <select db="{{sbasId}}" onchange="checkFilters();" name="infield[]" style="width:165px;">
-                                                                                            <option value="" selected="selected">{% trans 'client::recherche: filtrer par champs : tous les champs' %}</option>
+                                                                                            <option value="" selected="selected">{{ 'client::recherche: filtrer par champs : tous les champs' | trans }}</option>
                                                                                             {{ fields_filters|raw }}
                                                                                         </select>
                                                                                     </div>
@@ -361,7 +361,7 @@
                         <span id="SPANTITLE" style="font-size:16px;font-weight:bold;"> </span>
                         <div style="position:absolute;right:0;top:0;">
                             <div onclick="closePreview();" style="cursor:pointer;color:#CCCCCC;font-size:12px;font-weight:bold;text-align:right;text-decoration:underline;">
-                                {% trans 'boutton::fermer' %}
+                                {{ 'boutton::fermer' | trans }}
                             </div>
                         </div>
                     </div>
@@ -377,9 +377,9 @@
                     <div style="margin-right:10px;">
                         <div id="PREVIEWIMGDESC" class="preview_col_cont" style="overflow-x:hidden;overflow-y:auto;">
                             <ul style="height:30px;overflow:hidden;">
-                                <li><a href="#PREVIEWIMGDESCINNER-BOX">{% trans 'preview:: Description' %}</a></li>
-                                <li><a href="#HISTORICOPS-BOX">{% trans 'preview:: Historique' %}</a></li>
-                                <li><a href="#popularity-BOX">{% trans 'preview:: Popularite' %}</a></li>
+                                <li><a href="#PREVIEWIMGDESCINNER-BOX">{{ 'preview:: Description' | trans }}</a></li>
+                                <li><a href="#HISTORICOPS-BOX">{{ 'preview:: Historique' | trans }}</a></li>
+                                <li><a href="#popularity-BOX">{{ 'preview:: Popularite' | trans }}</a></li>
                             </ul>
                             <div id="PREVIEWIMGDESCINNER-BOX" class="descBoxes">
                                 <div id="PREVIEWIMGDESCINNER" style="margin:10px;overflow-x:hidden;overflow-y:auto;">
@@ -405,7 +405,7 @@
             <div id="MESSAGE"></div>
         </div>
         <iframe id="MODALDL" class="modalbox" src="" name="download" frameborder="0"></iframe>
-        <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;z-index:12000;">
+        <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;z-index:12000;">
         </div>
         <form name="formChu" id="formChu" action="{{ path('get_client_baskets') }}" method="post" style="visibility:hidden; display:none" >
             <input type="hidden" name="sbas" id="formChubas" value="">
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index b2b5371f38..505066a18c 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -3,56 +3,56 @@
 {% macro print_ftp_form(datas) %}
     <div class="ftp_form ftp_form_{{datas.usr_id}}">
         <div class="control-group">
-            <label class="control-label" for="ftp-address-{{datas.usr_id}}">{% trans 'phraseanet:: adresse' %}  ftp://</label>
+            <label class="control-label" for="ftp-address-{{datas.usr_id}}">{{ 'phraseanet:: adresse' | trans }}  ftp://</label>
             <div class="controls">
                 <input type="text" name="address" id="ftp-address-{{datas.usr_id}}" value="{{datas.address}}" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-ssl-{{datas.usr_id}}">{% trans 'phraseanet:: utiliser SSL' %}</label>
+            <label class="control-label" for="ftp-ssl-{{datas.usr_id}}">{{ 'phraseanet:: utiliser SSL' | trans }}</label>
             <div class="controls">
                 <input type="checkbox" name="ssl" id="ftp-ssl-{{datas.usr_id}}" {% if datas.ssl %}checked{% endif %} />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-login-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur identifiant' %}</label>
+            <label class="control-label" for="ftp-login-{{datas.usr_id}}">{{ 'admin::compte-utilisateur identifiant' | trans }}</label>
             <div class="controls">
                 <input type="text" name="login" id="ftp-login-{{datas.usr_id}}" value="{{datas.login}}" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-password-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur mot de passe' %}</label>
+            <label class="control-label" for="ftp-password-{{datas.usr_id}}">{{ 'admin::compte-utilisateur mot de passe' | trans }}</label>
             <div class="controls">
                 <input type="password" name="password" id="ftp-password-{{datas.usr_id}}" value="{{datas.password}}" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-passive-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Utiliser le mode passif' %}</label>
+            <label class="control-label" for="ftp-passive-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Utiliser le mode passif' | trans }}</label>
             <div class="controls">
                 <input value="1" type="checkbox" name="passive" id="ftp-passive-{{datas.usr_id}}" {% if datas.passive %}checked{% endif %} />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-max-retry-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: Nombre d\'essais max' %}</label>
+            <label class="control-label" for="ftp-max-retry-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: Nombre d\'essais max' | trans }}</label>
             <div class="controls">
                 <input type="text" name="max_retry" id="ftp-max-retry-{{datas.usr_id}}" value="{{datas.max_retry}}" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-dest-folder-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp:  repertoire de destination ftp' %}</label>
+            <label class="control-label" for="ftp-dest-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp:  repertoire de destination ftp' | trans }}</label>
             <div class="controls">
                 <input type="text" name="dest_folder" id="ftp-dest-folder-{{datas.usr_id}}" value="{{datas.dest_folder}}" />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="ftp-prefix-folder-{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: creer un dossier' %}</label>
+            <label class="control-label" for="ftp-prefix-folder-{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: creer un dossier' | trans }}</label>
             <div class="controls">
                 <input type="checkbox" class="ftp_folder_check" {% if datas.prefix_folder != '' %}checked{% endif %} name="prefix_folder_check" id="ftp-prefix-folder-check-{{datas.usr_id}}" />
                 <input type="text" name="prefix_folder" id="ftp-prefix-folder-{{datas.usr_id}}" value="{{datas.prefix_folder}}" {% if datas.prefix_folder == '' %}disabled{% endif %} />
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label" for="logfile_{{datas.usr_id}}">{% trans 'admin::compte-utilisateur:ftp: ecrire un fichier de log' %}</label>
+            <label class="control-label" for="logfile_{{datas.usr_id}}">{{ 'admin::compte-utilisateur:ftp: ecrire un fichier de log' | trans }}</label>
             <div class="controls">
                 <input type="checkbox" class=ftp_logfile_check" name="logfile" id="logfile_{{datas.usr_id}}" value="1" />
             </div>
@@ -62,15 +62,15 @@
 
 {% macro choose_title(id, choose_export_title, default_export_title)%}
     <div class="buttons_line" style="display:{% if choose_export_title %}{% else %}none{% endif %}; text-align: left;">
-        <p>{% trans 'Nom des fichiers a l\'export'%}</p>
+        <p>{{ 'Nom des fichiers a l\'export' | trans }}</p>
         <div class="well-small">
             <label for="type_{{id}}_original" class="radio">
                 <input type="radio" name="type" id="type_{{id}}_original" {% if default_export_title == "title" %}checked{% endif %} value="title" />
-                {% trans 'export::titre: titre du documument' %}
+                {{ 'export::titre: titre du documument' | trans }}
             </label>
             <label for="type_{{id}}_title" class="radio">
                 <input type="radio" name="type" id="type_{{id}}_title" {% if default_export_title == "original" %}checked{% endif %} value="originalname" />
-                {% trans 'export::titre: nom original du document' %}
+                {{ 'export::titre: nom original du document' | trans }}
             </label>
         </div>
     </div>
@@ -84,28 +84,28 @@
 {% else %}
     {% if download.get_total_download() <= 0 and download.get_total_order() <= 0 and download.get_total_ftp() <= 0%}
         <div class="buttons_line" style="text-align: left;">
-            <p>{% trans 'Les documents ne peuvent pas etre exportes' %}</p>
-            <button type="button" class="close_button">{% trans 'boutton::fermer'%}</button>
+            <p>{{ 'Les documents ne peuvent pas etre exportes' | trans }}</p>
+            <button type="button" class="close_button">{{ 'boutton::fermer' | trans }}</button>
         </div>
     {% endif %}
 
     <div class="tabs">
         <ul>
             {% if download.get_total_download() > 0 %}
-                <li><a href="#download">{% trans 'export:: telechargement' %}</a></li>
-                <li><a href="#sendmail">{% trans 'export:: envoi par mail' %}</a></li>
+                <li><a href="#download">{{ 'export:: telechargement' | trans }}</a></li>
+                <li><a href="#sendmail">{{ 'export:: envoi par mail' | trans }}</a></li>
             {% endif %}
             {% if download.get_total_order() > 0 %}
-                <li><a href="#order">{% trans 'export:: commande' %}</a></li>
+                <li><a href="#order">{{ 'export:: commande' | trans }}</a></li>
             {% endif %}
             {% if download.get_total_ftp() > 0 %}
-                <li><a href="#ftp">{% trans 'export:: FTP' %}</a></li>
+                <li><a href="#ftp">{{ 'export:: FTP' | trans }}</a></li>
             {% endif %}
         </ul>
         {% if download.get_total_download() > 0 %}
             <div id="download">
                 <div style="padding:10px; text-align: center;">
-                    <h4>{% trans 'export:: telechargement' %}</h4>
+                    <h4>{{ 'export:: telechargement' | trans }}</h4>
                     <form method="post" target="_blank" action="{{ path('check_download') }}" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
@@ -119,14 +119,14 @@
                                         {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}})
                                         {% if values.refused|length > 0 %}
                                             {% set title%}
-                                                {% trans 'Documents indisponibles' %}
+                                                {{ 'Documents indisponibles' | trans }}
                                             {% endset %}
                                             <a href="#" class="undisposable_link" title="{{title|trim}}"> + </a>
                                         {% endif %}
                                     </label>
                                     {% if values.refused|length > 0 %}
                                         <div style="display:none;" class="well-small undisposable">
-                                            <div>{% trans 'Les documents ne peuvent pas etre exportes' %}</div>
+                                            <div>{{ 'Les documents ne peuvent pas etre exportes' | trans }}</div>
                                             {% for datas in values.refused%}
                                                 {{ thumbnail.format(datas, 80, 80,'', true, false) }}
                                             {% endfor %}
@@ -139,7 +139,7 @@
                             <div class="businessfields well-small" style="margin-left:20px;display:none;">
                                 <label for="business_download" class="checkbox">
                                     <input type="checkbox" name="businessfields" id="business_download" value="1"  />
-                                    {% trans 'Include Business-fields in caption' %}
+                                    {{ 'Include Business-fields in caption' | trans }}
                                 </label>
                             </div>
                         {% endif %}
@@ -158,20 +158,20 @@
                             </div>
                         {% endif %}
                         <div class="buttons_line">
-                            <button type="button" class="download_button btn btn-inverse">{% trans 'boutton::telecharger'%}</button>
-                            <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
+                            <button type="button" class="download_button btn btn-inverse">{{ 'boutton::telecharger' | trans }}</button>
+                            <button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
                         </div>
                     </form>
                 </div>
             </div>
             <div id="sendmail">
                 <div style="padding:10px; text-align: center;">
-                    <h4>{% trans 'export:: envoi par mail' %}</h4>
+                    <h4>{{ 'export:: envoi par mail' | trans }}</h4>
                         <form action="{{ path('export_mail') }}" method="post" target="sendmail_target" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
                         <div>
-                            {% trans 'export::mail: destinataire' %}
+                            {{ 'export::mail: destinataire' | trans }}
                             <input type="text" value="" name="destmail" class="required span4">
                             {% set my_email = app['authentication'].getUser().get_email() %}
                             {% if my_email != '' %}
@@ -181,18 +181,18 @@
                                 </label>
                             {% else %}
                                 <label class="checkbox">
-                                    {% trans 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' %}
+                                    {{ 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' | trans }}
                                     <input type="checkbox" name="reading_confirm" value="1" readonly />
                                 </label>
                             {% endif %}
-                            <span style="font-style: italic; color: #999999;">{% trans 'Entrez plusieurs adresses email en les separant par des points-virgules' %}</span>
+                            <span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
                         </div>
                         <div>
-                            <p>{% trans 'export::mail: contenu du mail' %}</p>
+                            <p>{{ 'export::mail: contenu du mail' | trans }}</p>
                             <textarea rows="6" style="width:90%; white-space:pre;resize:none;" name="textmail" id="sendmail_message"></textarea>
                         </div>
                         <div>
-                            <p>{% trans 'export::mail: fichiers joint' %}</p>
+                            <p>{{ 'export::mail: fichiers joint' | trans }}</p>
                             {% for name, values in download.get_display_download() %}
                                 {% if values.available > 0 %}
                                     <div class="well-small">
@@ -201,14 +201,14 @@
                                             {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}})
                                             {% if values.refused|length > 0 %}
                                                 {% set title%}
-                                                    {% trans 'Documents indisponibles' %}
+                                                    {{ 'Documents indisponibles' | trans }}
                                                 {% endset %}
                                                 <a href="#" class="undisposable_link" title="{{title|trim}}"> + </a>
                                             {% endif %}
                                         </label>
                                         {% if values.refused|length > 0 %}
                                             <div style="display:none;" class="well-small undisposable">
-                                                <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
+                                                <div><i>{{ 'La sous resolution n\'est pas disponible pour les documents suivants' | trans }}</i></div>
                                                 {% for datas in values.refused%}
                                                     {{ thumbnail.format(datas, 80, 80,'', true, false) }}
                                                 {% endfor %}
@@ -222,7 +222,7 @@
                             <div class="businessfields well-small" style="margin-left:20px;display:none;">
                                 <label for="business_sendmail" class="checkbox">
                                     <input type="checkbox" name="businessfields" id="business_sendmail" value="1"  />
-                                    {% trans 'Include Business-fields in caption' %}
+                                    {{ 'Include Business-fields in caption' | trans }}
                                 </label>
                             </div>
                         {% endif %}
@@ -241,9 +241,9 @@
                             </div>
                         {% endif %}
                         <div class="buttons_line">
-                            <button type="button" class="sendmail_button btn btn-inverse">{% trans 'boutton::envoyer'%}</button>
+                            <button type="button" class="sendmail_button btn btn-inverse">{{ 'boutton::envoyer' | trans }}</button>
                             <img class="sendmail_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
+                            <button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
                         </div>
                     </form>
                 </div>
@@ -270,11 +270,11 @@
                             {% endif %}
                             {% if values.refused|length > 0 %}
                                 {% set title%}
-                                    {% trans 'Documents indisponibles' %}
+                                    {{ 'Documents indisponibles' | trans }}
                                 {% endset %}
                                 <a href="#" class="undisposable_link" title="{{title|trim}}"> + </a>
                                 <div style="display:none;" class="well-small undisposable">
-                                    <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
+                                    <div><i>{{ 'La sous resolution n\'est pas disponible pour les documents suivants' | trans }}</i></div>
                                     {% for datas in values.refused%}
                                         {{ thumbnail.format(datas, 80, 80,'', true, false) }}
                                     {% endfor %}
@@ -289,95 +289,95 @@
                     <input type="hidden" name="ssel" value="{{ssttid}}"/>
 
                     <div class="control-group">
-                        <label class="control-label" for="order_usage">{% trans 'commande::utilisation prevue' %}</label>
+                        <label class="control-label" for="order_usage">{{ 'commande::utilisation prevue' | trans }}</label>
                         <div class="controls">
                           <textarea rows="5" name="use" id="order_usage"></textarea>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="deadline">{% trans 'commande::deadline' %}</label>
+                        <label class="control-label" for="deadline">{{ 'commande::deadline' | trans }}</label>
                         <div class="controls">
                           <input class="datepicker" type="text" name="deadline" id="deadline" value="" />
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="sexe">{% trans 'Civility' %}</label>
+                        <label class="control-label" for="sexe">{{ 'Civility' | trans }}</label>
                         <div class="controls">
                             <select name="sexe" id="sexe">
-                                <option {% if app['authentication'].getUser().get_gender == 0 %}selected="selected"{% endif %} value="0">{% trans 'admin::compte-utilisateur:sexe: mademoiselle' %}</option>
-                                <option {% if app['authentication'].getUser().get_gender == 1 %}selected="selected"{% endif %} value="1">{% trans 'admin::compte-utilisateur:sexe: madame' %}</option>
-                                <option {% if app['authentication'].getUser().get_gender == 2 %}selected="selected"{% endif %} value="2">{% trans 'admin::compte-utilisateur:sexe: monsieur' %}</option>
+                                <option {% if app['authentication'].getUser().get_gender == 0 %}selected="selected"{% endif %} value="0">{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
+                                <option {% if app['authentication'].getUser().get_gender == 1 %}selected="selected"{% endif %} value="1">{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
+                                <option {% if app['authentication'].getUser().get_gender == 2 %}selected="selected"{% endif %} value="2">{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
                             </select>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_lastname">{% trans 'admin::compte-utilisateur nom' %}</label>
+                        <label class="control-label" for="usr_lastname">{{ 'admin::compte-utilisateur nom' | trans }}</label>
                         <div class="controls">
                             <input id='usr_lastname' type="text" name="usr_nom" class="required" value="{{ app['authentication'].getUser().get_lastname() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_firstname">{% trans 'admin::compte-utilisateur prenom' %}</label>
+                        <label class="control-label" for="usr_firstname">{{ 'admin::compte-utilisateur prenom' | trans }}</label>
                         <div class="controls">
                             <input type="text" name="usr_prenom" class="required" id="usr_firstname" value="{{ app['authentication'].getUser().get_firstname() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_mail"> {% trans 'admin::compte-utilisateur email' %}</label>
+                        <label class="control-label" for="usr_mail"> {{ 'admin::compte-utilisateur email' | trans }}</label>
                         <div class="controls">
                             <input class="required" type="text" name="usr_mail" id="usr_mail" value="{{ app['authentication'].getUser().get_email() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_tel">{% trans 'admin::compte-utilisateur telephone' %}</label>
+                        <label class="control-label" for="usr_tel">{{ 'admin::compte-utilisateur telephone' | trans }}</label>
                         <div class="controls">
                             <input type="text" name="tel" id="usr_tel" value="{{ app['authentication'].getUser().get_tel() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_societe">{% trans 'admin::compte-utilisateur societe' %}</label>
+                        <label class="control-label" for="usr_societe">{{ 'admin::compte-utilisateur societe' | trans }}</label>
                         <div class="controls">
                             <input type="text" name="societe" id="usr_societe" value="{{ app['authentication'].getUser().get_company() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_function">{% trans 'admin::compte-utilisateur poste' %}</label>
+                        <label class="control-label" for="usr_function">{{ 'admin::compte-utilisateur poste' | trans }}</label>
                         <div class="controls">
                             <input type="text" name="fonction" id="usr_fonction" value="{{ app['authentication'].getUser().get_job() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_address">{% trans 'admin::compte-utilisateur adresse' %}</label>
+                        <label class="control-label" for="usr_address">{{ 'admin::compte-utilisateur adresse' | trans }}</label>
                         <div class="controls">
                             <input class="required" type="text" name="adresse" id="usr_adresse" value="{{ app['authentication'].getUser().get_address() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_zip_code">{% trans 'admin::compte-utilisateur code postal' %}</label>
+                        <label class="control-label" for="usr_zip_code">{{ 'admin::compte-utilisateur code postal' | trans }}</label>
                         <div class="controls">
                             <input id="usr_zip_code" type="text" name="cpostal" name="cpostal" class="required" value="{{ app['authentication'].getUser().get_zipcode() }}"/>
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="command_geoname_field">{% trans 'admin::compte-utilisateur ville' %}</label>
+                        <label class="control-label" for="command_geoname_field">{{ 'admin::compte-utilisateur ville' | trans }}</label>
                         <div class="controls">
                             <input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" value="{{ app['authentication'].getUser().get_geonameid() }}" />
                         </div>
                     </div>
 
                     <div class="control-group">
-                        <label class="control-label" for="usr_fax">{% trans 'admin::compte-utilisateur fax' %}</label>
+                        <label class="control-label" for="usr_fax">{{ 'admin::compte-utilisateur fax' | trans }}</label>
                         <div class="controls">
                             <input type="text" id="usr_fax" name="fax" value="{{ app['authentication'].getUser().get_fax() }}"/>
                         </div>
@@ -397,9 +397,9 @@
                     {% endif %}
 
                     <div class="form_actions buttons_line">
-                        <button type="button" class="order_button btn btn-primary">{% trans 'boutton::commander'%}</button>
+                        <button type="button" class="order_button btn btn-primary">{{ 'boutton::commander' | trans }}</button>
                         <img class="order_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                        <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
+                        <button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
                     </div>
                 </form>
             </div>
@@ -407,13 +407,13 @@
         {% if download.get_total_ftp() > 0 %}
             <div id="ftp">
                 <div style="padding:10px; text-align: center;">
-                    <h4>{% trans 'export:: FTP' %}</h4>
+                    <h4>{{ 'export:: FTP' | trans }}</h4>
                     <form action="{{ path('export_ftp') }}" method="post" target="_blank" class="form-horizontal" style="text-align: left;">
                         <input type="hidden" name="lst" value="{{lst}}"/>
                         <input type="hidden" name="ssttid" value="{{ssttid}}"/>
                         <div class="control-group">
                             <label class="control-label" for="ftp_form_selector">
-                                {% trans 'phraseanet:: prereglages'%}
+                                {{ 'phraseanet:: prereglages' | trans }}
                             </label>
                             <div class="controls">
                                 <select id="ftp_form_selector" class="span3">
@@ -431,7 +431,7 @@
                             </div>
                         </div>
                         <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">
@@ -440,14 +440,14 @@
                                             {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}}))
                                             {% if values.refused|length > 0 %}
                                                 {% set title%}
-                                                    {% trans 'Documents indisponibles' %}
+                                                    {{ 'Documents indisponibles' | trans }}
                                                 {% endset %}
                                                 <a href="#" class="undisposable_link" title="{{title|trim}}"> + </a>
                                             {% endif %}
                                         </label>
                                         {% if values.refused|length > 0 %}
                                             <div style="display:none;" class="well-small undisposable">
-                                                <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
+                                                <div><i>{{ 'La sous resolution n\'est pas disponible pour les documents suivants' | trans }}</i></div>
                                                 {% for datas in values.refused%}
                                                     {{ thumbnail.format(datas, 80, 80,'', true, false) }}
                                                 {% endfor %}
@@ -461,7 +461,7 @@
                             <div class="businessfields" style="margin-left:20px;display:none;">
                                 <label for="business_ftp" class="checkbox">
                                     <input type="checkbox" name="businessfields" id="business_ftp" value="1"  />
-                                    {% trans 'Include Business-fields in caption' %}
+                                    {{ 'Include Business-fields in caption' | trans }}
                                 </label>
                             </div>
                         {% endif %}
@@ -479,11 +479,11 @@
                             </div>
                         {% endif %}
                         <div class="buttons_line">
-                            <button type="button" class="tryftp_button btn btn-inverse">{% trans 'boutton::essayer'%}</button>
+                            <button type="button" class="tryftp_button btn btn-inverse">{{ 'boutton::essayer' | trans }}</button>
                             <img class="tryftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="ftp_button btn btn-inverse">{% trans 'boutton::envoyer'%}</button>
+                            <button type="button" class="ftp_button btn btn-inverse">{{ 'boutton::envoyer' | trans }}</button>
                             <img class="ftp_button_loader" src="/skins/icons/loader404040.gif" style="visibility:hidden;margin:0 5px;"/>
-                            <button type="button" class="close_button btn btn-inverse">{% trans 'boutton::annuler'%}</button>
+                            <button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
                         </div>
                     </form>
                 </div>
@@ -516,14 +516,14 @@
             if(!go)
             {
                 {% set alert_message %}
-                    {% trans 'You must agree to the Terms of Use to continue.' %}
+                    {{ 'You must agree to the Terms of Use to continue.' | trans }}
                 {% endset %}
 
                 var alert = p4.Dialog.Create({
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
-                    title : '{% trans "Warning !" %}'
+                    title : '{{ "Warning !" | trans }}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -559,14 +559,14 @@
             if(required)
             {
                 {% set alert_message %}
-                    {% trans 'Certains champs sont obligatoires, veuillez les remplir' %}
+                    {{ 'Certains champs sont obligatoires, veuillez les remplir' | trans }}
                 {% endset %}
 
                 var alert = p4.Dialog.Create({
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
-                    title : '{% trans "Warning !" %}'
+                    title : '{{ "Warning !" | trans }}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -576,14 +576,14 @@
             if(!go)
             {
                 {% set alert_message %}
-                    {% trans 'Vous devez selectionner un type de sous definitions' %}
+                    {{ 'Vous devez selectionner un type de sous definitions' | trans }}
                 {% endset %}
 
                 var alert = p4.Dialog.Create({
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
-                    title : '{% trans "Warning !" %}'
+                    title : '{{ "Warning !" | trans }}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -595,7 +595,7 @@
         }
 
         {% set TOUTitle %}
-            {% trans "Terms of Use" %}
+            {{ "Terms of Use" | trans }}
         {% endset %}
 
         $(document).ready(function(){
@@ -652,10 +652,10 @@
                         {% trans %} You can not directly download more than {{max_download}} Mo ; time to package all documents is too long{% endtrans %}
                 {% endset %}
                 {% set alert_too_big_two %}
-                        {% trans 'You can alternatively receive an email when the download is ready.' %}
+                        {{ 'You can alternatively receive an email when the download is ready.' | trans }}
                 {% endset %}
                 {% set alert_too_big_three %}
-                        {% trans 'Would you like to receive an e-mail when your download is ready ?' %}
+                        {{ 'Would you like to receive an e-mail when your download is ready ?' | trans }}
                 {% endset %}
 
                 if(count>1 && total/1024/1024 > {{max_download}}) {
@@ -697,9 +697,9 @@
                         $('#order .order_button_loader').css('visibility','hidden');
 
                         if(!data.error) {
-                            var title = '{% trans "Success" %}';
+                            var title = '{{ "Success" | trans }}';
                         } else {
-                            var title = '{% trans "Warning !" %}';
+                            var title = '{{ "Warning !" | trans }}';
                         }
 
                         var options = {
@@ -753,7 +753,7 @@
                                 size : 'Alert',
                                 closeOnEscape : true,
                                 closeButton:true,
-                                title : '{% trans "Warning !" %}'
+                                title : '{{ "Warning !" | trans }}'
                             }, 2);
 
                             alert.setContent(data.message);
@@ -777,7 +777,7 @@
                         var options = {
                           size : 'Alert',
                           closeButton: true,
-                          title : data.success ? '{% trans "Success" %}' : '{% trans "Warning !" %}'
+                          title : data.success ? '{{ "Success" | trans }}' : '{{ "Warning !" | trans }}'
                         };
 
                         p4.Dialog.Create(options, 2).setContent(data.message);
diff --git a/templates/web/common/doctype_icons.html.twig b/templates/web/common/doctype_icons.html.twig
index 3b4c045af9..8136b910f1 100644
--- a/templates/web/common/doctype_icons.html.twig
+++ b/templates/web/common/doctype_icons.html.twig
@@ -1,16 +1,16 @@
 {% macro format(record)%}
     {% set doctype = record.get_type() %}
     {% if record.is_grouping() %}
-      <img src="/skins/icons/icon_story.gif" title="{% trans 'reportage' %}" />
+      <img src="/skins/icons/icon_story.gif" title="{{ 'reportage' | trans }}" />
     {% elseif doctype == 'image' %}
-      <img src="/skins/icons/icon_image.gif" title="{% trans 'image' %}" />
+      <img src="/skins/icons/icon_image.gif" title="{{ 'image' | trans }}" />
     {% elseif doctype == 'document' %}
-      <img src="/skins/icons/icon_document.gif" title="{% trans 'document' %}" />
+      <img src="/skins/icons/icon_document.gif" title="{{ 'document' | trans }}" />
     {% elseif doctype == 'flash' %}
-      <img src="/skins/icons/icon_flash.gif" title="{% trans 'animation flash' %}" />
+      <img src="/skins/icons/icon_flash.gif" title="{{ 'animation flash' | trans }}" />
     {% elseif doctype == 'video' %}
-      <img src="/skins/icons/icon_video.gif" title="{% trans 'video' %}" />
+      <img src="/skins/icons/icon_video.gif" title="{{ 'video' | trans }}" />
     {% elseif doctype == 'audio' %}
-      <img src="/skins/icons/icon_audio.gif" title="{% trans 'audio' %}" />
+      <img src="/skins/icons/icon_audio.gif" title="{{ 'audio' | trans }}" />
     {% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/templates/web/common/drop_down_options.html.twig b/templates/web/common/drop_down_options.html.twig
index 763a905564..e1eee4db29 100644
--- a/templates/web/common/drop_down_options.html.twig
+++ b/templates/web/common/drop_down_options.html.twig
@@ -12,7 +12,7 @@
                 <div title="" class="context-menu-item">
                     <div class="context-menu-item-inner"
                         onclick="evt_add_in_chutier('{{record.get_sbas_id}}','{{record.get_record_id}}',false,this);return(false);">
-                    {% trans 'action : ajouter au panier' %}
+                    {{ 'action : ajouter au panier' | trans }}
                     </div>
                 </div>
                 {% endif %}
@@ -20,14 +20,14 @@
                 <div title="" class="context-menu-item">
                     <div class="context-menu-item-inner"
                         onclick="evt_dwnl('{{record.get_sbas_id}}_{{record.get_record_id}}',false,this);return(false);">
-                    {% trans 'action : exporter' %}
+                    {{ 'action : exporter' | trans }}
                     </div>
                 </div>
                 {% endif %}
                 <div title="" class="context-menu-item">
                     <div class="context-menu-item-inner"
                         onclick="evt_print('{{record.get_sbas_id}}_{{record.get_record_id}}');return(false);">
-                    {% trans 'action : print' %}
+                    {{ 'action : print' | trans }}
                     </div>
                 </div>
                 {% if app['phraseanet.registry'].get('GV_social_tools') == 'all' or (app['phraseanet.registry'].get('GV_social_tools') == 'publishers' and app['acl'].get(user).has_right_on_sbas(record.get_sbas_id(), 'bas_chupub')) %}
@@ -35,7 +35,7 @@
                     <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner"
                             onclick="shareThis('{{record.get_base_id}}','{{record.get_record_id}}');">
-                        {% trans 'reponses:: partager' %}
+                        {{ 'reponses:: partager' | trans }}
                         </div>
                     </div>
                     {% endif %}
diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macros.html.twig
index aa1a244d83..534bbb0740 100644
--- a/templates/web/common/macros.html.twig
+++ b/templates/web/common/macros.html.twig
@@ -15,7 +15,7 @@
                 </div>
                 <div class="row-fluid recaptcha_only_if_incorrect_sol">
                     <div class="alert-error" style="padding:2px;margin: 2px 0;border:1px solid #c9322b">
-                        <i class="icon-warning-sign"></i> {% trans "Incorrect please try again" %}
+                        <i class="icon-warning-sign"></i> {{ "Incorrect please try again" | trans }}
                     </div>
                 </div>
 
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index 51214e07d3..d96b59e13f 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -11,7 +11,7 @@
             {% if module is defined and module == "prod" %}
               <a target="_self" href="{{ path('get_client') }}">
                 <span class="">
-                  {% trans 'admin::monitor: Ancienne version (client)' %}
+                  {{ 'admin::monitor: Ancienne version (client)' | trans }}
                 </span>
               </a>
             {% else %}
@@ -19,13 +19,13 @@
                 {% if module is defined and module == "client" %}
                   <a target="_self" href="{{ path('prod') }}">
                     <span class="">
-                      {% trans 'admin::monitor: Nouvelle version (prod)' %}
+                      {{ 'admin::monitor: Nouvelle version (prod)' | trans }}
                     </span>
                   </a>
                 {% else %}
                   <a target="_blank" href="{{ path('prod') }}">
                     <span class="">
-                      {% trans 'admin::monitor: production' %}
+                      {{ 'admin::monitor: production' | trans }}
                     </span>
                   </a>
                 {% endif %}
@@ -37,7 +37,7 @@
           <li>
             <a target="_blank" href="{{ path('thesaurus') }}">
               <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
-              {% trans 'admin::monitor: module thesaurus' %}
+              {{ 'admin::monitor: module thesaurus' | trans }}
               </span>
             </a>
           </li>
@@ -49,7 +49,7 @@
           <li>
             <a target="_blank" href="{{ path('admin') }}">
               <span class="{% if module is defined and module == "admin" %}selected{% endif %}">
-                {% trans 'admin::monitor: module admin' %}
+                {{ 'admin::monitor: module admin' | trans }}
               </span>
             </a>
           </li>
@@ -60,7 +60,7 @@
           <li>
             <a target="_blank" href="{{ path('report_dashboard') }}">
               <span class="{% if module is defined and module == "report" %}selected{% endif %}">
-                {% trans 'admin::monitor: module report' %}
+                {{ 'admin::monitor: module report' | trans }}
               </span>
             </a>
           </li>
@@ -70,7 +70,7 @@
           <li>
             <a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
               <span>
-              {% trans 'admin::monitor: module validation' %}
+              {{ 'admin::monitor: module validation' | trans }}
               </span>
             </a>
           </li>
@@ -85,9 +85,9 @@
                     {% set link = path('upload_flash_form') %}
                 {% endif %}
 
-                <a  href="{{ link }}" class="dialog full-dialog" title="{% trans 'Upload' %}">
+                <a  href="{{ link }}" class="dialog full-dialog" title="{{ 'Upload' | trans }}">
                 <span>
-                    {% trans 'admin::monitor: module upload' %}
+                    {{ 'admin::monitor: module upload' | trans }}
                 </span>
                 </a>
             </li>
@@ -99,7 +99,7 @@
           <li>
             <a href="#" onclick="getHome('PUBLI');" >
               <span>
-                {% trans 'Publications' %}
+                {{ 'Publications' | trans }}
               </span>
             </a>
           </li>
@@ -107,9 +107,9 @@
 
           {% if module is defined and module == "prod" and app['acl'].get(app['authentication'].getUser()).has_right('order_master') %}
           <li>
-            <a href="{{ path('prod_orders') }}" class="dialog full-dialog" title="{% trans 'Orders manager' %}">
+            <a href="{{ path('prod_orders') }}" class="dialog full-dialog" title="{{ 'Orders manager' | trans }}">
               <span>
-                {% trans 'Commandes' %}
+                {{ 'Commandes' | trans }}
               </span>
             </a>
           </li>
@@ -126,7 +126,7 @@
         <li id="notification_trigger">
           <a href="#" style="font-weight:bold;text-decoration:none;">
             <span>
-              {% trans 'Notifications' %}
+              {{ 'Notifications' | trans }}
               <button class="counter btn btn-danger" style="visibility:{% if app['events-manager'].get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
                   {% if app['events-manager'].get_unread_notifications_number > 0 %}
                     {{app['events-manager'].get_unread_notifications_number}}
@@ -140,10 +140,10 @@
           {% if app['authentication'].isAuthenticated() %}
             {% if app['authentication'].getUser().is_guest %}
               <span>
-                {% trans 'Guest' %}
+                {{ 'Guest' | trans }}
               </span>
             {% else %}
-              <a target="_blank" href="{{ path('account') }}" title="{% trans 'login:: Mon compte' %}">
+              <a target="_blank" href="{{ path('account') }}" title="{{ 'login:: Mon compte' | trans }}">
                 <span>
                   {{app['authentication'].getUser().get_login()}}
                 </span>
@@ -154,7 +154,7 @@
         <li>
           <a target="_blank" href="https://docs.phraseanet.com/3.8/">
             <span>
-              {% trans 'phraseanet:: aide' %}
+              {{ 'phraseanet:: aide' | trans }}
               <span style="display:inline-block;cursor:pointer;padding:0;border:none;" id="help-trigger"> &#9660;</span>
             </span>
           </a>
@@ -166,12 +166,12 @@
                           {% if module is defined and module == "prod" %}
                               <div title="" class="context-menu-item menu3-custom-item">
                                   <div style="" class="context-menu-item-inner shortcuts-trigger">
-                                          {% trans 'phraseanet:: raccourcis clavier' %}
+                                          {{ 'phraseanet:: raccourcis clavier' | trans }}
                                   </div>
                               </div>
                           {% endif %}
                               <div title="" class="context-menu-item menu3-custom-item">
-                                  <div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'>  &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{% trans 'phraseanet:: a propos' %}</div>
+                                  <div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'>  &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{{ 'phraseanet:: a propos' | trans }}</div>
                               </div>
                           </div>
                       </td>
@@ -183,7 +183,7 @@
         {% if app['authentication'].isAuthenticated() %}
           <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}" target="_self">
             <span>
-              {% trans 'phraseanet:: deconnection' %}
+              {{ 'phraseanet:: deconnection' | trans }}
             </span>
           </a>
         {% endif %}
diff --git a/templates/web/common/technical_datas.html.twig b/templates/web/common/technical_datas.html.twig
index ed1ab1ea99..e1c0b630a6 100644
--- a/templates/web/common/technical_datas.html.twig
+++ b/templates/web/common/technical_datas.html.twig
@@ -1,7 +1,7 @@
 {% if record.is_grouping() %}
-  {% trans 'Story_id' %} : {{ record.get_record_id() }}<br/>
+  {{ 'Story_id' | trans }} : {{ record.get_record_id() }}<br/>
 {% else %}
-  {% trans 'Record_id' %} : {{ record.get_record_id() }}<br/>
+  {{ 'Record_id' | trans }} : {{ record.get_record_id() }}<br/>
 {% endif %}
 
 {% if record.is_grouping() == false %}
@@ -9,7 +9,7 @@
     {% set document = record.get_subdef('document') %}
 
 {% block td_original_name %}
-    {% trans 'Nom Original' %} :
+    {{ 'Nom Original' | trans }} :
     {{ record.get_original_name() }}
 {% endblock %}
     <br/>
@@ -27,7 +27,7 @@
 
 {% block td_size %}
     {% if document and document.get_width() and document.get_height() %}
-        {% trans 'Size' %} :
+        {{ 'Size' | trans }} :
         {{document.get_width()}} x {{document.get_height()}} px
         <br/>
         {% if record.get_type() == 'image' and document.get_width() and document.get_height() %}
@@ -43,116 +43,116 @@
     <hr/>
 {% block td_camera_model %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) is not empty %}
-      {% trans 'Camera Model' %} :
+      {{ 'Camera Model' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_color_space %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_COLORSPACE')) is not empty %}
-      {% trans 'Color space' %} :
+      {{ 'Color space' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_COLORSPACE')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_channels %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_CHANNELS')) is not empty %}
-      {% trans 'Channels' %} :
+      {{ 'Channels' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_CHANNELS')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_color_depth %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_COLORDEPTH')) is not empty %}
-      {% trans 'Color Depth' %} :
+      {{ 'Color Depth' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_COLORDEPTH')) }} bits
       <br />
     {% endif %}
 {% endblock %}
 {% block td_iso_sensibility %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) is not empty %}
-      {% trans 'ISO sensibility' %} :
+      {{ 'ISO sensibility' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_flash %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FLASHFIRED')) is not empty %}
-      {% trans 'Flash' %} :
+      {{ 'Flash' | trans }} :
       {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FLASHFIRED')) %}
-        {% trans 'yes' %}
+        {{ 'yes' | trans }}
       {% else %}
-        {% trans 'no' %}
+        {{ 'no' | trans }}
       {% endif %}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_shutter_speed %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) is not empty %}
-        {% trans 'Shutter speed' %} :
+        {{ 'Shutter speed' | trans }} :
         {{ record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) }} s.
         <br />
     {% endif %}
 {% endblock %}
 {% block td_apeture %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_APERTURE')) is not empty %}
-      {% trans 'Aperture' %} :
+      {{ 'Aperture' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_APERTURE')) | round(2) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_focal_length %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) is not empty %}
-        {% trans 'Focal length' %} :
+        {{ 'Focal length' | trans }} :
         {{ record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) }} mm
         <br />
     {% endif %}
 {% endblock %}
 {% block td_hyperfocal_distance %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_HYPERFOCALDISTANCE')) is not empty %}
-      {% trans 'Hyperfocal distance' %} :
+      {{ 'Hyperfocal distance' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_HYPERFOCALDISTANCE')) | round(2) }} mm
       <br />
     {% endif %}
 {% endblock %}
 {% block td_light_value %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_LIGHTVALUE')) is not empty %}
-      {% trans 'Light Value' %} :
+      {{ 'Light Value' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_LIGHTVALUE')) | round(2) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_duration %}
     {% if record.get_formated_duration() %}
-      {% trans 'Duree' %} :
+      {{ 'Duree' | trans }} :
       {{ record.get_formated_duration() }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_framerate %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FRAMERATE')) is not empty %}
-      {% trans 'Images par secondes' %} :
+      {{ 'Images par secondes' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_FRAMERATE')) | round(2) }} ips
       <br />
     {% endif %}
 {% endblock %}
 {% block td_codec_audio %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOCODEC'))  %}
-      {% trans 'Codec Audio' %} :
+      {{ 'Codec Audio' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOCODEC')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_codec_video %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_VIDEOCODEC'))  %}
-      {% trans 'Codec Video' %} :
+      {{ 'Codec Video' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_VIDEOCODEC')) }}
       <br />
     {% endif %}
 {% endblock %}
 {% block td_audio_rate %}
     {% if record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOSAMPLERATE'))  %}
-      {% trans 'Frequence d\'echantillonage' %} :
+      {{ 'Frequence d\'echantillonage' | trans }} :
       {{ record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOSAMPLERATE')) | round(2) }} kHz
       <br />
     {% endif %}
diff --git a/templates/web/developers/application.html.twig b/templates/web/developers/application.html.twig
index c8e8735399..15a191c71a 100644
--- a/templates/web/developers/application.html.twig
+++ b/templates/web/developers/application.html.twig
@@ -1,7 +1,7 @@
 {% extends "account/base.html.twig" %}
 
 {% block title %}
-    {% trans "Client application" %}
+    {{ "Client application" | trans }}
 {% endblock %}
 
 {% set selected = "" %}
@@ -9,7 +9,7 @@
 {% block content_account %}
     <div class="row-fluid">
         <div class="span12">
-            <h1>{% trans "Application" %}</h1>
+            <h1>{{ "Application" | trans }}</h1>
             <input type="hidden" value="{{ application.get_id() }}" name="app_id"/>
 
             <div>
@@ -17,8 +17,8 @@
               <div>{{ application.get_description() }}</div>
             </div>
 
-            <h1>{% trans "settings OAuth" %}</h1>
-            <p>{% trans "Les parametres oauth de votre application." %}</p>
+            <h1>{{ "settings OAuth" | trans }}</h1>
+            <p>{{ "Les parametres oauth de votre application." | trans }}</p>
 
             <table id="app-oauth-setting" class="table table-condensed  table-bordered">
                 <tbody>
@@ -31,7 +31,7 @@
                         <td>{{ application.get_client_secret() }}</td>
                     </tr>
                     <tr>
-                        <td>{% trans "URL de callback" %}</td>
+                        <td>{{ "URL de callback" | trans }}</td>
                         {% if application.get_type() == constant("API_OAuth2_Application::DESKTOP_TYPE") %}
                             <td>
                                 <span>{{ application.get_redirect_uri() }}</span>
@@ -40,10 +40,10 @@
                             <td class="url_callback">
                                 <span class="url_callback_input">{{ application.get_redirect_uri() }}</span>
                                 <a href="{{ path("submit_application_callback", {"id" : application.get_id()}) }}" class="save_callback btn btn-small btn-info" style="display:none;">
-                                    {% trans "Save" %}
+                                    {{ "Save" | trans }}
                                 </a>
                                 <button type="button" class="modifier_callback btn btn-small">
-                                      {% trans "Modify" %}
+                                      {{ "Modify" | trans }}
                                 </button>
                             </td>
                         {%endif%}
@@ -57,7 +57,7 @@
                         <td>{{ app["phraseanet.registry"].get("GV_ServerName") }}api/oauthv2/token</td>
                     </tr>
                     <tr>
-                        <td>{% trans "Activer le grant_type de type password pour votre application" %}</td>
+                        <td>{{ "Activer le grant_type de type password pour votre application" | trans }}</td>
                         <td>
                             <input class="grant-type"
                                 type="checkbox"
@@ -70,30 +70,30 @@
                 </tbody>
             </table>
 
-            <h1>{% trans "Votre token d\'access" %}</h1>
-            <p> {% trans "Les paramétres oauth de votre application." %}</p>
+            <h1>{{ "Votre token d\'access" | trans }}</h1>
+            <p> {{ "Les paramétres oauth de votre application." | trans }}</p>
 
             <table id="app-access-token-setting table" class="table table-condensed  table-bordered">
                 <tbody>
                     <tr>
                         <td>
-                            {% trans "Token" %}
+                            {{ "Token" | trans }}
                         </td>
                         <td>
                             <span id="my_access_token">
                                 {% if not token  is none %}
                                   {{ token|default("") }}
                                 {% else %}
-                                  {% trans "Le token n\'a pas encore ete genere" %}
+                                  {{ "Le token n\'a pas encore ete genere" | trans }}
                                 {% endif %}
                             </span>
-                            <a id="generate_access" href="{{ path("submit_developers_application_token",{ "id" : application.get_id()}) }}" class="btn btn-small btn-info">{% trans "boutton::generer" %}</a>
+                            <a id="generate_access" href="{{ path("submit_developers_application_token",{ "id" : application.get_id()}) }}" class="btn btn-small btn-info">{{ "boutton::generer" | trans }}</a>
                           </td>
                     </tr>
                 </tbody>
             </table>
             <div>
-              <a class="btn btn-primary" href="{{ path("developers_applications") }}">{% trans "boutton::retour" %}</a>
+              <a class="btn btn-primary" href="{{ path("developers_applications") }}">{{ "boutton::retour" | trans }}</a>
             </div>
         </div>
     </div>
diff --git a/templates/web/developers/application_form.html.twig b/templates/web/developers/application_form.html.twig
index 4f3b6a4523..348aab6340 100644
--- a/templates/web/developers/application_form.html.twig
+++ b/templates/web/developers/application_form.html.twig
@@ -1,7 +1,7 @@
 {% extends "account/base.html.twig" %}
 
 {% block title %}
-    {% trans "new client application" %}
+    {{ "new client application" | trans }}
 {% endblock %}
 
 {% set selected = "" %}
@@ -47,8 +47,8 @@
 {% block content_account %}
 <form id="form_create" action="{{ path("submit_developers_application") }}" method="POST" class="form-horizontal">
     {% if form is none %}
-      {% set name, description, website, callback = "", "", "", ""%}
-      {% set app_type = "web"%}
+      {% set name, description, website, callback = "", "", "", "" %}
+      {% set app_type = "web" %}
     {% else %}
       {% set name = form.name %}
       {% set description = form.description %}
@@ -58,21 +58,21 @@
     {% endif %}
 
     <div class="control-group">
-        <label class="control-label" for="name"><b>{% trans "Nom" %}</b></label>
+        <label class="control-label" for="name"><b>{{ "Nom" | trans }}</b></label>
         <div class="controls">
             {{ _self.input("name", name, violations, "name", "input-xlarge") }}
         </div>
     </div>
 
     <div class="control-group">
-        <label class="control-label" for="name"><b>{% trans "Description" %}</b></label>
+        <label class="control-label" for="name"><b>{{ "Description" | trans }}</b></label>
         <div class="controls">
             {{ _self.textarea("description", description, violations, "description", 5, 30, "input-xlarge") }}
         </div>
     </div>
 
     <div class="control-group">
-        <label for="website" class="control-label"><b>{% trans "Site web" %}</b></label>
+        <label for="website" class="control-label"><b>{{ "Site web" | trans }}</b></label>
         <div class="controls">
             <select name="scheme-website"  class="input-mini">
                 <option value="http://">http://</option>
@@ -83,23 +83,23 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label"><b>{% trans "Type d\'application" %}</b></label>
+        <label class="control-label"><b>{{ "Type d\'application" | trans }}</b></label>
         <div class="controls">
             <label class="radio">
                 <input type="radio" name="type" value="web" {{ app_type == "web" ? "checked='checked'" : "" }}/>
-                {% trans "Application web" %}
+                {{ "Application web" | trans }}
             </label>
 
             <label class="radio">
                 <input type="radio" name="type" value="desktop" {{ app_type == "desktop" ? "checked='checked'" : "" }}/>
-                {% trans "Application desktop" %}
+                {{ "Application desktop" | trans }}
             </label>
         </div>
     </div>
 
     {% if app_type == "web" %}
         <div class="control-group">
-            <label for="callback" class="control-label"><b>{% trans "URL de callback" %}</b></label>
+            <label for="callback" class="control-label"><b>{{ "URL de callback" | trans }}</b></label>
             <div class="controls">
                 <select name="scheme-callback" class="input-mini">
                     <option value="http://">http://</option>
@@ -112,11 +112,11 @@
 
     <div class="form-actions">
         <button class="btn btn-info" type="submit">
-            {% trans "boutton::valider" %}
+            {{ "boutton::valider" | trans }}
         </button>
 
         <a class="btn" href="{{ path("developers_applications") }}">
-            {% trans "boutton::retour" %}
+            {{ "boutton::retour" | trans }}
         </a>
     </div>
   </form>
diff --git a/templates/web/developers/applications.html.twig b/templates/web/developers/applications.html.twig
index 20ef14bcb8..d8bf0d58fc 100644
--- a/templates/web/developers/applications.html.twig
+++ b/templates/web/developers/applications.html.twig
@@ -1,7 +1,7 @@
 {% extends "account/base.html.twig" %}
 
 {% block title %}
-    {% trans "Client applications" %}
+    {{ "Client applications" | trans }}
 {% endblock %}
 
 {% set selected = "developer" %}
@@ -11,13 +11,13 @@
         <div class="span7">
             <div id="content-apps">
                 <h1>Phraseanet Developer Center</h1>
-                <h3>{% trans "Mes applications" %}</h3>
+                <h3>{{ "Mes applications" | trans }}</h3>
                 {% if applications|length > 0 %}
                     <ul class="app-list unstyled">
                         {% for application in applications %}
                               <li id="app_{{ application.get_id() }}">
                                     <a href="#appModal-{{ loop.index }}" role="button" data-toggle="modal" class="pull-right btn btn-danger btn-small" type="button">
-                                        {% trans  "button::supprimer" %}
+                                        {{ "button::supprimer" | trans }}
                                     </a>
                                     <!-- Modal -->
                                     <div id="appModal-{{ loop.index }}" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -26,11 +26,11 @@
                                             <h3 id="myModalLabel">{{ application.get_name() }}</h3>
                                         </div>
                                         <div class="modal-body">
-                                            <p>{% trans "Are you sure you want to delete this application?" %} </p>
+                                            <p>{{ "Are you sure you want to delete this application?" | trans }} </p>
                                         </div>
                                         <div class="modal-footer">
-                                            <button class="btn" data-dismiss="modal" aria-hidden="true">{% trans "No" %}</button>
-                                            <a href="{{ path("delete_developers_application", {"id" : application.get_id()}) }}" class="delete-app btn btn-info">{% trans "Yes" %}</a>
+                                            <button class="btn" data-dismiss="modal" aria-hidden="true">{{ "No" | trans }}</button>
+                                            <a href="{{ path("delete_developers_application", {"id" : application.get_id()}) }}" class="delete-app btn btn-info">{{ "Yes" | trans }}</a>
                                         </div>
                                     </div>
                                     <p class="app-row">
@@ -46,22 +46,22 @@
                     </ul>
                 {% else %}
                     <div>
-                      {% trans "Aucune application creee." %}
+                      {{ "Aucune application creee." | trans }}
                     </div>
                 {% endif %}
             </div>
         </div>
         <div class="span5">
             <div class="well well-small">
-                <p>{% trans "Decouvrez la documentation" %}</p>
+                <p>{{ "Decouvrez la documentation" | trans }}</p>
                 <a href="http://developer.phraseanet.com/" target="_blank" class="btn btn-large text-center input-block-level">
-                    {% trans "Demarrer avec l\'API Phraseanet" %}
+                    {{ "Demarrer avec l\'API Phraseanet" | trans }}
                 </a>
             </div>
             <div class="well well-small">
-                <p>{% trans "Creez une application pour commencer a utiliser l\'API Phraseanet" %}</p>
+                <p>{{ "Creez une application pour commencer a utiliser l\'API Phraseanet" | trans }}</p>
                 <a href="{{ path("developers_application_new") }}" class="btn-info btn btn-large text-center input-block-level">
-                    {% trans "Creer une nouvelle applications" %}
+                    {{ "Creer une nouvelle applications" | trans }}
                 </a>
             </div>
         </div>
diff --git a/templates/web/email-template.html.twig b/templates/web/email-template.html.twig
index 71547c4618..7e6c3d48da 100644
--- a/templates/web/email-template.html.twig
+++ b/templates/web/email-template.html.twig
@@ -25,7 +25,7 @@
         <table width="100%" bgcolor="#f2f2f2;" cellpadding="0" cellspacing="0" border="0" style="margin:0; padding:0; width:100% !important; line-height: 100% !important;background-color:#f2f2f2;">
             <tr>
                 <td height="40" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; font-weight:normal; color:#999999;line-height:20px;">
-                    {% trans 'Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur.' %}
+                    {{ 'Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur.' | trans }}
                 </td>
             </tr>
             <tr>
@@ -116,7 +116,7 @@
                         </tr>
                         <tr>
                             <td height="60" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:13px; font-style:italic; color:#dc4848;">
-                                {% trans 'Le contenu de cet email est confidentiel, ne le divulguez pas.' %}
+                                {{ 'Le contenu de cet email est confidentiel, ne le divulguez pas.' | trans }}
                             </td>
                         </tr>
                     </table>
@@ -125,7 +125,7 @@
             </tr>
             <tr>
                 <td height="50" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; color:#999999;">
-                    {% trans 'Message automatique de Phraseanet' %}<br />
+                    {{ 'Message automatique de Phraseanet' | trans }}<br />
                     {% set link %}
                     <a href="{{ phraseanetURL }}" target="_blank" style="font-weight:bold; cursor:pointer; color:#999999;">
                         {{ phraseanetTitle }}
diff --git a/templates/web/geonames/city_list.html.twig b/templates/web/geonames/city_list.html.twig
index 221ece3b5c..b51cd2784c 100644
--- a/templates/web/geonames/city_list.html.twig
+++ b/templates/web/geonames/city_list.html.twig
@@ -5,5 +5,5 @@
   </div>
 {% endfor %}
 {% if geonames|length == 0 %}
-  <div class='box boxI unselectable'>  <div>{% trans 'No matches found' %}</div></div>
+  <div class='box boxI unselectable'>  <div>{{ 'No matches found' | trans }}</div></div>
 {% endif %}
diff --git a/templates/web/lightbox/IE6/agreement_box.html.twig b/templates/web/lightbox/IE6/agreement_box.html.twig
index ad814ad2c4..b5470360fa 100644
--- a/templates/web/lightbox/IE6/agreement_box.html.twig
+++ b/templates/web/lightbox/IE6/agreement_box.html.twig
@@ -3,10 +3,10 @@
         <table style="margin-left:10px;width:220px;height:30px;" cellspacing="0" cellpadding="0">
             <tbody>
                 <tr>
-                    <td class="title">{% trans 'VALIDATION' %}</td>
+                    <td class="title">{{ 'VALIDATION' | trans }}</td>
                     <td class="report_wrapper">
                       <a class="report" href="#">
-                        {% trans 'lightbox::recaptitulatif' %}
+                        {{ 'lightbox::recaptitulatif' | trans }}
                       </a>
                     </td>
                 </tr>
@@ -41,12 +41,12 @@
                         <td>
                           {% set agreement = basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() %}
                             <div style="width:70px;margin:0px auto 0;" class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false %}not_decided{% endif %}">
-                                <img src="/skins/lightbox/agree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: OUI' %}</span>
+                                <img src="/skins/lightbox/agree-bigie6.gif" style="vertical-align:middle;"/><span>{{ 'validation:: OUI' | trans }}</span>
                             </div>
                         </td>
                         <td>
                             <div style="width:70px;margin:0px auto;" class="ui-corner-all big_box disagree_{{basket_element.getId()}} disagree {% if agreement is null or agreement == true %}not_decided{% endif %}">
-                                <img src="/skins/lightbox/disagree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: NON' %}</span>
+                                <img src="/skins/lightbox/disagree-bigie6.gif" style="vertical-align:middle;"/><span>{{ 'validation:: NON' | trans }}</span>
                             </div>
                         </td>
                     </tr>
diff --git a/templates/web/lightbox/IE6/basket_options.html.twig b/templates/web/lightbox/IE6/basket_options.html.twig
index 5b214bf0c3..236b4d1f82 100644
--- a/templates/web/lightbox/IE6/basket_options.html.twig
+++ b/templates/web/lightbox/IE6/basket_options.html.twig
@@ -1,7 +1,7 @@
 {% if basket.getValidation() and basket.getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
-    <button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}">
+    <button class="confirm_report" title="{{ 'validation::envoyer mon rapport' | trans }}">
         <img src="/skins/lightbox/envoyerie6.gif"/>
-    {% trans 'validation::envoyer mon rapport'%}
+    {{ 'validation::envoyer mon rapport' | trans }}
     <img src="/skins/icons/loader1F1E1B.gif" style="visibility:hidden;" class="loader"/>
     </button>
 {% endif %}
diff --git a/templates/web/lightbox/IE6/feed.html.twig b/templates/web/lightbox/IE6/feed.html.twig
index f02e652bff..6467d5804f 100644
--- a/templates/web/lightbox/IE6/feed.html.twig
+++ b/templates/web/lightbox/IE6/feed.html.twig
@@ -72,7 +72,7 @@
                         <tr>
                             <td>
                                 <img class="collapsed" src="/skins/lightbox/collapsedie6.gif"/>
-                                <span class="caption">{% trans 'notice'%}</span>
+                                <span class="caption">{{ 'notice' | trans }}</span>
                             </td>
                         </tr>
                     </table>
@@ -106,7 +106,7 @@
                         <td style="width:20px;">
                         </td>
                         <td style="width:40px;">
-                            <button class="ui-corner-all basket_downloader" title="{% trans 'boutton::telecharger tous les documents' %}">
+                            <button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
                                 <img src="/skins/lightbox/save.png"/>
                             </button>
                         </td>
@@ -128,7 +128,7 @@
     </div>
     <div id="report" style="display:none;">
     </div>
-    <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
+    <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
 
 {% endblock %}
 
diff --git a/templates/web/lightbox/IE6/feed_options_box.html.twig b/templates/web/lightbox/IE6/feed_options_box.html.twig
index c14867b0f7..70c51c615e 100644
--- a/templates/web/lightbox/IE6/feed_options_box.html.twig
+++ b/templates/web/lightbox/IE6/feed_options_box.html.twig
@@ -1,24 +1,24 @@
 <span style="padding:10px 4px 7px;">
     {% if feed_element %}
-        <button class="previous_button play" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button play" title="{{ 'boutton::precedent' | trans }}">
             <img src="/skins/lightbox/previe6.png" />
         </button>
-        <button class="previous_button pause" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button pause" title="{{ 'boutton::precedent' | trans }}">
             <img src="/skins/lightbox/prev_pauseie6.png" />
         </button>
-        <button class="play_button" title="{% trans 'boutton::demarrer' %}">
+        <button class="play_button" title="{{ 'boutton::demarrer' | trans }}">
             <img src="/skins/lightbox/playie6.png" />
         </button>
-        <button class="pause_button" title="{% trans 'boutton::pause' %}">
+        <button class="pause_button" title="{{ 'boutton::pause' | trans }}">
             <img src="/skins/lightbox/pauseie6.png" />
         </button>
-        <button class="next_button play" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button play" title="{{ 'boutton::suivant' | trans }}">
             <img src="/skins/lightbox/nextie6.png" />
         </button>
-        <button class="next_button pause" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button pause" title="{{ 'boutton::suivant' | trans }}">
             <img src="/skins/lightbox/next_pauseie6.png" />
         </button>
-        <button class="download_button" title="{% trans 'boutton::telecharger' %}">
+        <button class="download_button" title="{{ 'boutton::telecharger' | trans }}">
             <img src="/skins/lightbox/saveie6.png"/>
         </button>
         <form name="download_form" style="display:none;">
diff --git a/templates/web/lightbox/IE6/index.html.twig b/templates/web/lightbox/IE6/index.html.twig
index 16df83e553..748ffbadbb 100644
--- a/templates/web/lightbox/IE6/index.html.twig
+++ b/templates/web/lightbox/IE6/index.html.twig
@@ -20,10 +20,10 @@
             <thead>
                 <tr>
                     <th class="title">
-                        <h1>{% trans 'Validations' %}</h1>
+                        <h1>{{ 'Validations' | trans }}</h1>
                     </th>
                     <th>
-                        <i>{% trans 'Voici vos validations en cours' %}</i>
+                        <i>{{ 'Voici vos validations en cours' | trans }}</i>
                     </th>
                 </tr>
             </thead>
@@ -53,11 +53,11 @@
                                                       {{basket.getName()}}
                                                   </h2>
                                                   {% if basket.getValidation().isFinished() %}
-                                                      {% trans '(validation) session terminee' %}
+                                                      {{ '(validation) session terminee' | trans }}
                                                   {% elseif basket.getValidation().getParticipant(app['authentication'].getUser(), app).getIsConfirmed() %}
-                                                      {% trans '(validation) envoyee' %}
+                                                      {{ '(validation) envoyee' | trans }}
                                                   {% else %}
-                                                      {% trans '(validation) a envoyer' %}
+                                                      {{ '(validation) a envoyer' | trans }}
                                                   {% endif %}
                                               </td>
                                               <td class="right">
@@ -87,10 +87,10 @@
                 {% endfor %}
                 <tr>
                     <th class="title">
-                        <h1>{% trans 'Paniers'%}</h1>
+                        <h1>{{ 'Paniers' | trans }}</h1>
                     </th>
                     <th>
-                        <i>{% trans 'Voici vos paniers' %}</i>
+                        <i>{{ 'Voici vos paniers' | trans }}</i>
                     </th>
                 </tr>
                 {% for basket in baskets_collection %}
diff --git a/templates/web/lightbox/IE6/sc_options_box.html.twig b/templates/web/lightbox/IE6/sc_options_box.html.twig
index 9a8af17768..8736633c75 100644
--- a/templates/web/lightbox/IE6/sc_options_box.html.twig
+++ b/templates/web/lightbox/IE6/sc_options_box.html.twig
@@ -1,24 +1,24 @@
 <span style="padding:10px 4px 7px;">
     {% if basket_element %}
-        <button class="previous_button play" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button play" title="{{ 'boutton::precedent' | trans }}">
             <img src="/skins/lightbox/previe6.png" />
         </button>
-        <button class="previous_button pause" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button pause" title="{{ 'boutton::precedent' | trans }}">
             <img src="/skins/lightbox/prev_pauseie6.png" />
         </button>
-        <button class="play_button" title="{% trans 'boutton::demarrer' %}">
+        <button class="play_button" title="{{ 'boutton::demarrer' | trans }}">
             <img src="/skins/lightbox/playie6.png" />
         </button>
-        <button class="pause_button" title="{% trans 'boutton::pause' %}">
+        <button class="pause_button" title="{{ 'boutton::pause' | trans }}">
             <img src="/skins/lightbox/pauseie6.png" />
         </button>
-        <button class="next_button play" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button play" title="{{ 'boutton::suivant' | trans }}">
             <img src="/skins/lightbox/nextie6.png" />
         </button>
-        <button class="next_button pause" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button pause" title="{{ 'boutton::suivant' | trans }}">
             <img src="/skins/lightbox/next_pauseie6.png" />
         </button>
-        <button class="download_button" title="{% trans 'boutton::telecharger' %}">
+        <button class="download_button" title="{{ 'boutton::telecharger' | trans }}">
             <img src="/skins/lightbox/saveie6.png"/>
         </button>
         <form name="download_form" style="display:none;">
diff --git a/templates/web/lightbox/IE6/validate.html.twig b/templates/web/lightbox/IE6/validate.html.twig
index d35d726c9a..04d2394fbd 100644
--- a/templates/web/lightbox/IE6/validate.html.twig
+++ b/templates/web/lightbox/IE6/validate.html.twig
@@ -78,12 +78,12 @@
                         <tr>
                             <td>
                                 <img class="collapsed" src="/skins/lightbox/collapsedie6.gif"/>
-                                <span class="caption">{% trans 'notice'%}</span>
+                                <span class="caption">{{ 'notice' | trans }}</span>
                             </td>
               {% if basket.getValidation() %}
                             <td>
                                 <img class="collapsed" src="/skins/lightbox/collapsedie6.gif"/>
-                                <span class="validate highlight">{% trans 'Validation'%}</span>
+                                <span class="validate highlight">{{ 'Validation' | trans }}</span>
                             </td>
               {% endif %}
                         </tr>
@@ -125,7 +125,7 @@
                     <tr>
                         <td>
                             <select id="navigation">
-                                <optgroup label="{% trans 'Validations'%}">
+                                <optgroup label="{{ 'Validations' | trans }}">
                                 {% for item in baskets_collection %}
                                     {% if item.getValidation() %}
                                         <option {% if basket.getId() == item.getId() %} selected="selected" {% endif %}
@@ -133,7 +133,7 @@
                                     {% endif %}
                                 {% endfor %}
                                 </optgroup>
-                                <optgroup label="{% trans 'Paniers'%}">
+                                <optgroup label="{{ 'Paniers' | trans }}">
                                 {% for item in baskets_collection %}
                                   {% if item.getValidation() is null %}
                                       <option {% if basket.getId() == item.getId() %} selected="selected" {% endif %}
@@ -142,7 +142,7 @@
                                 {% endfor %}
                                 </optgroup>
                             </select>
-                            <button class="ui-corner-all basket_downloader" title="{% trans 'boutton::telecharger tous les documents' %}">
+                            <button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
                                 <img src="/skins/lightbox/save.png"/>
                             </button>
                         </td>
@@ -161,7 +161,7 @@
     </div>
     <div id="report" style="display:none;">
     </div>
-    <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
+    <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
 
 {% endblock %}
 
diff --git a/templates/web/lightbox/agreement_box.html.twig b/templates/web/lightbox/agreement_box.html.twig
index 7b80d499ff..00acc6908f 100644
--- a/templates/web/lightbox/agreement_box.html.twig
+++ b/templates/web/lightbox/agreement_box.html.twig
@@ -3,10 +3,10 @@
     <table cellspacing="0" cellpadding="0">
         <tbody>
             <tr>
-                <td class="title title15">{% trans 'VALIDATION' %}</td>
+                <td class="title title15">{{ 'VALIDATION' | trans }}</td>
                 <td class="report_wrapper">
                   <a class="report" href="#">
-                    {% trans 'lightbox::recaptitulatif' %}
+                    {{ 'lightbox::recaptitulatif' | trans }}
                   </a>
                 </td>
             </tr>
@@ -37,12 +37,12 @@
         <div style="height:60px;">
           {% set agreement = basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() %}
             <div class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false  %}not_decided{% endif %}">
-                <img src="/skins/lightbox/agree-big.png"/><span class="title15">{% trans 'validation:: OUI' %}</span>
+                <img src="/skins/lightbox/agree-big.png"/><span class="title15">{{ 'validation:: OUI' | trans }}</span>
             </div>
         </div>
         <div style="height:60px;">
             <div class="ui-corner-all big_box disagree_{{basket_element.getId()}} disagree {% if agreement is null or agreement == true %}not_decided{% endif %}">
-                <img src="/skins/lightbox/disagree-big.png"/><span class="title15">{% trans 'validation:: NON' %}</span>
+                <img src="/skins/lightbox/disagree-big.png"/><span class="title15">{{ 'validation:: NON' | trans }}</span>
             </div>
         </div>
     </div>
diff --git a/templates/web/lightbox/basket_options.html.twig b/templates/web/lightbox/basket_options.html.twig
index 19594f8665..a63a868ee5 100644
--- a/templates/web/lightbox/basket_options.html.twig
+++ b/templates/web/lightbox/basket_options.html.twig
@@ -1,7 +1,7 @@
 {% if basket.getValidation() and basket.getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
-    <button class="confirm_report" style="width:100%;" title="{% trans 'validation::envoyer mon rapport'%}">
+    <button class="confirm_report" style="width:100%;" title="{{ 'validation::envoyer mon rapport' | trans }}">
     <img src="/skins/lightbox/envoyer.png"/>
-    {% trans 'validation::envoyer mon rapport'%}
+    {{ 'validation::envoyer mon rapport' | trans }}
     <img src="/skins/icons/loader1F1E1B.gif" style="visibility:hidden;" class="loader"/>
     </button>
 {% endif %}
diff --git a/templates/web/lightbox/error.html.twig b/templates/web/lightbox/error.html.twig
index d1b3513018..d8af8e45bd 100644
--- a/templates/web/lightbox/error.html.twig
+++ b/templates/web/lightbox/error.html.twig
@@ -7,10 +7,10 @@
 
 {% block content %}
     <div id="main_index">
-        <h2 style="font-weight:bold;font-size:20px;margin:40px 0;">{% trans 'Erreur !' %}</h2>
+        <h2 style="font-weight:bold;font-size:20px;margin:40px 0;">{{ 'Erreur !' | trans }}</h2>
         <p>{{ message }}</p>
         <p>{{error}}</p>
-        <p><a style="color:black;" target="_self" href="{{ path('lightbox') }}">{% trans 'Retour a laccueil' %}</a></p>
+        <p><a style="color:black;" target="_self" href="{{ path('lightbox') }}">{{ 'Retour a laccueil' | trans }}</a></p>
     </div>
 {% endblock %}
 
diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig
index b2e2b8f042..60075ac452 100644
--- a/templates/web/lightbox/feed.html.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -76,7 +76,7 @@
             </div>
             <div id="right_column" class="PNB">
                 <div class="right_column_title title15 unselectable">
-                    {% trans 'notice'%}
+                    {{ 'notice' | trans }}
                 </div>
                 <div class="right_column_wrapper caption right_column_wrapper_caption PNB">
                     <div id="record_infos" class="PNB">
@@ -97,7 +97,7 @@
                         <td style="width:20px;">
                         </td>
                         <td style="width:40px;">
-                            <button class="ui-corner-all basket_downloader" title="{% trans 'boutton::telecharger tous les documents' %}">
+                            <button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
                                 <img src="/skins/lightbox/save.png"/>
                             </button>
                         </td>
@@ -120,7 +120,7 @@
             </div>
         </div>
     </div>
-    <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
+    <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
 {% endblock %}
 
 
diff --git a/templates/web/lightbox/feed_options_box.html.twig b/templates/web/lightbox/feed_options_box.html.twig
index ef0e3b63ef..e8afc3eb9b 100644
--- a/templates/web/lightbox/feed_options_box.html.twig
+++ b/templates/web/lightbox/feed_options_box.html.twig
@@ -1,24 +1,24 @@
 <span style="padding:10px 4px 7px;">
     {% if feed_element %}
-        <button class="previous_button play btn btn-mini" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
             <i class="icon-chevron-left"></i>
         </button>
-        <button class="previous_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}">
             <i class="icon-chevron-left icon-white"></i>
         </button>
-        <button class="play_button btn btn-mini" title="{% trans 'boutton::demarrer' %}">
+        <button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
             <i class="icon-play"></i>
         </button>
-        <button class="pause_button btn btn-mini" title="{% trans 'boutton::pause' %}">
+        <button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}">
             <i class="icon-pause"></i>
         </button>
-        <button class="next_button play btn btn-mini" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
             <i class="icon-chevron-right"></i>
         </button>
-        <button class="next_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}">
             <i class="icon-chevron-right icon-white"></i>
         </button>
-        <button class="download_button btn btn-mini btn-inverse" title="{% trans 'boutton::telecharger' %}">
+        <button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
             <i class="icon-download icon-white"></i>
         </button>
         <form name="download_form" style="display:none;">
diff --git a/templates/web/lightbox/index.html.twig b/templates/web/lightbox/index.html.twig
index 0112d9d394..817281521e 100644
--- a/templates/web/lightbox/index.html.twig
+++ b/templates/web/lightbox/index.html.twig
@@ -21,10 +21,10 @@
             <thead>
                 <tr>
                     <th class="title">
-                        <h1>{% trans 'Validations' %}</h1>
+                        <h1>{{ 'Validations' | trans }}</h1>
                     </th>
                     <th>
-                        <i>{% trans 'Voici vos validations en cours' %}</i>
+                        <i>{{ 'Voici vos validations en cours' | trans }}</i>
                     </th>
                 </tr>
             </thead>
@@ -54,11 +54,11 @@
                                                       {{basket.getName()|raw}}
                                                   </h2>
                                                   {% if basket.getValidation().isFinished() %}
-                                                      {% trans '(validation) session terminee' %}
+                                                      {{ '(validation) session terminee' | trans }}
                                                   {% elseif basket.getValidation().getParticipant(app['authentication'].getUser(), app).getIsConfirmed() %}
-                                                      {% trans '(validation) envoyee' %}
+                                                      {{ '(validation) envoyee' | trans }}
                                                   {% else %}
-                                                      {% trans '(validation) a envoyer' %}
+                                                      {{ '(validation) a envoyer' | trans }}
                                                   {% endif %}
                                               </td>
                                               <td class="right">
@@ -88,10 +88,10 @@
                 {% endfor %}
                 <tr>
                     <th class="title">
-                        <h1>{% trans 'Paniers'%}</h1>
+                        <h1>{{ 'Paniers' | trans }}</h1>
                     </th>
                     <th>
-                        <i>{% trans 'Voici vos paniers' %}</i>
+                        <i>{{ 'Voici vos paniers' | trans }}</i>
                     </th>
                 </tr>
                 {% for basket in baskets_collection %}
diff --git a/templates/web/lightbox/sc_note.html.twig b/templates/web/lightbox/sc_note.html.twig
index 25ff0262d2..c8f2845261 100644
--- a/templates/web/lightbox/sc_note.html.twig
+++ b/templates/web/lightbox/sc_note.html.twig
@@ -3,7 +3,7 @@
     <div class="notes_overlay"></div>
     <div class="notes well-small">
         <div class="well-small">
-            <h2 class="title15">{% trans 'validation:: votre note' %}</h2>
+            <h2 class="title15">{{ 'validation:: votre note' | trans }}</h2>
         </div>
         <hr/>
         {% for validationDatas in basket_element.getValidationDatas() %}
@@ -20,10 +20,10 @@
             <textarea>{{basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getNote()}}</textarea>
             <div class="buttons">
                 <button class="note_closer ui-corner-all">
-                  {% trans 'boutton::fermer' %}
+                  {{ 'boutton::fermer' | trans }}
                 </button>
                 <button class="note_saver ui-corner-all" id="note_saver_{{basket_element.getId()}}">
-                  {% trans 'boutton::enregistrer' %}
+                  {{ 'boutton::enregistrer' | trans }}
                 </button>
             </div>
         </form>
diff --git a/templates/web/lightbox/sc_options_box.html.twig b/templates/web/lightbox/sc_options_box.html.twig
index 07a7bc0fe5..d5ad88f893 100644
--- a/templates/web/lightbox/sc_options_box.html.twig
+++ b/templates/web/lightbox/sc_options_box.html.twig
@@ -1,24 +1,24 @@
 <span style="padding:10px 4px 7px;">
     {% if basket_element %}
-        <button class="previous_button play btn btn-mini" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
             <i class="icon-chevron-left"></i>
         </button>
-        <button class="previous_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::precedent' %}">
+        <button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}">
             <i class="icon-chevron-left icon-white"></i>
         </button>
-        <button class="play_button btn btn-mini" title="{% trans 'boutton::demarrer' %}">
+        <button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
             <i class="icon-play"></i>
         </button>
-        <button class="pause_button btn btn-mini" title="{% trans 'boutton::pause' %}">
+        <button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}">
             <i class="icon-pause"></i>
         </button>
-        <button class="next_button play btn btn-mini" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
             <i class="icon-chevron-right"></i>
         </button>
-        <button class="next_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::suivant' %}">
+        <button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}">
             <i class="icon-chevron-right icon-white"></i>
         </button>
-        <button class="download_button btn btn-mini btn-inverse" title="{% trans 'boutton::telecharger' %}">
+        <button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
             <i class="icon-download icon-white"></i>
         </button>
         <form name="download_form" style="display:none;">
diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig
index 9c4356f2cd..8c3beaf14a 100644
--- a/templates/web/lightbox/validate.html.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -91,7 +91,7 @@
                     <img class="collapsed" src="/skins/lightbox/collapsed.png"/>
                     <img class="expanded" src="/skins/lightbox/expanded.png"/>
                 {% endif %}
-                    {% trans 'notice'%}
+                    {{ 'notice' | trans }}
                 </div>
                 <div class="right_column_wrapper caption right_column_wrapper_caption PNB" style="{% if basket.getValidation() %}display:none;{% endif %}">
                     <div id="record_infos" class="PNB">
@@ -111,7 +111,7 @@
                 </div>
                 <div id="right_column_validation_toggle" class="PNB ui-corner-all title15">
                     <img src="/skins/lightbox/toexpand.png"/>
-                    {% trans 'VALIDATION' %}
+                    {{ 'VALIDATION' | trans }}
                 </div>
                 <div id="basket_options" class="PNB ui-corner-all unselectable">
                     {% include 'lightbox/basket_options.html.twig' %}
@@ -127,12 +127,12 @@
                         </td>
                         {% if basket.getValidation() %}
                             <td style="width:50px;">
-                                <img title="{% trans 'lightbox::recaptitulatif' %}" class="report" src="/skins/lightbox/retour.png"/>
+                                <img title="{{ 'lightbox::recaptitulatif' | trans }}" class="report" src="/skins/lightbox/retour.png"/>
                             </td>
                         {% endif %}
                         <td style="width:220px;">
                             <select id="navigation" style='margin:0'>
-                                <optgroup label="{% trans 'Validations'%}">
+                                <optgroup label="{{ 'Validations' | trans }}">
                                 {% for item in baskets_collection %}
                                   {% if item.getValidation() %}
                                       <option {% if item.getId() == basket.getId() %} selected="selected" {% endif %}
@@ -140,7 +140,7 @@
                                   {% endif %}
                                 {% endfor %}
                                 </optgroup>
-                                <optgroup label="{% trans 'Paniers'%}">
+                                <optgroup label="{{ 'Paniers' | trans }}">
                                 {% for item in baskets_collection %}
                                   {% if item.getValidation() is null %}
                                     <option {% if basket.getId() == item.getId() %} selected="selected" {% endif %}
@@ -151,7 +151,7 @@
                             </select>
                         </td>
                         <td style="width:50px;">
-                            <button style='width:30px;margin:0;' class="ui-corner-all basket_downloader" title="{% trans 'boutton::telecharger tous les documents' %}">
+                            <button style='width:30px;margin:0;' class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
                                <img src="/skins/lightbox/save.png"/>
                             </button>
                         </td>
@@ -178,10 +178,10 @@
     <div id="report" style="display:none;">
     </div>
     {% endif %}
-    <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
+    <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
   <script type="text/javascript">
     {% if basket.getValidation() %}
-    p4.releasable = {% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).isReleasable() %}"{% trans 'Do you want to send your report ?' %}"{% else %}false{% endif %}
+    p4.releasable = {% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).isReleasable() %}"{{ 'Do you want to send your report ?' | trans }}"{% else %}false{% endif %}
     {% endif %}
   </script>
 {% endblock %}
diff --git a/templates/web/login/cgus.html.twig b/templates/web/login/cgus.html.twig
index 609c08aebb..2caa032608 100644
--- a/templates/web/login/cgus.html.twig
+++ b/templates/web/login/cgus.html.twig
@@ -3,7 +3,7 @@
 {% extends "login/layout/content-only-layout.html.twig" %}
 
 {% block title %}
-    {% trans "Terms of use" %}
+    {{ "Terms of use" | trans }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig
index 2bd5541cef..14985c8379 100644
--- a/templates/web/login/forgot-password.html.twig
+++ b/templates/web/login/forgot-password.html.twig
@@ -3,7 +3,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Forgotten password" %}
+    {{ "Forgotten password" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -11,10 +11,10 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Forgot your password?" %}
+                    {{ "Forgot your password?" | trans }}
                 </div>
                 <div class="sidebar-hint">
-                    {% trans "Enter your e-mail address to retrieve your password" %}
+                    {{ "Enter your e-mail address to retrieve your password" | trans }}
                 </div>
             </div>
         </div>
@@ -43,7 +43,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Send" %}
+                                {{ "Send" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/login/include/guest-access-block.html.twig b/templates/web/login/include/guest-access-block.html.twig
index 9d775ca4cd..9792f5610c 100644
--- a/templates/web/login/include/guest-access-block.html.twig
+++ b/templates/web/login/include/guest-access-block.html.twig
@@ -3,7 +3,7 @@
         <div class="row-fluid">
             <div class="span12 text-center">
                 <a id="guest-link" class="btn btn-info btn-trigger" href="{{ path("login_authenticate_as_guest") }}">
-                    {% trans "Guest access" %}
+                    {{ "Guest access" | trans }}
                 </a>
             </div>
         </div>
diff --git a/templates/web/login/include/language-block.html.twig b/templates/web/login/include/language-block.html.twig
index f5e78ddb24..54884bb36f 100644
--- a/templates/web/login/include/language-block.html.twig
+++ b/templates/web/login/include/language-block.html.twig
@@ -1,6 +1,6 @@
 <div id="authentication-sidebar-language" class="text-right well-small clearfix">
     <div class="pull-left">
-        <a href="{{ path("homepage") }}" title="{% trans "Home" %}"><i class="icon-home icon-white"></i></a>
+        <a href="{{ path("homepage") }}" title="{{ "Home" | trans }}"><i class="icon-home icon-white"></i></a>
     </div>
     <div class="pull-right btn-group">
         <button id="language-button" class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown" type="button">
@@ -13,5 +13,5 @@
             {% endfor %}
         </ul>
     </div>
-    <div class="language pull-right">{% trans "language" %}</div>
+    <div class="language pull-right">{{ "language" | trans }}</div>
 </div>
diff --git a/templates/web/login/include/register-link-block.html.twig b/templates/web/login/include/register-link-block.html.twig
index ad38952d9a..25dafa80f6 100644
--- a/templates/web/login/include/register-link-block.html.twig
+++ b/templates/web/login/include/register-link-block.html.twig
@@ -2,12 +2,12 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 text-center">
-                {% trans "No account yet?" %}
+                {{ "No account yet?" | trans }}
             </div>
         </div>
         <div class="row-fluid">
             <div class="span12 text-center">
-                <a id="link-register" class="btn btn-success btn-trigger" href="{{ path("login_register") }}">{% trans "Register" %}</a>
+                <a id="link-register" class="btn btn-success btn-trigger" href="{{ path("login_register") }}">{{ "Register" | trans }}</a>
             </div>
         </div>
     </div><!-- /sidebar block -->
diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig
index a492178bcc..444e10bc80 100644
--- a/templates/web/login/index.html.twig
+++ b/templates/web/login/index.html.twig
@@ -21,7 +21,7 @@
         <div class="row-fluid">
             <div class="span12 authentication-sidebar-title">
                 <div class="text-title">
-                    {% trans "Connection" %}
+                    {{ "Connection" | trans }}
                 </div>
             </div>
         </div>
@@ -33,9 +33,9 @@
                 {% if unlock_usr_id is not empty %}
                 <div class="row-fluid">
                     <div class="span12">
-                        {% trans 'Your account is locked, please follow the following link to unlock it' %}<br/>
+                        {{ 'Your account is locked, please follow the following link to unlock it' | trans }}<br/>
                         <a href="{{ path('login_send_mail', { 'usr_id' : unlock_usr_id }) }}" target ="_self">
-                            {% trans 'login:: Envoyer a nouveau le mail de confirmation' %}
+                            {{ 'login:: Envoyer a nouveau le mail de confirmation' | trans }}
                         </a>
                     </div>
                 </div>
@@ -67,7 +67,7 @@
                     </div>
                     <div class="text-right">
                         <a class="forget-password-link" href="{{ path("login_forgot_password") }}">
-                            {% trans "Forgot password?" %}
+                            {{ "Forgot password?" | trans }}
                         </a>
                     </div>
                     {% if recaptcha_display %}
@@ -81,7 +81,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Connection" %}
+                                {{ "Connection" | trans }}
                             </button>
                         </div>
                     </div>
@@ -99,7 +99,7 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 text-center">
-                {% trans "Or login with" %}
+                {{ "Or login with" | trans }}
             </div>
         </div>
         <div class="row-fluid">
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index 91add9e4a7..3ddbb923eb 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -96,15 +96,15 @@
                                                <div class="footer-block">
                                                    <ul class="inline footer-list unstyled">
                                                        <li class="item-first" >
-                                                          <a href="{{ path("homepage") }}">{% trans "Home" %}</a>
+                                                          <a href="{{ path("homepage") }}">{{ "Home" | trans }}</a>
                                                        </li>
                                                        <li>
-                                                          <a href="#">{% trans "Help" %}</a>
+                                                          <a href="#">{{ "Help" | trans }}</a>
                                                        </li>
                                                        {% if has_terms_of_use %}
                                                            <li>
                                                                {% block tou_link %}
-                                                                   <a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a>
+                                                                   <a href="{{ path("login_cgus") }}">{{ "Terms of use" | trans }}</a>
                                                                {% endblock tou_link %}
                                                            </li>
                                                        {% endif %}
diff --git a/templates/web/login/layout/sidebar-layout.html.twig b/templates/web/login/layout/sidebar-layout.html.twig
index df5555a7ac..b39b348ed5 100644
--- a/templates/web/login/layout/sidebar-layout.html.twig
+++ b/templates/web/login/layout/sidebar-layout.html.twig
@@ -21,7 +21,7 @@
                             <div class="text-title">
                                 {% block main_title %}{% endblock %}
                             </div>
-                            <a class="visible-phone text-right" data-toggle="collapse" data-target="#headerDetail">{% trans "More" %} ...</a>
+                            <a class="visible-phone text-right" data-toggle="collapse" data-target="#headerDetail">{{ "More" | trans }} ...</a>
                             <p id="headerDetail" class="collapse">
                                 {% block short_presentation %}{% endblock %}
                             </p>
diff --git a/templates/web/login/oauth/authorize-access.html.twig b/templates/web/login/oauth/authorize-access.html.twig
index f7cf304183..d6c8b12f72 100644
--- a/templates/web/login/oauth/authorize-access.html.twig
+++ b/templates/web/login/oauth/authorize-access.html.twig
@@ -1,7 +1,7 @@
 {% extends "login/layout/middle-bar-layout.html.twig" %}
 
 {% block title %}
-    {% trans "Authorization Access" %}
+    {{ "Authorization Access" | trans }}
 {% endblock %}
 
 {% block content %}
@@ -18,7 +18,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Authorization Access" %}
+                    {{ "Authorization Access" | trans }}
                 </div>
                 <div>
                     {% set application_name %}
@@ -36,10 +36,10 @@
                 <table class="authorize-panel fixed-table">
                     <tr>
                         <td class="span8">
-                            <a href="#" class="btn btn-trigger btn-success full-width">{% trans "Authorize" %}</a>
+                            <a href="#" class="btn btn-trigger btn-success full-width">{{ "Authorize" | trans }}</a>
                         </td>
                         <td class="text-right span4">
-                            <a href="#" >{% trans "Deny" %}</a>
+                            <a href="#" >{{ "Deny" | trans }}</a>
                         </td>
                     </tr>
                 </table>
diff --git a/templates/web/login/oauth/desktop-code.html.twig b/templates/web/login/oauth/desktop-code.html.twig
index d0d6e76eb0..d168bf75d1 100644
--- a/templates/web/login/oauth/desktop-code.html.twig
+++ b/templates/web/login/oauth/desktop-code.html.twig
@@ -1,7 +1,7 @@
 {% extends "login/layout/middle-bar-layout.html.twig" %}
 
 {% block title %}
-    {% trans "Authorization code" %}
+    {{ "Authorization code" | trans }}
 {% endblock %}
 
 {% block content %}
@@ -18,10 +18,10 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Access code" %}
+                    {{ "Access code" | trans }}
                 </div>
                 <div>
-                    {% trans "Copy the code below, return to your application and paste the code to the right place." %}
+                    {{ "Copy the code below, return to your application and paste the code to the right place." | trans }}
                 </div>
             </div>
         </div>
diff --git a/templates/web/login/oauth/login.html.twig b/templates/web/login/oauth/login.html.twig
index 3b1d06a8b9..bc5541c2d3 100644
--- a/templates/web/login/oauth/login.html.twig
+++ b/templates/web/login/oauth/login.html.twig
@@ -6,7 +6,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Login" %}
+    {{ "Login" | trans }}
 {% endblock %}
 
 {% block content %}
@@ -23,7 +23,7 @@
         <div class="row-fluid">
             <div class="span12 authentication-sidebar-title">
                 <div class="text-title">
-                    {% trans "Hi, Please log in" %}
+                    {{ "Hi, Please log in" | trans }}
                 </div>
             </div>
         </div>
@@ -55,7 +55,7 @@
                     </div>
                     <div class="text-right">
                         <a class="forget-password-link" href="{{ path("login_forgot_password") }}">
-                            {% trans "Forgot password?" %}
+                            {{ "Forgot password?" | trans }}
                         </a>
                     </div>
                     {% if recaptcha_display %}
@@ -71,7 +71,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Connection" %}
+                                {{ "Connection" | trans }}
                             </button>
                         </div>
                     </div>
@@ -88,7 +88,7 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 text-center">
-                {% trans "Or login with" %}
+                {{ "Or login with" | trans }}
             </div>
         </div>
         <div class="row-fluid">
diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig
index cfff558802..834a4af026 100644
--- a/templates/web/login/providers/bind.html.twig
+++ b/templates/web/login/providers/bind.html.twig
@@ -4,7 +4,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Login" %}
+    {{ "Login" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -12,7 +12,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Connection" %}
+                    {{ "Connection" | trans }}
                 </div>
             </div>
         </div>
@@ -25,7 +25,7 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 sidebar-hint-large">
-                {% trans "Login to link your account" %}
+                {{ "Login to link your account" | trans }}
             </div>
         </div>
         <div class="row-fluid">
@@ -55,7 +55,7 @@
                         </div>
                     </div>
                     <div class="text-right">
-                        <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
+                        <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{{ "Forgot password?" | trans }}</a>
                     </div>
                     {% if recaptcha_display %}
                         <div class="row-fluid">
@@ -70,7 +70,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Connection" %}
+                                {{ "Connection" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig
index f60bebf82a..08891a6146 100644
--- a/templates/web/login/providers/mapping.html.twig
+++ b/templates/web/login/providers/mapping.html.twig
@@ -4,7 +4,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Login" %}
+    {{ "Login" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -12,7 +12,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Connection" %}
+                    {{ "Connection" | trans }}
                 </div>
                 <div class="match-hint">
                     {% set provider_name = provider.getName() %}
@@ -43,7 +43,7 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 sidebar-hint-large">
-                {% trans "Login to link your account" %}
+                {{ "Login to link your account" | trans }}
             </div>
         </div>
         <div class="row-fluid">
@@ -73,7 +73,7 @@
                         </div>
                     </div>
                     <div class="text-right">
-                        <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
+                        <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{{ "Forgot password?" | trans }}</a>
                     </div>
                     {% if recaptcha_display %}
                         <div class="row-fluid">
@@ -88,7 +88,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Connection" %}
+                                {{ "Connection" | trans }}
                             </button>
                         </div>
                     </div>
@@ -99,13 +99,13 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 text-center">
-                {% trans "These informations do not match?" %}
+                {{ "These informations do not match?" | trans }}
             </div>
         </div>
         <div class="row-fluid">
             <div class="span12 text-center">
                 <a href="{{ path("homepage") }}" class="btn btn-info btn-trigger">
-                    {% trans "Use my Phraseanet account" %}
+                    {{ "Use my Phraseanet account" | trans }}
                 </a>
             </div>
         </div>
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig
index c28092e371..ed4b332dd0 100644
--- a/templates/web/login/register-classic.html.twig
+++ b/templates/web/login/register-classic.html.twig
@@ -4,7 +4,7 @@
 {% import "common/macros.html.twig" as macro %}
 
 {% block title %}
-    {% trans "Register" %}
+    {{ "Register" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -12,7 +12,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Inscription" %}
+                    {{ "Inscription" | trans }}
                 </div>
                 <div class="sidebar-hint">
                     {% trans %}
@@ -64,7 +64,7 @@
                             <div class="span12">
                                 {% set label %}
                                     <a target="_blank" href="{{ path("login_cgus") }}">
-                                        {% trans "I have read the terms of use" %}
+                                        {{ "I have read the terms of use" | trans }}
                                     </a>
                                 {% endset %}
 
@@ -95,7 +95,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Request access" %}
+                                {{ "Request access" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig
index edf67eccac..d17c697107 100644
--- a/templates/web/login/register-provider.html.twig
+++ b/templates/web/login/register-provider.html.twig
@@ -3,7 +3,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Register" %}
+    {{ "Register" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -12,7 +12,7 @@
         <div class="row-fluid">
             <div class="span12">
                 <div class="text-title">
-                    {% trans "Completion of your registration" %}
+                    {{ "Completion of your registration" | trans }}
                 </div>
             </div>
         </div>
@@ -25,7 +25,7 @@
 
         <div class="row-fluid">
             <div class="span12 sidebar-hint">
-                {% trans "Please complete the information to complete your registration" %}
+                {{ "Please complete the information to complete your registration" | trans }}
             </div>
         </div>
 
@@ -57,7 +57,7 @@
                     {% endfor %}
 
                     <div class="sidebar-hint">
-                        * {% trans "Mandatory fields" %}
+                        * {{ "Mandatory fields" | trans }}
                     </div>
 
                     {%  if has_terms_of_use %}
@@ -65,7 +65,7 @@
                             <div class="span12">
                                 {% set label %}
                                     <a href="{{ path("login_cgus") }}">
-                                        {% trans "I have read the terms of use" %}
+                                        {{ "I have read the terms of use" | trans }}
                                     </a>
                                 {% endset %}
 
@@ -79,7 +79,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger">
-                                {% trans "Resquest access" %}
+                                {{ "Resquest access" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/login/register.html.twig b/templates/web/login/register.html.twig
index 6ea1444ebf..c9c4e8b972 100644
--- a/templates/web/login/register.html.twig
+++ b/templates/web/login/register.html.twig
@@ -3,7 +3,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Register" %}
+    {{ "Register" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -11,7 +11,7 @@
         <div class="row-fluid">
             <div class="span12 authentication-sidebar-title">
                 <div class="text-title">
-                    {% trans "Inscription" %}
+                    {{ "Inscription" | trans }}
                 </div>
             </div>
         </div>
@@ -19,7 +19,7 @@
             <div class="span12">
                 <a id="register-classic" href="{{ path("login_register_classic") }}" class="btn btn-success btn-trigger input-block-level">
                     <span class="pull-left">
-                        {% trans "Create an account manually" %}
+                        {{ "Create an account manually" | trans }}
                     </span>
                     <span class="pull-right">
                         <i class="icon-arrow-right icon-white"></i>
@@ -33,7 +33,7 @@
     <div class="well-large sidebar-block">
         <div class="row-fluid">
             <div class="span12 text-center">
-                {% trans "Or login with" %}
+                {{ "Or login with" | trans }}
             </div>
         </div>
         <div class="row-fluid">
diff --git a/templates/web/login/renew-password.html.twig b/templates/web/login/renew-password.html.twig
index 11ff0ebbad..8dfe0fe001 100644
--- a/templates/web/login/renew-password.html.twig
+++ b/templates/web/login/renew-password.html.twig
@@ -3,7 +3,7 @@
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
-    {% trans "Renew password" %}
+    {{ "Renew password" | trans }}
 {% endblock %}
 
 {% block sidebar %}
@@ -11,7 +11,7 @@
         <div class="row-fluid">
             <div class="span12 authentication-sidebar-title">
                 <div class="text-title">
-                    {% trans "Choose a new password" %}
+                    {{ "Choose a new password" | trans }}
                 </div>
             </div>
         </div>
@@ -38,7 +38,7 @@
                     <div class="row-fluid">
                         <div class="span12">
                             <button type="submit" class="btn btn-success btn-trigger ">
-                                {% trans "Save" %}
+                                {{ "Save" | trans }}
                             </button>
                         </div>
                     </div>
diff --git a/templates/web/prod/Baskets/Create.html.twig b/templates/web/prod/Baskets/Create.html.twig
index 7d1f4527ad..fd8d6369fb 100644
--- a/templates/web/prod/Baskets/Create.html.twig
+++ b/templates/web/prod/Baskets/Create.html.twig
@@ -1,13 +1,13 @@
 <form method="POST" action="{{ path('prod_baskets') }}">
-    <label>{% trans 'Nom du nouveau panier' %}</label>
+    <label>{{ 'Nom du nouveau panier' | trans }}</label>
     <input name="name" class="input-block-level" value="" type="text"/>
 
-    <label>{% trans 'paniers::description du nouveau panier' %}</label>
+    <label>{{ 'paniers::description du nouveau panier' | trans }}</label>
     <textarea name="description" class="input-block-level" ></textarea>
 
     <label for="new_basket_add_sel" class="checkbox">
         <input type="checkbox" name="lst" value="" id="new_basket_add_sel"/>
-        {% trans 'Ajouter ma selection courrante' %}
+        {{ 'Ajouter ma selection courrante' | trans }}
     </label>
 </form>
 
diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index a1cc3e1736..b039513659 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -2,20 +2,20 @@
 <div id="reorder_box">
     <div id="reorder_options" class="row-fluid">
         <form class="form-inline span10">
-        <label for="auto_order">{% trans 'Reordonner automatiquement' %}</label>
+        <label for="auto_order">{{ 'Reordonner automatiquement' | trans }}</label>
         <select id="auto_order">
-            <option value="">{% trans 'Choisir' %}</option>
-            <option value="default">{% trans 'Re-initialiser' %}</option>
-            <option value="title">{% trans 'Titre' %}</option>
+            <option value="">{{ 'Choisir' | trans }}</option>
+            <option value="default">{{ 'Re-initialiser' | trans }}</option>
+            <option value="title">{{ 'Titre' | trans }}</option>
         </select>
-        <button type="button" class="autoorder btn btn-inverse">{% trans 'Re-ordonner' %}</button>
-        <button type="button" class="reverseorder btn btn-inverse">{% trans 'Inverser' %}</button>
+        <button type="button" class="autoorder btn btn-inverse">{{ 'Re-ordonner' | trans }}</button>
+        <button type="button" class="reverseorder btn btn-inverse">{{ 'Inverser' | trans }}</button>
         </form>
         <form class="form-inline span2" name="reorder" method="POST" action="{{ path('prod_baskets_basket_reorder', { 'basket' : basket.getId() }) }}">
         {% for element in basket.getElements() %}
                 <input type="hidden" name="element[{{ element.getId() }}]" value="{{ element.getOrd() }}"/>
         {% endfor %}
-        <input type="submit" class="btn btn-inverse" value="{% trans 'boutton::valider' %}" />
+        <input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}" />
         </form>
     </div>
     <div class="elements row-fluid">
diff --git a/templates/web/prod/Baskets/Update.html.twig b/templates/web/prod/Baskets/Update.html.twig
index 5d623c6d7b..81a84cd330 100644
--- a/templates/web/prod/Baskets/Update.html.twig
+++ b/templates/web/prod/Baskets/Update.html.twig
@@ -1,10 +1,10 @@
 <div>
     <form action="{{ path('prod_baskets_basket_update', { 'basket' : basket.getId()}) }}" method="POST" id="basket-rename-box">
-        <label style="margin:5px 0 0 0;">{% trans 'panier:: nom' %}</label>
+        <label style="margin:5px 0 0 0;">{{ 'panier:: nom' | trans }}</label>
         <input type="text" name="name" value="{{ basket.getName() }}" style="width:98%;" />
-        <label style="margin:5px 0 0 0;">{% trans 'panier:: description' %}</label>
+        <label style="margin:5px 0 0 0;">{{ 'panier:: description' | trans }}</label>
         <textarea style="width:98%;height:120px;" name="description">{{ basket.getDescription() }}</textarea>
-        <button type='button' class="btn btn-inverse" style="margin: 5px 40%;">{% trans 'boutton::valider' %}</button>
+        <button type='button' class="btn btn-inverse" style="margin: 5px 40%;">{{ 'boutton::valider' | trans }}</button>
     </form>
     <script type="text/javascript">
       $(document).ready(function(){
diff --git a/templates/web/prod/Share/record.html.twig b/templates/web/prod/Share/record.html.twig
index bc9efac7b6..2f9621b439 100644
--- a/templates/web/prod/Share/record.html.twig
+++ b/templates/web/prod/Share/record.html.twig
@@ -1,9 +1,9 @@
 {% set preview = record.get_preview()%}
 
 {% if preview is iterable %}
-    <p>{% trans 'No preview available.' %}</p>
+    <p>{{ 'No preview available.' | trans }}</p>
 {% elseif preview.get_permalink() is none %}
-    <p>{% trans 'No permalink available.' %}</p>
+    <p>{{ 'No permalink available.' | trans }}</p>
 {% else %}
     {% set type = record.get_type() %}
     {% set url = preview.get_permalink().get_url() %}
@@ -52,7 +52,7 @@
             });
         </script>
     {% else %}
-        <div><{% trans 'No URL available' %}</div>
+        <div><{{ 'No URL available' | trans }}</div>
     {% endif %}
 {% endif %}
 
diff --git a/templates/web/prod/Story/Create.html.twig b/templates/web/prod/Story/Create.html.twig
index debecf6c4b..c20d7dcd36 100644
--- a/templates/web/prod/Story/Create.html.twig
+++ b/templates/web/prod/Story/Create.html.twig
@@ -1,18 +1,18 @@
 <form method="POST" action="{{ path('prod_stories_do_create') }}">
 
-    <label>{% trans 'Collection' %}</label>
+    <label>{{ 'Collection' | trans }}</label>
     <select name="base_id">
         {% for collection in app['acl'].get(app['authentication'].getUser()).get_granted_base(['canaddrecord']) %}
             <option value="{{ collection.get_base_id() }}">{{ collection.get_databox().get_label(app['locale.I18n']) }} / {{ collection.get_label(app['locale.I18n']) }}</option>
         {% endfor %}
     </select>
 
-    <label>{% trans 'Story name' %}</label>
+    <label>{{ 'Story name' | trans }}</label>
     <input name="name" value="" type="text"/>
 
     <label for="new_story_add_sel" class="checkbox">
         <input type="checkbox" name="lst" value="" id="new_story_add_sel"/>
-        {% trans 'Ajouter ma selection courrante' %}
+        {{ 'Ajouter ma selection courrante' | trans }}
     </label>
 
   <script type="text/javascript">
diff --git a/templates/web/prod/Story/Reorder.html.twig b/templates/web/prod/Story/Reorder.html.twig
index 26f209627b..4bef8aac03 100644
--- a/templates/web/prod/Story/Reorder.html.twig
+++ b/templates/web/prod/Story/Reorder.html.twig
@@ -1,13 +1,13 @@
 {% import 'common/thumbnail.html.twig' as thumbnail %}
 <div id="reorder_options" class="PNB" style="height:30px;bottom:auto;">
-    <span>{% trans 'Reordonner automatiquement' %}</span>
+    <span>{{ 'Reordonner automatiquement' | trans }}</span>
     <select id="auto_order">
-      <option value="">{% trans 'Choisir' %}</option>
-      <option value="default">{% trans 'Re-initialiser' %}</option>
-      <option value="title">{% trans 'Titre' %}</option>
+      <option value="">{{ 'Choisir' | trans }}</option>
+      <option value="default">{{ 'Re-initialiser' | trans }}</option>
+      <option value="title">{{ 'Titre' | trans }}</option>
     </select>
-    <button type="button" class="autoorder">{% trans 'Re-ordonner' %}</button>
-    <button type="button" class="reverseorder">{% trans 'Inverser' %}</button>
+    <button type="button" class="autoorder">{{ 'Re-ordonner' | trans }}</button>
+    <button type="button" class="reverseorder">{{ 'Inverser' | trans }}</button>
 </div>
 <div style="top:30px;overflow:auto;" id="reorder_box" class="PNB">
     <div class="elements">
@@ -29,7 +29,7 @@
       {% for element in story.get_children() %}
         <input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.get_number() }}"/>
       {% endfor %}
-      <button>{% trans 'boutton::valider' %}</button>
+      <button>{{ 'boutton::valider' | trans }}</button>
     </form>
 </div>
 
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index c50c8c470f..5f38ee745c 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -1,6 +1,6 @@
 {% import 'common/thumbnail.html.twig' as thumbnail %}
 
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %} {{ basket.getName() }} {% endset %}
 {% set width = 300 %}
diff --git a/templates/web/prod/Tooltip/Caption.html.twig b/templates/web/prod/Tooltip/Caption.html.twig
index f69897be45..cd85656671 100644
--- a/templates/web/prod/Tooltip/Caption.html.twig
+++ b/templates/web/prod/Tooltip/Caption.html.twig
@@ -1,6 +1,6 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
-{% set title %}{% trans 'Caption' %}{% endset %}
+{% set title %}{{ 'Caption' | trans }}{% endset %}
 {% set width = 400 %}
 {% set maxwidth = 700 %}
 
diff --git a/templates/web/prod/Tooltip/DCESFieldInfo.html.twig b/templates/web/prod/Tooltip/DCESFieldInfo.html.twig
index b4304a9699..63cf075faf 100644
--- a/templates/web/prod/Tooltip/DCESFieldInfo.html.twig
+++ b/templates/web/prod/Tooltip/DCESFieldInfo.html.twig
@@ -1,4 +1,4 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %}
     {% if field.get_dces_element() %}
@@ -18,7 +18,7 @@
             {% endtrans %}
             </p>
             <p>
-                {% trans 'Description' %} : {{ field.get_dces_element().get_definition() }}
+                {{ 'Description' | trans }} : {{ field.get_dces_element().get_definition() }}
             </p>
             <p>
                 {% set lien = '<a href="' ~ field.get_dces_element().get_documentation_link() ~ '" target="_blank">' ~ field.get_dces_element().get_documentation_link() ~ '</a>' %}
diff --git a/templates/web/prod/Tooltip/DataboxField.html.twig b/templates/web/prod/Tooltip/DataboxField.html.twig
index bb03c331b2..7c64a97839 100644
--- a/templates/web/prod/Tooltip/DataboxField.html.twig
+++ b/templates/web/prod/Tooltip/DataboxField.html.twig
@@ -1,14 +1,14 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %}
     {{ field.get_label(app['locale.I18n']) }}
 
     {% if field.get_type() == 'text' %}
-        ({% trans 'Type texte' %})
+        ({{ 'Type texte' | trans }})
     {% elseif field.get_type() == 'number' %}
-        ({% trans 'Type nombre' %})
+        ({{ 'Type nombre' | trans }})
     {% elseif field.get_type() == 'date' %}
-        ({% trans 'Type date' %})
+        ({{ 'Type date' | trans }})
     {% endif %}
 {% endset %}
 {% set width = 300 %}
@@ -16,37 +16,37 @@
 
 {% block content %}
     <div>
-        {% trans 'Source' %} : {{ field.get_tag().getGroupName() }} / {{ field.get_tag().getName() }}
+        {{ 'Source' | trans }} : {{ field.get_tag().getGroupName() }} / {{ field.get_tag().getName() }}
     </div>
 
     {% if field.is_indexable() is empty %}
         <div>
-            {% trans 'Ce champ n\'est pas indexe' %}
+            {{ 'Ce champ n\'est pas indexe' | trans }}
         </div>
         {% endif %}
     {% if field.is_multi() %}
         <div>
-            {% trans 'Ce champ est multivalue' %}
+            {{ 'Ce champ est multivalue' | trans }}
         </div>
     {% endif %}
     {% if field.is_readonly() %}
         <div>
-            {% trans 'Ce champ est en lecture seule' %}
+            {{ 'Ce champ est en lecture seule' | trans }}
         </div>
     {% endif %}
     {% if field.get_tbranch() %}
         <div>
-            {% trans 'Ce champ est relie a une branche de thesaurus' %}
+            {{ 'Ce champ est relie a une branche de thesaurus' | trans }}
         </div>
         {% endif %}
     {% if field.get_thumbtitle() %}
         <div>
-            {% trans 'Ce champ est utilise en titre a l\'affichage' %}
+            {{ 'Ce champ est utilise en titre a l\'affichage' | trans }}
         </div>
     {% endif %}
     {% if field.is_required() %}
         <div>
-            {% trans 'Ce champ est requis' %}
+            {{ 'Ce champ est requis' | trans }}
         </div>
     {% endif %}
 
diff --git a/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig b/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig
index 507c5dc269..288820a2d6 100644
--- a/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig
+++ b/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig
@@ -1,4 +1,4 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %} {{ field.get_label(app['locale.I18n']) }} ({{ field.get_tag().getTagname() }}) {% endset %}
 {% set width = 600 %}
@@ -23,8 +23,8 @@
     <div>
         <blockquote>
             <small>
-                {% trans 'Les indications donnees ci dessous sont a titre informatif.' %}<br/>
-                {% trans 'Si vous ne les respectez pas, les documents seront correctement indexes, mais les metadonnees inscrites risquent d\'etre erronnees' %}<br/>
+                {{ 'Les indications donnees ci dessous sont a titre informatif.' | trans }}<br/>
+                {{ 'Si vous ne les respectez pas, les documents seront correctement indexes, mais les metadonnees inscrites risquent d\'etre erronnees' | trans }}<br/>
                 {% set norm_name = '<span style="font-style:normal;font-weight:bold;">' ~ field.get_tag().getGroupName() ~ '</span>' %}
                 {% trans %}
                     Ces informations sont directement fournies par la norme de metadonnees de ce champ : {{ norm_name }}
diff --git a/templates/web/prod/Tooltip/Preview.html.twig b/templates/web/prod/Tooltip/Preview.html.twig
index 0d2d1fbe94..e030933428 100644
--- a/templates/web/prod/Tooltip/Preview.html.twig
+++ b/templates/web/prod/Tooltip/Preview.html.twig
@@ -1,4 +1,4 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %} {{ record.get_title() }} {% endset %}
 {% set width = null %}
diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig
index f326152a7f..79f45615de 100644
--- a/templates/web/prod/Tooltip/Story.html.twig
+++ b/templates/web/prod/Tooltip/Story.html.twig
@@ -1,6 +1,6 @@
 {% import 'common/thumbnail.html.twig' as thumbnail %}
 
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %} {{ Story.get_title() }} {% endset %}
 {% set width = 300 %}
diff --git a/templates/web/prod/Tooltip/TechnicalDatas.html.twig b/templates/web/prod/Tooltip/TechnicalDatas.html.twig
index 98649cdd7a..833a4375da 100644
--- a/templates/web/prod/Tooltip/TechnicalDatas.html.twig
+++ b/templates/web/prod/Tooltip/TechnicalDatas.html.twig
@@ -1,6 +1,6 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
-{% set title %}{% trans 'Technical Informations' %}{% endset %}
+{% set title %}{{ 'Technical Informations' | trans }}{% endset %}
 {% set width = 280 %}
 {% set maxwidth = null %}
 
diff --git a/templates/web/prod/Tooltip/User.html.twig b/templates/web/prod/Tooltip/User.html.twig
index 8e1c94e6f0..25eb4f787e 100644
--- a/templates/web/prod/Tooltip/User.html.twig
+++ b/templates/web/prod/Tooltip/User.html.twig
@@ -1,4 +1,4 @@
-{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+{% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
 {% set title %}
     app['authentication'].getUser().get_display_name()
diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig
index 63f1950aeb..b5dca389fc 100644
--- a/templates/web/prod/User/Add.html.twig
+++ b/templates/web/prod/User/Add.html.twig
@@ -4,7 +4,7 @@
         <table>
             <tr>
                 <td>
-                    <label for="">{% trans 'First Name' %} *</label>
+                    <label for="">{{ 'First Name' | trans }} *</label>
                 </td>
                 <td>
                     <input name="firstname" type="text" value=""/>
@@ -12,7 +12,7 @@
             </tr>
             <tr>
                 <td>
-                    <label for="">{% trans 'Last Name' %} *</label>
+                    <label for="">{{ 'Last Name' | trans }} *</label>
                 </td>
                 <td>
                     <input name="lastname" type="text" value=""/>
@@ -20,7 +20,7 @@
             </tr>
             <tr>
                 <td>
-                    <label for="">{% trans 'Email Name' %} *</label>
+                    <label for="">{{ 'Email Name' | trans }} *</label>
                 </td>
                 <td>
                     <input name="email" type="text" value=""/>
@@ -28,7 +28,7 @@
             </tr>
             <tr>
                 <td>
-                    <label for="">{% trans 'Job' %}</label>
+                    <label for="">{{ 'Job' | trans }}</label>
                 </td>
                 <td>
                     <input name="job" type="text" value=""/>
@@ -36,7 +36,7 @@
             </tr>
             <tr>
                 <td>
-                    <label for="">{% trans 'Company' %}</label>
+                    <label for="">{{ 'Company' | trans }}</label>
                 </td>
                 <td>
                     <input name="company" type="text" value=""/>
@@ -44,7 +44,7 @@
             </tr>
             <tr>
                 <td>
-                    <label for="">{% trans 'City' %}</label>
+                    <label for="">{{ 'City' | trans }}</label>
                 </td>
                 <td>
                     <input name="city" type="text" value="" class="geoname_field"/>
@@ -53,8 +53,8 @@
             <tr>
                 <td></td>
                 <td>
-                    <button class="valid btn btn-inverse">{% trans 'Add' %}</button>
-                    <button class="cancel btn btn-inverse">{% trans 'Cancel' %}</button>
+                    <button class="valid btn btn-inverse">{{ 'Add' | trans }}</button>
+                    <button class="cancel btn btn-inverse">{{ 'Cancel' | trans }}</button>
                 </td>
             </tr>
         </table>
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index af94792856..9e35f794bd 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -3,67 +3,67 @@
     <div class="tools">
 
 
-      <button class="ui-corner-all TOOL_disktt_btn basket_window" title="{% trans 'action : exporter' %}">
+      <button class="ui-corner-all TOOL_disktt_btn basket_window" title="{{ 'action : exporter' | trans }}">
         <img src="/skins/prod/000000/images/disktt_history.gif"/>
       </button>
-      <button class="ui-corner-all TOOL_print_btn basket_window" title="{% trans 'action : print' %}">
+      <button class="ui-corner-all TOOL_print_btn basket_window" title="{{ 'action : print' | trans }}">
         <img src="/skins/prod/000000/images/print_history.gif"/>
       </button>
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %}
-      <button class="ui-corner-all TOOL_ppen_btn basket_window" title="{% trans 'action : editer' %}">
+      <button class="ui-corner-all TOOL_ppen_btn basket_window" title="{{ 'action : editer' | trans }}">
         <img src="/skins/prod/000000/images/ppen_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
-      <button class="ui-corner-all TOOL_chgstatus_btn basket_window" title="{% trans 'action : status' %}">
+      <button class="ui-corner-all TOOL_chgstatus_btn basket_window" title="{{ 'action : status' | trans }}">
         <img src="/skins/prod/000000/images/chgstatus_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
-      <button class="ui-corner-all TOOL_chgcoll_btn basket_window" title="{% trans 'action : collection' %}">
+      <button class="ui-corner-all TOOL_chgcoll_btn basket_window" title="{{ 'action : collection' | trans }}">
         <img src="/skins/prod/000000/images/chgcoll_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('push') %}
-      <button class="ui-corner-all TOOL_pushdoc_btn basket_window" title="{% trans 'action : push' %}">
+      <button class="ui-corner-all TOOL_pushdoc_btn basket_window" title="{{ 'action : push' | trans }}">
         <img src="/skins/icons/push16.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('push') %}
-      <button class="ui-corner-all TOOL_feedback_btn basket_window" title="{% trans 'Feedback' %}">
+      <button class="ui-corner-all TOOL_feedback_btn basket_window" title="{{ 'Feedback' | trans }}">
         <img src="/skins/icons/feedback16.png"/>
       </button>
       {% endif %}
       {% if app['acl'].get(app['authentication'].getUser()).has_right('bas_chupub') %}
-      <button class="ui-corner-all TOOL_bridge_btn basket_window" title="{% trans 'action : bridge' %}">
+      <button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}">
         <img src="/skins/icons/door.png"/>
       </button>
-      <button class="ui-corner-all TOOL_publish_btn basket_window" title="{% trans 'action : publier' %}">
+      <button class="ui-corner-all TOOL_publish_btn basket_window" title="{{ 'action : publier' | trans }}">
         <img src="/skins/icons/rss16.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('doctools') %}
-      <button class="ui-corner-all TOOL_imgtools_btn basket_window" title="{% trans 'action : outils' %}">
+      <button class="ui-corner-all TOOL_imgtools_btn basket_window" title="{{ 'action : outils' | trans }}">
         <img src="/skins/prod/000000/images/imgtools_history.gif"/>
       </button>
       {% endif %}
-      <button class="ui-corner-all TOOL_trash_btn basket_window" title="{% trans 'action : supprimer' %}">
+      <button class="ui-corner-all TOOL_trash_btn basket_window" title="{{ 'action : supprimer' | trans }}">
         <img src="/skins/icons/delete.png"/>
       </button>
 
     </div>
-            <div class="alert_datas_changed ui-corner-all">{% trans 'Certaines donnees du panier ont change' %} <a class="basket_refresher" href="#">{% trans 'rafraichir' %}</a></div>
+            <div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div>
 {% if basket_length == 0 %}
             <div style="height:120px;"></div>
 {% endif %}
 
-{% set basket_scope = 'objects'%}
+{% set basket_scope = 'objects' %}
 
 {% import 'prod/WorkZone/Macros.html.twig' as Macros %}
 
diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig
index 9291895556..ba9a875b42 100644
--- a/templates/web/prod/WorkZone/Browser/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig
@@ -5,7 +5,7 @@
         <td style="width:230px;">
           <a href="#" class="back">
             <img src="/skins/prod/Basket/Browser/BASKET_LIST.png"/>
-            {% trans 'Back to basket list' %}
+            {{ 'Back to basket list' | trans }}
           </a>
         </td>
         <td>
@@ -79,9 +79,9 @@
     <div class="PNB10">
     {% set ElementsCount = Basket.getElements().count() %}
     {% if ElementsCount == 0 %}
-      {% trans 'No records' %}
+      {{ 'No records' | trans }}
     {% elseif ElementsCount == 1 %}
-      {% trans '1 record' %}
+      {{ '1 record' | trans }}
     {% else %}
       {% trans %}{{ ElementsCount }} records{% endtrans %}
     {% endif %}
diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig
index f7f653e60a..db967d3103 100644
--- a/templates/web/prod/WorkZone/Browser/Browser.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig
@@ -3,61 +3,61 @@
   <div class="PNB10 Browser">
     <div class="PNB10" style="width:190px;right:auto;">
       <form name="BasketBrowser" method="GET" action="{{ path('prod_workzone_search') }}">
-        <input name="Query" class="Query search" placeholder="{% trans 'Search baskets' %}" type="text"/>
+        <input name="Query" class="Query search" placeholder="{{ 'Search baskets' | trans }}" type="text"/>
 
-        <h1>{% trans 'See' %}</h1>
+        <h1>{{ 'See' | trans }}</h1>
         <ul class="unstyled">
           <li class="first">
             <input id="basket_browse_all" type="radio" name="Type" value="" checked="checked" />
             <label class="selected" for="basket_browse_all">
-              {% trans 'All' %}
+              {{ 'All' | trans }}
             </label>
           </li>
           <li>
             <input id="basket_browse_my_bask" type="radio" name="Type" value="{{ constant('Alchemy\\Phrasea\\Model\\Repositories\\BasketRepository::MYBASKETS') }}" />
             <label for="basket_browse_my_bask">
-              {% trans 'My baskets' %}
+              {{ 'My baskets' | trans }}
             </label>
           </li>
           <li>
             <input id="basket_browse_received" type="radio" name="Type" value="{{ constant('Alchemy\\Phrasea\\Model\\Repositories\\BasketRepository::RECEIVED') }}" />
             <label for="basket_browse_received">
-              {% trans 'Received baskets' %}
+              {{ 'Received baskets' | trans }}
             </label>
           </li>
           <li>
             <input id="basket_browse_valid_sent" type="radio" name="Type" value="{{ constant('Alchemy\\Phrasea\\Model\\Repositories\\BasketRepository::VALIDATION_SENT') }}" />
             <label for="basket_browse_valid_sent">
-              {% trans 'Validations sent' %}
+              {{ 'Validations sent' | trans }}
             </label>
           </li>
           <li>
             <input id="basket_browse_valid_done" type="radio" name="Type" value="{{ constant('Alchemy\\Phrasea\\Model\\Repositories\\BasketRepository::VALIDATION_DONE') }}" />
             <label for="basket_browse_valid_done">
-              {% trans 'Validations received' %}
+              {{ 'Validations received' | trans }}
             </label>
           </li>
         </ul>
-        <h1>{% trans 'When' %}</h1>
+        <h1>{{ 'When' | trans }}</h1>
         <ul class="unstyled">
           <li class="first">
             <input id="basket_browse_all_time" type="radio" name="Year" value="" checked="checked" />
             <label for="basket_browse_all_time">
-              {% trans 'Any time' %}
+              {{ 'Any time' | trans }}
             </label>
           </li>
           {% set CurrentYear = current_date.format('Y') %}
           <li>
             <input id="basket_browse_this_year" type="radio" name="Year" value="{{ CurrentYear }}" />
             <label for="basket_browse_this_year">
-              {% trans 'This year' %}
+              {{ 'This year' | trans }}
             </label>
           </li>
           {% set CurrentYear = CurrentYear - 1 %}
           <li>
             <input id="basket_browse_last_year" type="radio" name="Year" value="{{ CurrentYear }}" />
             <label for="basket_browse_last_year">
-              {% trans 'Past year' %}
+              {{ 'Past year' | trans }}
             </label>
           </li>
           {% set CurrentYear = CurrentYear - 1 %}
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index d2333cbff7..cd23c6bccb 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -5,9 +5,9 @@
     <tr>
       <td>
         {% if Total == 0 %}
-          {% trans 'No results' %}
+          {{ 'No results' | trans }}
         {% elseif Total == 1 %}
-          {% trans '1 result' %}
+          {{ '1 result' | trans }}
         {% else %}
           {% trans %}{{ Total }} results{% endtrans %}
         {% endif %}
@@ -112,9 +112,9 @@
       <tr>
         <td>
           {% if Total == 0 %}
-            {% trans 'No results' %}
+            {{ 'No results' | trans }}
           {% elseif Total == 1 %}
-            {% trans '1 result' %}
+            {{ '1 result' | trans }}
           {% else %}
             {% trans %}{{ Total }} results{% endtrans %}
           {% endif %}
diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index 4d05c6a863..ceb2a2063b 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -1,7 +1,7 @@
 {% macro make_bloc(app, WorkZone, selected_type, selected_id, srt) %}
   <div class="alert_datas_changed ui-corner-all">
-    <a title="{% trans 'rafraichir' %}" class="basket_refresher" href="#">
-      {% trans 'Vous avez recu un nouveau panier' %}
+    <a title="{{ 'rafraichir' | trans }}" class="basket_refresher" href="#">
+      {{ 'Vous avez recu un nouveau panier' | trans }}
     </a>
   </div>
   <div class="bloc">
@@ -27,7 +27,7 @@
                   <tr>
                       <td>
                           <img
-                              title="{% trans  'Vous avez recu une demande de validation de document sur ce panier' %}"
+                              title="{{ 'Vous avez recu une demande de validation de document sur ce panier' | trans }}"
                               class="basketTips"
                               src="/skins/icons/valid.png"
                             />
@@ -45,12 +45,12 @@
                     <div class="context-menu context-menu-theme-vista">
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner"
-                             onclick="downloadThis('ssel={{basket.getId()}}');">{% trans 'action::exporter' %}
+                             onclick="downloadThis('ssel={{basket.getId()}}');">{{ 'action::exporter' | trans }}
                         </div>
                       </div>
                       <div title="" class="context-menu-item menu3-custom-item">
                         <div onclick="editThis('SSTT','{{basket.getId()}}');" style=""
-                             class="context-menu-item-inner">{% trans 'action::editer' %}
+                             class="context-menu-item-inner">{{ 'action::editer' | trans }}
                         </div>
                       </div>
                       <div title="" class="context-menu-item">
@@ -63,7 +63,7 @@
                         <div title="" class="context-menu-item">
                           <a target="_blank" href="{{ path('lightbox_validation', { 'basket' : basket.getId() }) }}">
                             <div class="context-menu-item-inner">
-                              {% trans 'action::Valider' %}
+                              {{ 'action::Valider' | trans }}
                             </div>
                           </a>
                         </div>
@@ -104,7 +104,7 @@
                             <td>
                                 <img
                                     style="display:inline;padding:0;margin:0;"
-                                    title="{% trans 'Vous avez envoye une demande de validation de document sur ce panier' %}"
+                                    title="{{ 'Vous avez envoye une demande de validation de document sur ce panier' | trans }}"
                                     class="basketTips"
                                     src="/skins/icons/myvalid.png"
                                 />
@@ -135,7 +135,7 @@
                     <div class="context-menu context-menu-theme-vista">
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner"
-                             onclick="downloadThis('ssel={{basket.getId()}}');">{% trans 'action::exporter' %}
+                             onclick="downloadThis('ssel={{basket.getId()}}');">{{ 'action::exporter' | trans }}
                         </div>
                       </div>
                       <div title="" class="context-menu-item">
@@ -145,8 +145,8 @@
                       </div>
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner">
-                          <a class="dialog small-dialog" title="{% trans 'action::renommer' %}" href="{{ path('prod_baskets_basket_update', { 'basket' : basket.getId()}) }}">
-                            {% trans 'action::renommer' %}
+                          <a class="dialog small-dialog" title="{{ 'action::renommer' | trans }}" href="{{ path('prod_baskets_basket_update', { 'basket' : basket.getId()}) }}">
+                            {{ 'action::renommer' | trans }}
                           </a>
                         </div>
                       </div>
@@ -155,7 +155,7 @@
                         <div title="" class="context-menu-item">
                           <a target="_blank" href="{{ path('lightbox_validation', { 'basket' : basket.getId() }) }}">
                             <div class="context-menu-item-inner">
-                              {% trans 'action::Valider' %}
+                              {{ 'action::Valider' | trans }}
                             </div>
                           </a>
                         </div>
@@ -164,20 +164,20 @@
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner"
                              onclick="archiveBasket({{ basket.getId() }});return false;">
-                          {% trans 'Archive' %}
+                          {{ 'Archive' | trans }}
                         </div>
                       </div>
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner" id="SSTTREMOVER_{{basket.getId()}}"
                              onclick="checkDeleteThis('SSTT',this);return false;">
-                          {% trans 'action : supprimer' %}
+                          {{ 'action : supprimer' | trans }}
                         </div>
                       </div>
 
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner">
-                          <a class="dialog" title="{% trans 'Re-ordonner' %}" href="{{ path('prod_baskets_basket_reorder', { 'basket' : basket.getId() }) }}">
-                            {% trans 'Re-ordonner' %}
+                          <a class="dialog" title="{{ 'Re-ordonner' | trans }}" href="{{ path('prod_baskets_basket_reorder', { 'basket' : basket.getId() }) }}">
+                            {{ 'Re-ordonner' | trans }}
                           </a>
                         </div>
                       </div>
@@ -229,26 +229,26 @@
                     <div class="context-menu context-menu-theme-vista">
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner"
-                             onclick="downloadThis('lst={{story.getRecord(app).get_serialize_key()}}');">{% trans 'action::exporter' %}
+                             onclick="downloadThis('lst={{story.getRecord(app).get_serialize_key()}}');">{{ 'action::exporter' | trans }}
                         </div>
                       </div>
                       <div title="" class="context-menu-item menu3-custom-item">
                         <div onclick="editThis('IMGT','{{story.getRecord(app).get_serialize_key()}}');" style=""
-                             class="context-menu-item-inner">{% trans 'action::editer' %}
+                             class="context-menu-item-inner">{{ 'action::editer' | trans }}
                         </div>
                       </div>
 
                       <div title="" class="context-menu-item menu3-custom-item">
                         <div class="context-menu-item-inner">
                           <a class="story_unfix" href="{{ path('prod_workzone_detach_story', { 'sbas_id' : story.getRecord(app).get_sbas_id(), 'record_id' : story.getRecord(app).get_record_id()}) }}">
-                            {% trans 'action::detacher' %}
+                            {{ 'action::detacher' | trans }}
                           </a>
                         </div>
                       </div>
                       <div title="" class="context-menu-item menu3-custom-item">
                         <div class="context-menu-item-inner">
-                          <a class="dialog" title="{% trans 'Re-ordonner' %}" href="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.getRecord(app).get_sbas_id, 'record_id' : story.getRecord(app).get_record_id() }) }}">
-                            {% trans 'Re-ordonner' %}
+                          <a class="dialog" title="{{ 'Re-ordonner' | trans }}" href="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.getRecord(app).get_sbas_id, 'record_id' : story.getRecord(app).get_record_id() }) }}">
+                            {{ 'Re-ordonner' | trans }}
                           </a>
                         </div>
                       </div>
@@ -314,7 +314,7 @@
             {% elseif wz_scope == 'basket' %}
               href="#"
             {% endif %}
-            class="WorkZoneElementRemover {{ wz_scope }}" title="{% trans 'delete'%}" >
+            class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
             X
           </a>
           {% if app['authentication'].getUser().getPrefs('basket_caption_display') == '1' %}
@@ -336,9 +336,9 @@
   <div style="margin:5px 0;text-align:center;">
       <form>
           <select name="valid_ord">
-              <option {% if ordre=='nat'%}selected{% endif %} value="nat">{% trans 'panier:: ordre du panier' %}</option>
-              <option {% if ordre=='desc'%}selected{% endif %} value="desc">{% trans 'panier:: ordre Validation ascendante' %}</option>
-              <option {% if ordre=='asc'%}selected{% endif %} value="asc">{% trans 'panier:: ordre Validation descendante' %}</option>
+              <option {% if ordre=='nat' %}selected{% endif %} value="nat">{{ 'panier:: ordre du panier' | trans }}</option>
+              <option {% if ordre=='desc' %}selected{% endif %} value="desc">{{ 'panier:: ordre Validation ascendante' | trans }}</option>
+              <option {% if ordre=='asc' %}selected{% endif %} value="asc">{{ 'panier:: ordre Validation descendante' | trans }}</option>
           </select>
       </form>
   </div>
@@ -359,14 +359,14 @@
                                   <td>
                                   {% if choice.getParticipant().getCanAgree() %}
                                         {% if choice.getAgreement() == true %}
-                                            <img style="cursor:help;" src='/skins/lightbox/agree.png' title="{% trans "L'utilisateur approuve ce document" %}" />
+                                            <img style="cursor:help;" src='/skins/lightbox/agree.png' title="{{ "L'utilisateur approuve ce document" | trans }}" />
                                         {% elseif choice.getAgreement() is null %}
-                                            <img style="cursor:help;" src='/skins/icons/valid.png' title="{% trans "L'utilisateur n'a pas encore donne son avis sur ce document" %}" />
+                                            <img style="cursor:help;" src='/skins/icons/valid.png' title="{{ "L'utilisateur n'a pas encore donne son avis sur ce document" | trans }}" />
                                         {% else %}
-                                            <img style="cursor:help;" src='/skins/lightbox/disagree.png' title="{% trans "L'utilisateur desapprouve ce document" %}" />
+                                            <img style="cursor:help;" src='/skins/lightbox/disagree.png' title="{{ "L'utilisateur desapprouve ce document" | trans }}" />
                                         {% endif %}
                                   {% else %}
-                                        <img style="cursor:help;" src='/skins/icons/no-valid.png' title="{% trans "This user does not participate to the validation but is only viewer." %}" />
+                                        <img style="cursor:help;" src='/skins/icons/no-valid.png' title="{{ "This user does not participate to the validation but is only viewer." | trans }}" />
                                   {% endif %}
                                   </td>
                                   <td style="width:25px;">
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig
index be7fbd79d8..0bef2acccd 100644
--- a/templates/web/prod/WorkZone/Story.html.twig
+++ b/templates/web/prod/WorkZone/Story.html.twig
@@ -2,73 +2,73 @@
 {% set story_length = Story.get_children().get_elements()|length %}
     <div class="tools">
 
-      <button class="ui-corner-all TOOL_disktt_btn story_window" title="{% trans 'action : exporter' %}">
+      <button class="ui-corner-all TOOL_disktt_btn story_window" title="{{ 'action : exporter' | trans }}">
         <img src="/skins/prod/000000/images/disktt_history.gif"/>
       </button>
-      <button class="ui-corner-all TOOL_print_btn story_window" title="{% trans 'action : print' %}">
+      <button class="ui-corner-all TOOL_print_btn story_window" title="{{ 'action : print' | trans }}">
         <img src="/skins/prod/000000/images/print_history.gif"/>
       </button>
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %}
-      <button class="ui-corner-all TOOL_ppen_btn story_window" title="{% trans 'action : editer' %}">
+      <button class="ui-corner-all TOOL_ppen_btn story_window" title="{{ 'action : editer' | trans }}">
         <img src="/skins/prod/000000/images/ppen_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
-      <button class="ui-corner-all TOOL_chgstatus_btn story_window" title="{% trans 'action : status' %}">
+      <button class="ui-corner-all TOOL_chgstatus_btn story_window" title="{{ 'action : status' | trans }}">
         <img src="/skins/prod/000000/images/chgstatus_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
-      <button class="ui-corner-all TOOL_chgcoll_btn story_window" title="{% trans 'action : collection' %}">
+      <button class="ui-corner-all TOOL_chgcoll_btn story_window" title="{{ 'action : collection' | trans }}">
         <img src="/skins/prod/000000/images/chgcoll_history.gif"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('push') %}
-      <button class="ui-corner-all TOOL_pushdoc_btn story_window" title="{% trans 'action : push' %}">
+      <button class="ui-corner-all TOOL_pushdoc_btn story_window" title="{{ 'action : push' | trans }}">
         <img src="/skins/icons/push16.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('push') %}
-      <button class="ui-corner-all TOOL_feedback_btn story_window" title="{% trans 'Feedback' %}">
+      <button class="ui-corner-all TOOL_feedback_btn story_window" title="{{ 'Feedback' | trans }}">
         <img src="/skins/icons/feedback16.png"/>
       </button>
       {% endif %}
       {% if app['acl'].get(app['authentication'].getUser()).has_right('bas_chupub') %}
-      <button class="ui-corner-all TOOL_bridge_btn story_window" title="{% trans 'action : bridge' %}">
+      <button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}">
         <img src="/skins/icons/door.png"/>
       </button>
-      <button class="ui-corner-all TOOL_publish_btn story_window" title="{% trans 'action : publier' %}">
+      <button class="ui-corner-all TOOL_publish_btn story_window" title="{{ 'action : publier' | trans }}">
         <img src="/skins/icons/rss16.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('doctools') %}
-      <button class="ui-corner-all TOOL_imgtools_btn story_window" title="{% trans 'action : outils' %}">
+      <button class="ui-corner-all TOOL_imgtools_btn story_window" title="{{ 'action : outils' | trans }}">
         <img src="/skins/prod/000000/images/imgtools_history.gif"/>
       </button>
       {% endif %}
-      <button class="ui-corner-all TOOL_trash_btn story_window" title="{% trans 'action : supprimer' %}">
+      <button class="ui-corner-all TOOL_trash_btn story_window" title="{{ 'action : supprimer' | trans }}">
         <img src="/skins/icons/delete.png"/>
         <input type="hidden" name="story_key" value="{{ Story.get_serialize_key() }}"/>
       </button>
 
     </div>
     <div class="alert_datas_changed ui-corner-all">
-      {% trans 'Certaines donnees du reportage ont change' %}
+      {{ 'Certaines donnees du reportage ont change' | trans }}
       <a class="basket_refresher" href="#">
-        {% trans 'rafraichir' %}
+        {{ 'rafraichir' | trans }}
       </a>
     </div>
     {% if story_length == 0 %}
       <div style="height:120px;"></div>
     {% endif %}
 
-    {% set basket_scope = 'groupings'%}
+    {% set basket_scope = 'groupings' %}
     {% import 'prod/WorkZone/Macros.html.twig' as Macros %}
 
     {% for record in Story.get_children().get_elements() %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig
index 4abf04be54..9d74455a5c 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig
@@ -1,7 +1,7 @@
 <td>
     <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'createcontainer', 'element_type' : action_type }) }}">
         <a class="form_multiple_submitter single_menu btn btn-inverse">
-              {% trans 'Creer' %}
+              {{ 'Creer' | trans }}
         </a>
     </form>
 </td>
@@ -9,7 +9,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -18,7 +18,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig
index e787a3c921..2c98925fb5 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig
@@ -1 +1 @@
-<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{% trans 'boutton::modifier' %}</a>
+<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{{ 'boutton::modifier' | trans }}</a>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig
index 019e1a6199..0fe6696435 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig
@@ -2,7 +2,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Ajouter a' %}
+                {{ 'Ajouter a' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -11,7 +11,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Dailymotion::CONTAINER_TYPE_PLAYLIST') }}" />
                         <a class="form_multiple_submitter">
-                            {% trans 'Playlist' %}
+                            {{ 'Playlist' | trans }}
                         </a>
                     </form>
                 </li>
@@ -23,7 +23,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -32,7 +32,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
index a5a876470c..7f5ffeacb5 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% block menu %}
   {% trans %}
@@ -12,7 +12,7 @@
   <table>
     <tr>
       <td class='column_left'>
-        <label for='name'> *{% trans 'Name' %}
+        <label for='name'> *{{ 'Name' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -23,8 +23,8 @@
     </tr>
       <td></td>
       <td class='column_right'>
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
       </td>
     </tr>
   </table>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
index f4d3b6af44..256c73d63a 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
index 99ecda9802..81c3960051 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
@@ -12,12 +12,12 @@
 {% set elements_received_length = route.get_count_element_received() %}
 
 {% if elements_received_length == 0 %}
-  {% trans 'Vous n\'avez selectionne aucun element' %}
+  {{ 'Vous n\'avez selectionne aucun element' | trans }}
 {% elseif elements_length == 0 %}
-  {% trans 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' %}
-  {% trans 'Le bridge Dailymotion ne prend en charge que les videos' %}
+  {{ 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' | trans }}
+  {{ 'Le bridge Dailymotion ne prend en charge que les videos' | trans }}
 {% elseif elements_length > 1 %}
-  {% trans 'Vous ne pouvez uploader des elements sur Dailymotion qu\'un par un' %}
+  {{ 'Vous ne pouvez uploader des elements sur Dailymotion qu\'un par un' | trans }}
 {% else %}
   {% for record in route.get_elements() %}
     {% set caption = record.get_caption() %}
@@ -28,9 +28,9 @@
         <tr>
           <td>
             {% set name = "title_" ~ record.get_serialize_key() %}
-            <label for='{{name}}'>{% trans 'Titre' %}</label>
+            <label for='{{name}}'>{{ 'Titre' | trans }}</label>
             <div style="font-size:9px; font-weight:200">
-              {% trans "255 caracteres maximum" %}
+              {{ "255 caracteres maximum" | trans }}
             </div>
           </td>
           <td>
@@ -42,9 +42,9 @@
         <tr>
           <td>
             {% set name = "description_" ~ record.get_serialize_key() %}
-            <label for='{{name}}'>{% trans 'Description' %}</label>
+            <label for='{{name}}'>{{ 'Description' | trans }}</label>
             <div style="font-size:9px; font-weight:200">
-              {% trans "1000 caracteres maximum" %}
+              {{ "1000 caracteres maximum" | trans }}
             </div>
           </td>
           <td class='column_right'>
@@ -56,13 +56,13 @@
         <tr>
           <td>
             {% set name = "tags_" ~ record.get_serialize_key() %}
-            <label for='{{name}}'>{% trans 'Tags' %}</label>
+            <label for='{{name}}'>{{ 'Tags' | trans }}</label>
             <br/>
             <div style="font-size:9px; font-weight:200">
-               - {% trans "250 caracteres maximum" %}<br />
-               - {% trans "10 tags maximum"%}<br />
-               - {% trans "Séparez les tags par un espace: Paris vacances restaurant"%}<br />
-               - {% trans 'Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson"' %}
+               - {{ "250 caracteres maximum" | trans }}<br />
+               - {{ "10 tags maximum" | trans }}<br />
+               - {{ "Séparez les tags par un espace: Paris vacances restaurant" | trans }}<br />
+               - {{ 'Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson"' | trans }}
             </div>
           </td>
           <td>
@@ -74,21 +74,21 @@
         <tr>
           <td>
             {% set name = "privacy_" ~ record.get_serialize_key() %}
-            <label for='{{name}}'>{% trans 'Confidentialite' %}</label>
+            <label for='{{name}}'>{{ 'Confidentialite' | trans }}</label>
           </td>
           <td>
             <div style='float:left'>
-          <label for="input_private">{% trans 'prive' %}</label>
+          <label for="input_private">{{ 'prive' | trans }}</label>
           <input id="input_private" type="radio" name="{{name}}" value="private" checked='checked' />
           </div>
           <div style='float:left'>
-          <label for="input_public">{% trans 'public' %}</label>
+          <label for="input_public">{{ 'public' | trans }}</label>
           <input id="input_public" type="radio" name="{{name}}"  value="public "/>
           </div>
           </td>
         </tr>
       </table>
-      <button class="form_submitter">{% trans 'Upload' %}</button>
+      <button class="form_submitter">{{ 'Upload' | trans }}</button>
     </form>
   {% endfor %}
   <p>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
index 92e259e90b..8c89a753c7 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
index 0b6fd4948f..9dfac7c4a2 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
@@ -10,7 +10,7 @@
             {% trans %}Edition de 1 element{% endtrans %} :
         </td>
         <td style="text-align:right;">
-            <a class="back_link" style="cursor: pointer;">{% trans 'boutton::annuler' %}</a>
+            <a class="back_link" style="cursor: pointer;">{{ 'boutton::annuler' | trans }}</a>
         </td>
         <td style="width:10px;">
         </td>
@@ -21,21 +21,21 @@
 {% block response %}
 <form class="form_add_container bridge_form" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}" method="post">
     <div class="control-group">
-        <label class="control-label" for="modif_title">{% trans 'Titre' %}</label>
+        <label class="control-label" for="modif_title">{{ 'Titre' | trans }}</label>
         <div class="controls">
             <input name="modif_title" type="text" value="{{element.get_title}}" />
             {{ error_form.display_errors('title', constraint_errors) }}
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_description">{% trans 'Description' %}</label>
+        <label class="control-label" for="modif_description">{{ 'Description' | trans }}</label>
         <div class="controls">
             <textarea name="modif_description" rows="3" >{{element.get_description}}</textarea>
             {{ error_form.display_errors('description', constraint_errors) }}
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_category">{% trans 'Categorie' %}</label>
+        <label class="control-label" for="modif_category">{{ 'Categorie' | trans }}</label>
         <div class="controls">
             {% set categories = account.get_api().get_connector.get_category_list() %}
             <select name="modif_category">
@@ -46,29 +46,29 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_tags">{% trans 'Tags' %}</label>
+        <label class="control-label" for="modif_tags">{{ 'Tags' | trans }}</label>
         <div class="controls">
             <input name="modif_tags" type="text" value="{{element.get_tags()}}" />
             {{ error_form.display_errors('tags', constraint_errors) }}
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">{% trans 'Confidentialite' %}</label>
+        <label class="control-label">{{ 'Confidentialite' | trans }}</label>
         <div class="controls">
             <label class="radio inline bridge_fleft">
                 <input type="radio" name="modif_privacy" value="1" {{element.is_private ? "checked='checked'" : ""}} />
-                {% trans 'privé' %}
+                {{ 'privé' | trans }}
             </label>
             <label class="radio inline bridge_fleft">
                 <input type="radio" name="modif_privacy"  value="0" {{element.is_private ? "" : "checked='checked'"}}/>
-                {% trans 'public' %}
+                {{ 'public' | trans }}
             </label>
         </div>
     </div>
     <div class="form-actions">
         <input type="hidden" name="elements_list[]" value="{{element.get_id}}" />
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
     </div>
 </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
index 20fc6c1aef..350249fe5d 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -28,7 +28,7 @@
       {% endfor %}
       </ul>
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig b/templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig
index 4abf04be54..9d74455a5c 100644
--- a/templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig
@@ -1,7 +1,7 @@
 <td>
     <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'createcontainer', 'element_type' : action_type }) }}">
         <a class="form_multiple_submitter single_menu btn btn-inverse">
-              {% trans 'Creer' %}
+              {{ 'Creer' | trans }}
         </a>
     </form>
 </td>
@@ -9,7 +9,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -18,7 +18,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig b/templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig
index e787a3c921..2c98925fb5 100644
--- a/templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig
@@ -1 +1 @@
-<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{% trans 'boutton::modifier' %}</a>
+<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{{ 'boutton::modifier' | trans }}</a>
diff --git a/templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig b/templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig
index 998709bb9d..f852863e18 100644
--- a/templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig
@@ -2,7 +2,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Ajouter a' %}
+                {{ 'Ajouter a' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -11,7 +11,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Flickr::CONTAINER_TYPE_PHOTOSET') }}" />
                         <a class="form_multiple_submitter">
-                            {% trans 'Photosets' %}
+                            {{ 'Photosets' | trans }}
                         </a>
                     </form>
                 </li>
@@ -23,7 +23,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -32,7 +32,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
index 603c2c74cc..855bd5eb5b 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig b/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
index 706fbaba04..46217f5bd2 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
@@ -10,7 +10,7 @@
             {% trans %}Edition de 1 element{% endtrans %} :
         </td>
         <td style="text-align:right;">
-            <a class="back_link" style="cursor: pointer;">{% trans 'boutton::annuler' %}</a>
+            <a class="back_link" style="cursor: pointer;">{{ 'boutton::annuler' | trans }}</a>
         </td>
         <td style="width:10px;">
         </td>
@@ -21,14 +21,14 @@
 {% block response %}
 <form class="form_add_container bridge_form form-horizontal" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}" method="post">
     <div class="control-group">
-        <label class="control-label" for="modif_title">{% trans 'Titre' %}</label>
+        <label class="control-label" for="modif_title">{{ 'Titre' | trans }}</label>
         <div class="controls">
             <input name="modif_title" type="text" value="{{element.get_title}}" />
             {{ error_form.display_errors('title', constraint_errors) }}
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_description">{% trans 'Description' %}</label>
+        <label class="control-label" for="modif_description">{{ 'Description' | trans }}</label>
         <div class="controls">
             <textarea name="modif_description" rows="3" >{{element.get_description|default("")}}</textarea>
             {{ error_form.display_errors('description', constraint_errors) }}
@@ -36,8 +36,8 @@
     </div>
     <div class="form-actions">
         <input type="hidden" name="elements_list[]" value="{{element.get_id}}" />
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
     </div>
 </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig b/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
index 736aa46771..f68f7ccc3f 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -28,7 +28,7 @@
       {% endfor %}
       </ul>
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig b/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
index a043f77179..77f0026d53 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% block menu %}
   {% trans %}
@@ -12,7 +12,7 @@
   <table>
     <tr>
       <td class='column_left'>
-        <label for='title'> *{% trans 'Titre' %}
+        <label for='title'> *{{ 'Titre' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -23,7 +23,7 @@
     </tr>
     <tr>
       <td class='column_left'>
-        <label for='description'> {% trans 'Description' %}
+        <label for='description'> {{ 'Description' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -36,7 +36,7 @@
     {% set result = account.get_api().list_elements('photo',0,0)%}
     <tr>
       <td class='column_left'>
-        <label for='f_container_primary_photo'> *{% trans 'Photo principale' %}
+        <label for='f_container_primary_photo'> *{{ 'Photo principale' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -52,8 +52,8 @@
     <tr>
       <td></td>
       <td class='column_right'>
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
       </td>
     </tr>
   </table>
diff --git a/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
index b8ee1df203..8fe832000e 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/upload.html.twig b/templates/web/prod/actions/Bridge/Flickr/upload.html.twig
index 6eb92563be..d8ca09475c 100644
--- a/templates/web/prod/actions/Bridge/Flickr/upload.html.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/upload.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "common/thumbnail.html.twig" as thumb %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
@@ -13,10 +13,10 @@
 {% set elements_received_length = route.get_count_element_received() %}
 
 {% if elements_received_length == 0 %}
-  {% trans 'Vous n\'avez selectionne aucun element' %}
+  {{ 'Vous n\'avez selectionne aucun element' | trans }}
 {% elseif elements_length == 0 %}
-  {% trans 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' %}
-  {% trans 'Le bridge FlickR ne prend en charge que les photos' %}
+  {{ 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' | trans }}
+  {{ 'Le bridge FlickR ne prend en charge que les photos' | trans }}
 {% else %}
   {% if elements_length != elements_received_length %}
     {% set n_elements = elements_received_length - elements_length %}
@@ -42,7 +42,7 @@
               </td>
               <td style="width:100px;">
                 {% set name = "title_" ~ record.get_serialize_key() %}
-                <label for='{{name}}'>{% trans 'Titre' %}</label>
+                <label for='{{name}}'>{{ 'Titre' | trans }}</label>
               </td>
               <td style="width:180px;">
                 <input class="required_field" style="width:150px;" type='text' name='{{name}}' value="{{ caption.get_dc_field('Title') is not none ? caption.get_dc_field('Title').get_serialized_values()|default(record.get_title()) : record.get_title()  }}"/>
@@ -55,7 +55,7 @@
             <tr>
               <td>
                 {% set name = "description_" ~ record.get_serialize_key() %}
-                <label for='{{ name }}'>{% trans 'Description' %}
+                <label for='{{ name }}'>{{ 'Description' | trans }}
                   <br>
                   <span class='form_error'>&nbsp;</span>
                 </label>
@@ -71,7 +71,7 @@
             <tr>
               <td>
                 {% set name = "tags_" ~ record.get_serialize_key() %}
-                <label for='{{ name }}'>{% trans 'Tags' %}</label>
+                <label for='{{ name }}'>{{ 'Tags' | trans }}</label>
               </td>
               <td>
                 <input class='required_field' type='text' style="width:150px;" name='{{ name }}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_serialized_values(' ') : '' }}"/>
@@ -79,14 +79,14 @@
                   {{ error_form.display_errors(name, constraint_errors) }}
               </td>
               <td>
-                {% trans "2000 caracteres maximum, separe par des espaces" %}
+                {{ "2000 caracteres maximum, separe par des espaces" | trans }}
               </td>
             </tr>
           </table>
         </div>
       </div>
     {% endfor %}
-    <button class="form_submitter">{% trans 'Upload' %}</button>
+    <button class="form_submitter">{{ 'Upload' | trans }}</button>
   </form>
   <script type="text/javascript">
     $(document).ready(function(){
diff --git a/templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig b/templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig
index 4abf04be54..9d74455a5c 100644
--- a/templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig
@@ -1,7 +1,7 @@
 <td>
     <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'createcontainer', 'element_type' : action_type }) }}">
         <a class="form_multiple_submitter single_menu btn btn-inverse">
-              {% trans 'Creer' %}
+              {{ 'Creer' | trans }}
         </a>
     </form>
 </td>
@@ -9,7 +9,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -18,7 +18,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig b/templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig
index e787a3c921..2c98925fb5 100644
--- a/templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig
@@ -1 +1 @@
-<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{% trans 'boutton::modifier' %}</a>
+<a class="action_type_modify bridge_action" href="{{ path('bridge_account_action', { 'account_id' : account.get_id(), 'action' : 'modify', 'element_type' : element.get_type(), 'elements_list' : [ element.get_id ] }) }}">{{ 'boutton::modifier' | trans }}</a>
diff --git a/templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig b/templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig
index 3ea4400d10..e5fb277759 100644
--- a/templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig
@@ -2,7 +2,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Ajouter a' %}
+                {{ 'Ajouter a' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -11,7 +11,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Youtube::CONTAINER_TYPE_PLAYLIST') }}" />
                         <a class="form_multiple_submitter">
-                            {% trans 'Playlist' %}
+                            {{ 'Playlist' | trans }}
                         </a>
                     </form>
                 </li>
@@ -23,7 +23,7 @@
     <div class="multi_menu">
         <div class="btn-group">
             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                {% trans 'Actions' %}
+                {{ 'Actions' | trans }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
@@ -32,7 +32,7 @@
                         <input type="hidden" name="elements_list" value="" />
                         <input type="hidden" name="destination" value="" />
                         <a class="form_multiple_submitter">
-                            {% trans 'boutton::supprimer' %}
+                            {{ 'boutton::supprimer' | trans }}
                         </a>
                     </form>
                 </li>
diff --git a/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig b/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
index 8f14261db1..18a4396742 100644
--- a/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% block menu %}
   {% trans %}
@@ -12,7 +12,7 @@
   <table>
     <tr>
       <td class='column_left'>
-        <label for='f_container_title'> *{% trans 'Titre' %}
+        <label for='f_container_title'> *{{ 'Titre' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -23,7 +23,7 @@
     </tr>
     <tr>
       <td class='column_left'>
-        <label for='f_container_description'> {% trans 'Description' %}
+        <label for='f_container_description'> {{ 'Description' | trans }}
           <br/>
           <span class='form_error'>&nbsp;</span>
         </label>
@@ -35,8 +35,8 @@
     <tr>
       <td></td>
       <td class='column_right'>
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
       </td>
     </tr>
   </table>
diff --git a/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
index f4d3b6af44..256c73d63a 100644
--- a/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/upload.html.twig b/templates/web/prod/actions/Bridge/Youtube/upload.html.twig
index c9ed82a219..70078cd2e9 100644
--- a/templates/web/prod/actions/Bridge/Youtube/upload.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/upload.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
@@ -12,12 +12,12 @@
 {% set elements_received_length = route.get_count_element_received() %}
 
 {% if elements_received_length == 0 %}
-  {% trans 'Vous n\'avez selectionne aucun element' %}
+  {{ 'Vous n\'avez selectionne aucun element' | trans }}
 {% elseif elements_length == 0 %}
-  {% trans 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' %}
-  {% trans 'Le bridge Youtube ne prend en charge que les videos' %}
+  {{ 'Les elements ne peuvent etre uploades (problemes de type ou de droit)' | trans }}
+  {{ 'Le bridge Youtube ne prend en charge que les videos' | trans }}
 {% elseif elements_length > 1 %}
-  {% trans 'Vous ne pouvez uploader des elements sur Youtube qu\'un par un' %}
+  {{ 'Vous ne pouvez uploader des elements sur Youtube qu\'un par un' | trans }}
 {% else %}
   {% for record in route.get_elements() %}
     {% set caption = record.get_caption() %}
@@ -28,9 +28,9 @@
         <tr>
           <td>
             {% set name = "title_" ~ record.get_serialize_key() %}
-              <label for='{{name}}'>{% trans 'Titre' %}</label>
+              <label for='{{name}}'>{{ 'Titre' | trans }}</label>
               <div style="font-size:9px; font-weight:200">
-                {% trans "100 caracteres maximum" %}
+                {{ "100 caracteres maximum" | trans }}
               </div>
           </td>
           <td>
@@ -43,9 +43,9 @@
         <tr>
           <td>
             {% set name = "description_" ~ record.get_serialize_key() %}
-            <label for='{{ name }}'>{% trans 'Description' %}</label>
+            <label for='{{ name }}'>{{ 'Description' | trans }}</label>
             <div style="font-size:9px; font-weight:200">
-              {% trans "2000 caracteres maximum" %}
+              {{ "2000 caracteres maximum" | trans }}
             </div>
           </td>
           <td class='column_right'>
@@ -57,7 +57,7 @@
         <tr>
           <td>
             {% set name = "category_" ~ record.get_serialize_key() %}
-            <label for='{{ name }}'>{% trans 'Categorie' %}</label>
+            <label for='{{ name }}'>{{ 'Categorie' | trans }}</label>
           </td>
           <td class='column_right'>
               <select name='{{ name }}'>
@@ -70,11 +70,11 @@
         <tr>
           <td>
             {% set name = "tags_" ~ record.get_serialize_key() %}
-            <label for='{{ name }}'>{% trans 'Tags' %}</label>
+            <label for='{{ name }}'>{{ 'Tags' | trans }}</label>
             <br/>
             <div style="font-size:9px; font-weight:200">
-              {% trans "500 caracteres maximum" %} <br/>
-              {% trans "separe par un espace" %}
+              {{ "500 caracteres maximum" | trans }} <br/>
+              {{ "separe par un espace" | trans }}
             </div>
           </td>
           <td>
@@ -86,21 +86,21 @@
         <tr>
           <td>
             {% set name = "privacy_" ~ record.get_serialize_key() %}
-            <label for='{{ name }}'>{% trans 'Confidentialite' %}</label>
+            <label for='{{ name }}'>{{ 'Confidentialite' | trans }}</label>
           </td>
           <td>
             <div style='float:left'>
-          <label for="input_private">{% trans 'prive' %}</label>
+          <label for="input_private">{{ 'prive' | trans }}</label>
           <input id="input_private" type="radio" name="{{ name }}" value="private" checked='checked' />
           </div>
           <div style='float:left'>
-          <label for="input_public">{% trans 'public' %}</label>
+          <label for="input_public">{{ 'public' | trans }}</label>
           <input id="input_public" type="radio" name="{{ name }}"  value="public "/>
           </div>
           </td>
         </tr>
       </table>
-      <button class="form_submitter">{% trans 'Upload' %}</button>
+      <button class="form_submitter">{{ 'Upload' | trans }}</button>
     </form>
   {% endfor %}
   <p>
@@ -123,6 +123,6 @@
   </script>
 {% endif %}
 <p>
-  <button class="back_link btn btn-inverse">&lt; {% trans 'Retour' %}</button>
+  <button class="back_link btn btn-inverse">&lt; {{ 'Retour' | trans }}</button>
 </p>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
index 92e259e90b..8c89a753c7 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -20,7 +20,7 @@
         <input type="hidden" name="elements_list[]" value="{{id}}"/>
       {% endfor %}
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig b/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
index da58ddb415..0a93e59d68 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
@@ -10,7 +10,7 @@
             {% trans %}Edition de 1 element{% endtrans %} :
         </td>
         <td style="text-align:right;">
-            <a class="back_link" style="cursor: pointer;">{% trans 'boutton::annuler' %}</a>
+            <a class="back_link" style="cursor: pointer;">{{ 'boutton::annuler' | trans }}</a>
         </td>
         <td style="width:10px;">
         </td>
@@ -21,28 +21,28 @@
 {% block response %}
 <form class="form_add_container bridge_form form-horizontal" action="{{ path('bridge_account_do_action', { 'account_id' : account.get_id(), 'action' : action, 'element_type' : element_type }) }}" method="post">
     <div class="control-group">
-        <label class="control-label" for="modif_title">{% trans 'Titre' %}</label>
+        <label class="control-label" for="modif_title">{{ 'Titre' | trans }}</label>
         <div class="controls">
             <input name="modif_title" type="text" value="{{ element.get_title }}" />
             <p>{{ error_form.display_errors('title', constraint_errors) }}</p>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_description">{% trans 'Description' %}</label>
+        <label class="control-label" for="modif_description">{{ 'Description' | trans }}</label>
         <div class="controls">
             <textarea name="modif_description" rows="3" >{{ element.get_description|default("") }}</textarea>
             <p>{{ error_form.display_errors('description', constraint_errors) }}</p>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_tags">{% trans 'Tags' %}</label>
+        <label class="control-label" for="modif_tags">{{ 'Tags' | trans }}</label>
         <div class="controls">
             <textarea name="modif_tags" rows="3" >{{ element.get_tags()|default("") }}</textarea>
             <p>{{ error_form.display_errors('tags', constraint_errors) }}</p>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="modif_category">{% trans 'Categorie' %}</label>
+        <label class="control-label" for="modif_category">{{ 'Categorie' | trans }}</label>
         <div class="controls">
             {% set categorie = account.get_api().get_connector.get_category_list() %}
             <select name="modif_category">
@@ -53,22 +53,22 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">{% trans 'Confidentialite' %}</label>
+        <label class="control-label">{{ 'Confidentialite' | trans }}</label>
         <div class="controls">
             <label class="radio inline bridge_fleft">
                 <input  type="radio" name="modif_privacy" value="private" {{ element.is_private ? "checked='checked'" : "" }} />
-                {% trans 'privé' %}
+                {{ 'privé' | trans }}
             </label>
             <label class="radio inline bridge_fleft">
                 <input type="radio" name="modif_privacy"  value="public" {{ element.is_private ? "" : "checked='checked'" }} />
-                {% trans 'public' %}
+                {{ 'public' | trans }}
             </label>
         </div>
     </div>
     <div class="form-actions">
         <input type="hidden" name="elements_list[]" value="{{ element.get_id }}" />
-        <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-        <button class="back_link btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+        <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+        <button class="back_link btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
     </div>
 </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
index 20fc6c1aef..350249fe5d 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -28,7 +28,7 @@
       {% endfor %}
       </ul>
       <input type="hidden" name="destination" value="{{ destination }}" />
-      <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
-      <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
+      <button class="form_submitter btn btn-inverse">{{ 'boutton::valider' | trans }}</button>
+      <button class="back_link btn btn-inverse">{{ 'boutton::retour' | trans }}</button>
     </form>
 {% endblock %}
diff --git a/templates/web/prod/actions/Bridge/callback.html.twig b/templates/web/prod/actions/Bridge/callback.html.twig
index 186522a2b5..9e9ba966ac 100644
--- a/templates/web/prod/actions/Bridge/callback.html.twig
+++ b/templates/web/prod/actions/Bridge/callback.html.twig
@@ -15,17 +15,17 @@
   <body>
     {% if error_message %}
       <div>
-        {% trans 'Erreur lors de votre authentification' %}
+        {{ 'Erreur lors de votre authentification' | trans }}
       </div>
       <div  class = 'error_auth'>
       {{ error_message }}
       </div>
     {% else %}
       <div>
-      {% trans 'Vous etes authentifie avec succes' %}
+      {{ 'Vous etes authentifie avec succes' | trans }}
       </div>
       <div>
-      {% trans 'Si cette fenetre ne se ferme pas automatiquement, fermez la, et raffraichissez votre compte' %}
+      {{ 'Si cette fenetre ne se ferme pas automatiquement, fermez la, et raffraichissez votre compte' | trans }}
       </div>
     {% endif %}
   </body>
diff --git a/templates/web/prod/actions/Bridge/disconnected.html.twig b/templates/web/prod/actions/Bridge/disconnected.html.twig
index 6baf3fc0aa..c11679bd67 100644
--- a/templates/web/prod/actions/Bridge/disconnected.html.twig
+++ b/templates/web/prod/actions/Bridge/disconnected.html.twig
@@ -1,7 +1,7 @@
 <div class="PNB10 container-bridge">
     <div class="PNB">
         <p style="text-align:center;margin:40px 20px 20px;">
-            {% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %}
+            {{ 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' | trans }}
         </p>
         <table style="width:300px;margin:10px auto;">
             <tbody>
@@ -9,7 +9,7 @@
                     <td>
                         <form>
                             <button class="login_button new_bridge_button btn btn-inverse">
-                                {% trans 'login:: connexion' %}
+                                {{ 'login:: connexion' | trans }}
                             </button>
                             <input type="hidden" name="url" value="{{account.get_api().generate_login_url(app['url_generator'], account.get_api().get_connector().get_name()) }}" />
                         </form>
@@ -19,11 +19,11 @@
                             {% for key, value in r_parameters %}
                                 <input type="hidden" name="{{key}}" value="{{value}}" />
                             {% endfor %}
-                            <button class="form_submitter single_menu btn btn-inverse" >{% trans 'boutton::refresh' %}</button>
+                            <button class="form_submitter single_menu btn btn-inverse" >{{ 'boutton::refresh' | trans }}</button>
                         </form>
                     </td>
                     <td>
-                        <button type="button" class="delete-account btn btn-danger" value="{{ account.get_id() }}">{% trans 'boutton::supprimer' %}</button>
+                        <button type="button" class="delete-account btn btn-danger" value="{{ account.get_id() }}">{{ 'boutton::supprimer' | trans }}</button>
                     </td>
                 </tr>
             </tbody>
diff --git a/templates/web/prod/actions/Bridge/element_list.html.twig b/templates/web/prod/actions/Bridge/element_list.html.twig
index 2f9d5d2e8f..91b0904bdb 100644
--- a/templates/web/prod/actions/Bridge/element_list.html.twig
+++ b/templates/web/prod/actions/Bridge/element_list.html.twig
@@ -56,7 +56,7 @@
                   {% endif %}
                 </div>
               {% else %}
-                <span>{% trans 'Imagette indisponible' %}</span>
+                <span>{{ 'Imagette indisponible' | trans }}</span>
               {% endif %}
             </td>
             <td class="informations">
@@ -77,7 +77,7 @@
                 {% if element.get_description is not empty %}
                   {{element.get_description}}
                 {% else %}
-                  {% trans 'Aucune description.' %}
+                  {{ 'Aucune description.' | trans }}
                 {% endif %}
                 </p>
               </div>
@@ -95,9 +95,9 @@
               {% if not element.is_private is none %}
               <div>
                 {% if element.is_private %}
-                  {% trans 'Confidentialite : privee' %}
+                  {{ 'Confidentialite : privee' | trans }}
                 {% else %}
-                  {% trans 'Confidentialite : publique' %}
+                  {{ 'Confidentialite : publique' | trans }}
                 {% endif %}
               </div>
               {% endif %}
diff --git a/templates/web/prod/actions/Bridge/error.html.twig b/templates/web/prod/actions/Bridge/error.html.twig
index 6dc03341ee..9e5ece9768 100644
--- a/templates/web/prod/actions/Bridge/error.html.twig
+++ b/templates/web/prod/actions/Bridge/error.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 
 {% set n_element = elements|length %}
 
@@ -7,14 +7,14 @@
 
 {% block response %}
   <div style="text-align:center;margin:10px 0;">
-    {% trans 'Oups ! something went wrong !' %}
+    {{ 'Oups ! something went wrong !' | trans }}
   </div>
   <div style="text-align:center;margin:10px 0;">
     <form method="{{r_method}}" action="{{r_action}}">
       {% for key, value in r_parameters %}
         <input type="hidden" name="{{key}}" value="{{value}}" />
       {% endfor %}
-      <button class="form_submitter" >{% trans 'boutton::retry' %}</button>
+      <button class="form_submitter" >{{ 'boutton::retry' | trans }}</button>
     </form>
   </div>
 
diff --git a/templates/web/prod/actions/Bridge/index.html.twig b/templates/web/prod/actions/Bridge/index.html.twig
index 0bd92b6ea5..9463407bb8 100644
--- a/templates/web/prod/actions/Bridge/index.html.twig
+++ b/templates/web/prod/actions/Bridge/index.html.twig
@@ -13,7 +13,7 @@
         </div>
         <form name="upload_form" method="GET" action="{{ path('prod_bridge_upload') }}">
             <div class="PNB10 record_actions" style="top:auto; height:30px; text-align:right;">
-                <button class="single_menu act_upload btn btn-inverse">{% trans 'Upload' %}</button>
+                <button class="single_menu act_upload btn btn-inverse">{{ 'Upload' | trans }}</button>
             </div>
             <input name="lst" type="hidden" value=""/>
             <input name="account_id" type="hidden" value=""/>
@@ -38,14 +38,14 @@
                     </li>
                 {% endfor %}
                 <li>
-                    <a href="#tabs-new-account"> + {% trans 'nouveau' %}</a>
+                    <a href="#tabs-new-account"> + {{ 'nouveau' | trans }}</a>
                 </li>
             </ul>
             <div id='tabs-new-account' class="PNB" >
                 <div class="PNB">
                     <div class="PNB10 container">
                         <div class="PNB10">
-                            <div>{% trans 'Vers quel API voulez vous vous connecter ?' %}</div>
+                            <div>{{ 'Vers quel API voulez vous vous connecter ?' | trans }}</div>
                             {% if available_apis|length > 0 %}
                                 {% for api in available_apis %}
                                     {% if api.get_connector().is_configured() %}
@@ -69,7 +69,7 @@
                                     {% endif %}
                                 {% endfor %}
                             {% else %}
-                                {% trans 'Aucun bridge disponible. Veuillez contacter un administrateur.' %}
+                                {{ 'Aucun bridge disponible. Veuillez contacter un administrateur.' | trans }}
                             {% endif %}
                         </div>
                     </div>
diff --git a/templates/web/prod/actions/Bridge/notconfigured.html.twig b/templates/web/prod/actions/Bridge/notconfigured.html.twig
index f7439e2afc..7ef96dcd42 100644
--- a/templates/web/prod/actions/Bridge/notconfigured.html.twig
+++ b/templates/web/prod/actions/Bridge/notconfigured.html.twig
@@ -2,7 +2,7 @@
 <div class="PNB10 container-bridge">
   <div class="PNB">
     <p style="text-align:center;margin:40px 20px 20px;">
-       {% trans 'Le connecteur API requis n\'est pas configure correctement, veuillez contacter un administrateur' %}
+       {{ 'Le connecteur API requis n\'est pas configure correctement, veuillez contacter un administrateur' | trans }}
     </p>
   </div>
 </div>
diff --git a/templates/web/prod/actions/Bridge/paginator.html.twig b/templates/web/prod/actions/Bridge/paginator.html.twig
index e06ce492f4..ed53188812 100644
--- a/templates/web/prod/actions/Bridge/paginator.html.twig
+++ b/templates/web/prod/actions/Bridge/paginator.html.twig
@@ -1,5 +1,5 @@
 {% macro paginator(npages, page, url) %}
-  {% trans 'Page' %}
+  {{ 'Page' | trans }}
   {% if npages > 1 %}
     {% set d2top = (npages - page) %}
     {% set d2bottom = (page -1 ) %}
diff --git a/templates/web/prod/actions/Bridge/records_list.html.twig b/templates/web/prod/actions/Bridge/records_list.html.twig
index 426e81296a..f0c6fab337 100644
--- a/templates/web/prod/actions/Bridge/records_list.html.twig
+++ b/templates/web/prod/actions/Bridge/records_list.html.twig
@@ -81,11 +81,11 @@
         {% if element.get_status is constant('Bridge_Element::STATUS_DONE') %}
           OK
         {% elseif element.get_status is constant('Bridge_Element::STATUS_PENDING') %}
-          {% trans 'En attente' %}
+          {{ 'En attente' | trans }}
         {% elseif element.get_status is constant('Bridge_Element::STATUS_PROCESSING') %}
-          {% trans 'En cours d\'envoi' %}
+          {{ 'En cours d\'envoi' | trans }}
         {% elseif element.get_status is constant('Bridge_Element::STATUS_PROCESSING_SERVER') %}
-          {% trans 'En cours d\'encodage' %}
+          {{ 'En cours d\'encodage' | trans }}
         {% else %}
           {{ account.get_api().get_error_message_from_status(element.get_connector_status()) }}
         {% endif %}
diff --git a/templates/web/prod/actions/Bridge/wrapper.html.twig b/templates/web/prod/actions/Bridge/wrapper.html.twig
index e30b4f6d69..bf914120e3 100644
--- a/templates/web/prod/actions/Bridge/wrapper.html.twig
+++ b/templates/web/prod/actions/Bridge/wrapper.html.twig
@@ -21,14 +21,14 @@
                             {% if not loop.last %} - {% endif %}
                         {% endfor %}
                         <a class="{% if adapter_action == 'load-records' %} selected {% endif %} bridge_action bridge_title" href="{{ path('prod_bridge_account_loadrecords', { 'account_id' : account.get_id() }) }}">
-                            {% trans 'Fichiers envoyes' %}
+                            {{ 'Fichiers envoyes' | trans }}
                         </a>
                     {% endif %}
                     </td>
                     <td style="text-align:right;">
                     {% if account is not none %}
                         <a class="bridge_action bridge_logout" href="{{ path('prod_bridge_account_logout', { 'account_id' : account.get_id() }) }}">
-                            {% trans 'phraseanet:: deconnection' %}
+                            {{ 'phraseanet:: deconnection' | trans }}
                         </a>
                     {% endif %}
                     </td>
@@ -63,7 +63,7 @@
                             {% if account is not none %}
                                 {% if account.get_api().get_connector().get_terms_url() %}
                                     <a href="{{ account.get_api().get_connector().get_terms_url() }}" target="_blank">
-                                        {% trans 'Terms of service' %}
+                                        {{ 'Terms of service' | trans }}
                                     </a>
                                 {% endif %}
                             {% endif %}
diff --git a/templates/web/prod/actions/Download/prepare.html.twig b/templates/web/prod/actions/Download/prepare.html.twig
index be927a272f..26acc4d641 100644
--- a/templates/web/prod/actions/Download/prepare.html.twig
+++ b/templates/web/prod/actions/Download/prepare.html.twig
@@ -10,12 +10,12 @@
 {% endblock %}
 
 {% block content %}
-    <h1 style="text-align:center">{% trans "Download of documents" %}</h1>
+    <h1 style="text-align:center">{{ "Download of documents" | trans }}</h1>
 
     <div class="well-small">
        {% if (list['complete'] is not defined or not list['complete']) and list['count'] > 1%}
             <div class="alert alert-info">
-                {% trans "Please wait while your files are being gathered for the download, this operation may take a few minutes." %}
+                {{ "Please wait while your files are being gathered for the download, this operation may take a few minutes." | trans }}
             </div>
        {% elseif list['complete'] is defined and list['complete'] %}
             <div class="alert alert-success">
@@ -32,15 +32,15 @@
     <div class="well-small">
         <table class="table table-bordered table-condensed">
             <caption>
-                <h3>{% trans "The file contains the following elements" %}</h3>
+                <h3>{{ "The file contains the following elements" | trans }}</h3>
             </caption>
             <thead>
                 <tr>
-                    <th>{% trans "Base" %}</th>
-                    <th>{% trans "Name" %}</th>
-                    <th>{% trans "Sub definition" %}</th>
-                    <th>{% trans "Size" %}</th>
-                    <th>{% trans "Thumbnail" %}</th>
+                    <th>{{ "Base" | trans }}</th>
+                    <th>{{ "Name" | trans }}</th>
+                    <th>{{ "Sub definition" | trans }}</th>
+                    <th>{{ "Size" | trans }}</th>
+                    <th>{{ "Thumbnail" | trans }}</th>
                 </tr>
             </thead>
 
diff --git a/templates/web/prod/actions/Feedback/List-Share.html.twig b/templates/web/prod/actions/Feedback/List-Share.html.twig
index 4b9c26f18f..6b5f741f91 100644
--- a/templates/web/prod/actions/Feedback/List-Share.html.twig
+++ b/templates/web/prod/actions/Feedback/List-Share.html.twig
@@ -1,22 +1,22 @@
 {% if list is empty %}
-  {% trans 'You are not authorized to do this' %}
+  {{ 'You are not authorized to do this' | trans }}
 {% else %}
   <div id="ListShare">
     <div>
-      <h2 style="font-size:14px; margin-bottom:10px;"><b>{% trans 'About Roles : ' %}</b></h2>
+      <h2 style="font-size:14px; margin-bottom:10px;"><b>{{ 'About Roles : ' | trans }}</b></h2>
       <p>
-        - {% trans 'Admin can edit shares, modify content' %}
+        - {{ 'Admin can edit shares, modify content' | trans }}
       </p>
       <p>
-        - {% trans 'Editor can modify content' %}
+        - {{ 'Editor can modify content' | trans }}
       </p>
       <p>
-        - {% trans 'Access user have readonly access' %}
+        - {{ 'Access user have readonly access' | trans }}
       </p>
     </div>
     <div style="margin-top:10px;">
       <form name="list_share_user">
-        <label for="use">{% trans 'Find a user' %} : </label>
+        <label for="use">{{ 'Find a user' | trans }} : </label>
         <input type="text" class="search" name="user" value="" style="width:180px" />
       </form>
     </div>
@@ -35,19 +35,19 @@
             <td style="padding-right:10px;min-width:100px;">
               {% if app['authentication'].getUser().get_id() == owner.getUser(app).get_id() %}
                 {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
-                  {% trans 'You are Admin' %}
+                  {{ 'You are Admin' | trans }}
                 {% endif %}
               {% else %}
-              <label>{% trans 'Role' %}</label>
+              <label>{{ 'Role' | trans }}</label>
               <select name="role">
                 <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_USER') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_USER') }}">
-                  {% trans 'Access' %}
+                  {{ 'Access' | trans }}
                 </option>
                 <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') }}">
-                  {% trans 'Editor' %}
+                  {{ 'Editor' | trans }}
                 </option>
                 <option {% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}selected {% endif %} value="{{ constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') }}">
-                  {% trans 'Admin' %}
+                  {{ 'Admin' | trans }}
                 </option>
               </select>
               {% endif %}
@@ -55,11 +55,11 @@
             <td style="width:15px">
                {% if app['authentication'].getUser().get_id() != owner.getUser(app).get_id() %}
                   <a href="#" class="deleter">
-                    <img src="/skins/prod/Push/close_badge.png" title="{% trans 'Remove' %}"/>
+                    <img src="/skins/prod/Push/close_badge.png" title="{{ 'Remove' | trans }}"/>
                   </a>
                 {% endif %}
               <a href="#" class="notifier">
-                <img src="/skins/prod/Push/Notify.png" title="{% trans 'Notify' %}"/>
+                <img src="/skins/prod/Push/Notify.png" title="{{ 'Notify' | trans }}"/>
               </a>
             </td>
           </tr>
diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index d8c78c94e1..1f7986c203 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -5,49 +5,49 @@
         <thead>
           <tr>
             <th style="text-align: center;" class="sortable {{ sort == 'usr_login' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'Login' %}
+              {{ 'Login' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="usr_login" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'usr_nom' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'First/Last Name' %}
+              {{ 'First/Last Name' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="usr_nom" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'societe' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'Company' %}
+              {{ 'Company' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="societe" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'usr_mail' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'E-Mail' %}
+              {{ 'E-Mail' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="usr_mail" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'pays' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'Country' %}
+              {{ 'Country' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="pays" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'lastModel' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'Last Template' %}
+              {{ 'Last Template' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
               <input type="hidden" name="srt" value="lastModel" />
             </th>
             <th style="text-align: center;" class="sortable {{ sort == 'usr_creationdate' ? 'sorted' :  '' }} {{ ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
-              {% trans 'Creation date' %}
+              {{ 'Creation date' | trans }}
               <span class="ord_notifier">
                 {{ ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}
               </span>
@@ -91,11 +91,11 @@
       {{ length }} peoples
     {% endtrans %}
     {% if query.get_page() > 1 %}
-      <a class="prev" value="{{ query.get_page() - 1 }}" href="#">< {% trans 'Previous' %}</a>
+      <a class="prev" value="{{ query.get_page() - 1 }}" href="#">< {{ 'Previous' | trans }}</a>
     {% endif %}
     {{ query.get_page() }} / {{ query.get_total_page() }}
     {% if query.get_page() < query.get_total_page() %}
-      <a class="next" value="{{ query.get_page() + 1 }}" href="#">{% trans 'Next' %} ></a>
+      <a class="next" value="{{ query.get_page() + 1 }}" href="#">{{ 'Next' | trans }} ></a>
     {% endif %}
   </div>
 </div>
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index 6d3293b4dd..b1134c4cc0 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -7,9 +7,9 @@
                 <td style="white-space:nowrap;">
                     {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                         <form class="form-inline" method="POST" name="SaveName" action="{{ path('prod_lists_list_update', { 'list_id' : list.getId() }) }}">
-                            <label>{% trans 'List Name' %}</label>
+                            <label>{{ 'List Name' | trans }}</label>
                             <input type="text" name="name" style="margin: 0 5px;" value="{{ list.getName() }}"/>
-                            <button class="btn btn-inverse">{% trans 'Save' %}</button>
+                            <button class="btn btn-inverse">{{ 'Save' | trans }}</button>
                         </form>
                     {% else %}
                         <h1>{{ list.getName() }}</h1>
@@ -17,16 +17,16 @@
                 </td>
                 <td style="text-align:right;white-space:nowrap;">
                     {% if list.getOwner(app['authentication'].getUser(), app).getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
-                        <a href="{{ path('prod_lists_list_share', { 'list_id' : list.getId() }) }}" title="{% trans 'Share the list' %}" class="list_sharer">
+                        <a href="{{ path('prod_lists_list_share', { 'list_id' : list.getId() }) }}" title="{{ 'Share the list' | trans }}" class="list_sharer">
                             <img src="/skins/prod/Push/list-icon.png" />
-                            {% trans "Set sharing permission" %}
+                            {{ "Set sharing permission" | trans }}
                         </a>
                     {% endif %}
                 </td>
                 {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
                     <td style="text-align:right;white-space:nowrap;width:150px;">
                         <button class="deleter btn btn-inverse">
-                            {% trans 'Delete' %}
+                            {{ 'Delete' | trans }}
                             <input type="hidden" name="list_id" value="{{ list.getId() }}"/>
                         </button>
                     </td>
@@ -41,7 +41,7 @@
                     {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
                     {% trans %}{{ length }} peoples{% endtrans %}
                     {% if list.getOwner(app['authentication'].getUser(), app).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
-                        <button class="EditToggle btn btn-inverse">{% trans 'Edit' %}</button>
+                        <button class="EditToggle btn btn-inverse">{{ 'Edit' | trans }}</button>
                     {% endif %}
                 </p>
             </div>
@@ -58,54 +58,54 @@
             <form name="list-editor-search" method="POST" action="{{ path('prod_push_list_edit', { 'list_id' : list.getId() }) }}">
                 <div class="PNB10" style="height:160px;">
                     <div class="PNB" style="height:40px;bottom:auto;">
-                        <button class="Refresher btn btn-inverse" type="button">&lt;{% trans 'View' %}</button>
+                        <button class="Refresher btn btn-inverse" type="button">&lt;{{ 'View' | trans }}</button>
                         <select name="like_field">
                             <option value="usr_login">
-                                {% trans 'Push::filter on login' %}
+                                {{ 'Push::filter on login' | trans }}
                             </option>
                             <option value="name">
-                                {% trans 'Push::filter on name' %}
+                                {{ 'Push::filter on name' | trans }}
                             </option>
                             <option value="pays">
-                                {% trans 'Push::filter on countries' %}
+                                {{ 'Push::filter on countries' | trans }}
                             </option>
                             <option value="societe">
-                                {% trans 'Push::filter on companies' %}
+                                {{ 'Push::filter on companies' | trans }}
                             </option>
                             <option value="usr_mail">
-                                {% trans 'Push::filter on emails' %}
+                                {{ 'Push::filter on emails' | trans }}
                             </option>
                             <option value="lastModel">
-                                {% trans 'Push::filter on templates' %}
+                                {{ 'Push::filter on templates' | trans }}
                             </option>
                         </select>
-                        {% trans 'Push::filter starts' %}
+                        {{ 'Push::filter starts' | trans }}
                         <input type="text" value="" class="search" name="query">
-                        <button type="submit" class="btn btn-inverse">{% trans 'boutton::chercher' %}</button>
+                        <button type="submit" class="btn btn-inverse">{{ 'boutton::chercher' | trans }}</button>
                     </div>
                     <div class="PNB" style="top:40px;height:120px;bottom:auto;">
                         <table style="table-layout:fixed;width:100%;">
                             <tr>
                                 <td>
-                                    <label>{% trans 'Activite' %}</label>
+                                    <label>{{ 'Activite' | trans }}</label>
                                 </td>
                                 <td>
-                                    <label>{% trans 'Template' %}</label>
+                                    <label>{{ 'Template' | trans }}</label>
                                 </td>
                                 <td >
-                                    <label>{% trans 'Company' %}</label>
+                                    <label>{{ 'Company' | trans }}</label>
                                 </td>
                                 <td >
-                                    <label>{% trans 'Country' %}</label>
+                                    <label>{{ 'Country' | trans }}</label>
                                 </td>
                                 <td >
-                                    <label>{% trans 'Position' %}</label>
+                                    <label>{{ 'Position' | trans }}</label>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <select size="5" multiple="multiple" name="Activity[]" style="width:80%;">
-                                        <option value="">{% trans 'All' %}</option>
+                                        <option value="">{{ 'All' | trans }}</option>
                                         {% for Activity in query.getRelatedActivities() %}
                                             <option value="{{ Activity }}">{{ Activity }}</option>
                                         {% endfor %}
@@ -113,7 +113,7 @@
                                 </td>
                                 <td>
                                     <select size="5" multiple="multiple" name="Template[]" style="width:80%;">
-                                        <option value="">{% trans 'All' %}</option>
+                                        <option value="">{{ 'All' | trans }}</option>
                                         {% for Template in query.getRelatedTemplates() %}
                                             <option value="{{ Template }}">{{ Template }}</option>
                                         {% endfor %}
@@ -121,7 +121,7 @@
                                 </td>
                                 <td>
                                     <select size="5" multiple="multiple" name="Company[]" style="width:80%;">
-                                        <option value="">{% trans 'All' %}</option>
+                                        <option value="">{{ 'All' | trans }}</option>
                                         {% for Company in query.getRelatedCompanies() %}
                                             <option value="{{ Company }}">{{ Company }}</option>
                                         {% endfor %}
@@ -129,7 +129,7 @@
                                 </td>
                                 <td>
                                     <select size="5" multiple="multiple" name="Country[]" style="width:80%;">
-                                        <option value="">{% trans 'All' %}</option>
+                                        <option value="">{{ 'All' | trans }}</option>
                                         {% for Code, Country in query.getRelatedCountries() %}
                                             <option value="{{ Code }}">{{ Country }}</option>
                                         {% endfor %}
@@ -137,7 +137,7 @@
                                 </td>
                                 <td>
                                     <select size="5" multiple="multiple" name="Position[]" style="width:80%;">
-                                        <option value="">{% trans 'All' %}</option>
+                                        <option value="">{{ 'All' | trans }}</option>
                                         {% for Position in query.getRelatedPositions() %}
                                             <option value="{{ Position }}">{{ Position }}</option>
                                         {% endfor %}
diff --git a/templates/web/prod/actions/Feedback/lists-all.html.twig b/templates/web/prod/actions/Feedback/lists-all.html.twig
index f80594e47f..7bd17ff70a 100644
--- a/templates/web/prod/actions/Feedback/lists-all.html.twig
+++ b/templates/web/prod/actions/Feedback/lists-all.html.twig
@@ -1,12 +1,12 @@
 
       <div class="PNB10 lists">
-        <h1>{% trans 'Lists' %}</h1>
+        <h1>{{ 'Lists' | trans }}</h1>
         <span class="action">
           <a href="{{ path('prod_lists_list') }}" class="list_adder link">
-            {% trans "Add" %}
+            {{ "Add" | trans }}
           </a>
           <a href="{{ path('prod_lists_all') }}" class="list_refresh link">
-            {% trans "Refresh" %}
+            {{ "Refresh" | trans }}
           </a>
         </span>
         <ul class="lists">
diff --git a/templates/web/prod/actions/Property/index.html.twig b/templates/web/prod/actions/Property/index.html.twig
index 88e316b323..c6082094bc 100644
--- a/templates/web/prod/actions/Property/index.html.twig
+++ b/templates/web/prod/actions/Property/index.html.twig
@@ -8,9 +8,9 @@
     <input type="hidden" name='original_selection' value="{{ app.request.query.get('lst') }}">
 
     <ul>
-        <li><a href="#property-statut">{% trans 'Records Statut' %}</a></li>
+        <li><a href="#property-statut">{{ 'Records Statut' | trans }}</a></li>
         {# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
-        <li><a href="{{ path('display_type_property') }}">{% trans 'Records type' %}&nbsp;<span>&nbsp;</span></a></li>
+        <li><a href="{{ path('display_type_property') }}">{{ 'Records type' | trans }}&nbsp;<span>&nbsp;</span></a></li>
     </ul>
 
     <div id='property-statut'>
@@ -130,9 +130,9 @@
             {% endfor %}
             <div class="form-actions" style="background:transparent">
             {% if nbEditableDocuments > 0 %}
-                <button type="button" class="btn btn-primary submiter">{% trans "Apply changes" %}</button>
+                <button type="button" class="btn btn-primary submiter">{{ "Apply changes" | trans }}</button>
             {% endif %}
-                <button type="button" class="btn cancel">{% trans "Cancel" %}</button>
+                <button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
                 <span class="form-action-loader" style="display:none;">
                     <img src="../skins/icons/loader414141.gif" />
                 </span>
diff --git a/templates/web/prod/actions/Property/type.html.twig b/templates/web/prod/actions/Property/type.html.twig
index 591db4ead2..622f6318e6 100644
--- a/templates/web/prod/actions/Property/type.html.twig
+++ b/templates/web/prod/actions/Property/type.html.twig
@@ -12,7 +12,7 @@
 <form style="padding:15px;" name="change-records-type" action="{{ path('change_type') }}" method="POST">
     <div class="well-small" style="text-align:center;">
         <select name="force_types" class="input-xxlarge">
-            <option value="">{% trans "Apply to all selected documents" %}</option>
+            <option value="">{{ "Apply to all selected documents" | trans }}</option>
             {% for option in typesEnum %}
                 <option value="{{ option }}">{{ option }}</option>
             {% endfor %}
@@ -45,8 +45,8 @@
     {% endfor %}
 
     <div class="form-actions" style="background-color:transparent;">
-        <button type="button" class="btn btn-primary submiter">{% trans "Apply changes" %}</button>
-        <button type="button" class="btn cancel">{% trans "Cancel" %}</button>
+        <button type="button" class="btn btn-primary submiter">{{ "Apply changes" | trans }}</button>
+        <button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
         <span class="form-action-loader" style="display:none;">
             <img src="../skins/icons/loader414141.gif" />
         </span>
diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig
index 5584c8f117..99a714f68b 100644
--- a/templates/web/prod/actions/Push.html.twig
+++ b/templates/web/prod/actions/Push.html.twig
@@ -8,7 +8,7 @@
     {%  endif %}
     </div>
     <div style="text-align:center;margin-top:15px;">
-        <button class="btn btn-inverse" onclick="p4.Dialog.Close(1)">{% trans "boutton::fermer" %}</button>
+        <button class="btn btn-inverse" onclick="p4.Dialog.Close(1)">{{ "boutton::fermer" | trans }}</button>
     </div>
 </div>
 {%  else  %}
@@ -24,37 +24,37 @@
             </div>
             <div class="PNB content" style="top:150px; overflow-y:auto;">
                 <div style="padding:10px">
-                    <h1>{% trans 'Grant rights' %}</h1>
+                    <h1>{{ 'Grant rights' | trans }}</h1>
                     <ul class="general_togglers">
                     {% if context == 'Feedback' %}
                         <li>
                             <button type="button" class="general_toggler btn btn-inverse" feature="agree">
-                                {% trans 'Contributor' %}
+                                {{ 'Contributor' | trans }}
                             </button>
                         </li>
                         <li>
                             <button type="button" class="general_toggler btn btn-inverse" feature="see_others">
-                                {% trans 'See others' %}
+                                {{ 'See others' | trans }}
                             </button>
                         </li>
                     {% endif %}
                         <li>
                             <button type="button" class="general_toggler btn btn-inverse" feature="HD">
-                                {% trans 'HD Download' %}
+                                {{ 'HD Download' | trans }}
                             </button>
                         </li>
                     </ul>
                 </div>
                 <div style="padding:10px;">
-                    <h1>{% trans 'Lists' %}</h1>
+                    <h1>{{ 'Lists' | trans }}</h1>
                     <span style="width:100%; display:block; text-align:center;">
                         <a href="#" class="link list_manager">
-                            <b>{% trans 'List Manager' %}</b>
+                            <b>{{ 'List Manager' | trans }}</b>
                         </a>
                     </span>
                     <form class="list_saver">
                         <div class="btn-toolbar">
-                            <input type="text" name="name" placeholder="{% trans 'Save this list' %}" />
+                            <input type="text" name="name" placeholder="{{ 'Save this list' | trans }}" />
                             <button class="btn"><img src="/skins/prod/Push/save_list_as.png" /></button>
                         </div>
                     </form>
@@ -84,12 +84,12 @@
                     <tr style="vertical-align:top;">
                         <td>
                             <div id="find-user">
-                                <input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" style="width:210px;"/>
+                                <input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text" style="width:210px;"/>
                                 <br/>
-                                {% trans 'Select a user in the list'%} <br/>
+                                {{ 'Select a user in the list' | trans }} <br/>
                                 {% if app['acl'].get(app['authentication'].getUser()).has_right('manageusers') %}
-                                    {% trans 'or' %}
-                                    <a href="{{ path('prod_push_add_user') }}" class="user_adder link">{% trans 'Add user' %}</a>
+                                    {{ 'or' | trans }}
+                                    <a href="{{ path('prod_push_add_user') }}" class="user_adder link">{{ 'Add user' | trans }}</a>
                                 {% endif %}
                             </div>
                             <p id="recommanded-users">
@@ -137,7 +137,7 @@
                                 {% endif %}
                             </p>
 
-                            <div style="display:none;" id="push_user_recommendations" title="{% trans 'Users suggestion' %}" >
+                            <div style="display:none;" id="push_user_recommendations" title="{{ 'Users suggestion' | trans }}" >
                                 <table class="users" style="width:100%;">
                                     {% for user in RecommendedUsers %}
                                         <tr>
@@ -149,7 +149,7 @@
                                                 <input type="hidden" name="usr_id" value="{{ user.get_id() }}" />
                                             </td>
                                             <td>
-                                                <a href="#" class="adder">{% trans 'Add' %}</a>
+                                                <a href="#" class="adder">{{ 'Add' | trans }}</a>
                                             </td>
                                         </tr>
                                     {% endfor %}
@@ -160,9 +160,9 @@
                         <td>
                             <p>
                                 {% if context == 'Push' %}
-                                    {% trans 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' %}
+                                    {{ 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' | trans }}
                                 {% else %}
-                                    {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %}
+                                    {{ 'Push::une validation est une demande d\'appreciation a d\'autres personnes' | trans }}
                                 {% endif %}
                             </p>
                         </td>
@@ -195,8 +195,8 @@
                                 {% endif %}
                             </td>
                             <td class="options">
-                                <button class="select-all btn btn-inverse">{% trans 'Select all' %}</button>
-                                <button class="unselect-all btn btn-inverse">{% trans 'Deselect all' %}</button>
+                                <button class="select-all btn btn-inverse">{{ 'Select all' | trans }}</button>
+                                <button class="unselect-all btn btn-inverse">{{ 'Deselect all' | trans }}</button>
                             </td>
                         </tr>
                     </table>
@@ -217,7 +217,7 @@
                     <div class="PNB badges"></div>
                 </form>
                 <div class="PNB10 footer">
-                    <button class="FeedbackSend btn btn-inverse">{% trans "Send" %}</button>
+                    <button class="FeedbackSend btn btn-inverse">{{ "Send" | trans }}</button>
                 </div>
             </div>
         </div>
@@ -230,13 +230,13 @@
             <button class="back_link btn btn-inverse" style="margin-right: 5px;">
                 &lt;
                 {% if context == 'Push' %}
-                    {% trans 'Back to Push' %}
+                    {{ 'Back to Push' | trans }}
                 {% else %}
-                    {% trans 'Back to Feedback' %}
+                    {{ 'Back to Feedback' | trans }}
                 {% endif %}
             </button>
             <span class="title">
-                {% trans 'List Manager' %}
+                {{ 'List Manager' | trans }}
             </span>
         </h1>
     </div>
@@ -248,14 +248,14 @@
         </div>
         <div class="editor PNB" style="left:320px;">
             <div class="welcome">
-                <h1>{% trans 'Welcome to the ListManager !' %}</h1>
+                <h1>{{ 'Welcome to the ListManager !' | trans }}</h1>
                 {% if lists|length == 0 %}
                     <p class="welcome">
-                        {% trans 'Start by creating one by using the "add" button on the left !' %}
+                        {{ 'Start by creating one by using the "add" button on the left !' | trans }}
                     </p>
                 {% else %}
                     <p class="welcome">
-                        {% trans 'Select a list on the left and edit it !' %}
+                        {{ 'Select a list on the left and edit it !' | trans }}
                     </p>
                 {% endif %}
             </div>
diff --git a/templates/web/prod/actions/Tools/confirm.html.twig b/templates/web/prod/actions/Tools/confirm.html.twig
index b6635987dc..2d3830baba 100644
--- a/templates/web/prod/actions/Tools/confirm.html.twig
+++ b/templates/web/prod/actions/Tools/confirm.html.twig
@@ -11,12 +11,12 @@
     </tr>
     <tr>
       <td colspan="2" style='text-align:left'>
-        {% trans 'you are about to change the  representation thumbnail of your video' %} : <span style='color:#1B9DD0'>{{video_title}}</span>
+        {{ 'you are about to change the  representation thumbnail of your video' | trans }} : <span style='color:#1B9DD0'>{{video_title}}</span>
       </td>
     </tr>
     <tr>
       <td colspan="2" style='text-align:left'>
-        {% trans 'do you want to validate' %} ?
+        {{ 'do you want to validate' | trans }} ?
       </td>
     </tr>
   </tbody>
diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig
index bd68a5543c..4c3f389526 100644
--- a/templates/web/prod/actions/Tools/index.html.twig
+++ b/templates/web/prod/actions/Tools/index.html.twig
@@ -36,7 +36,7 @@
             <ul>
                 <li>
                     <a href="#subdefs">
-                        {% trans "regeneration of sub-definitions" %}
+                        {{ "regeneration of sub-definitions" | trans }}
                     </a>
                 </li>
                 {% if selectionLength == 1%}
@@ -44,7 +44,7 @@
                         {% if record.get_type() == 'video' %}
                             <li>
                                 <a href="#thumbExtractor">
-                                    {% trans "video tool" %}
+                                    {{ "video tool" | trans }}
                                 </a>
                             </li>
                         {% endif %}
@@ -53,21 +53,21 @@
                 {% if allowRotate == 1%}
                     <li>
                         <a href="#image">
-                            {% trans "image tool"%}
+                            {{ "image tool" | trans }}
                         </a>
                     </li>
                 {% endif %}
                 {% if selectionLength == 1 and (app['phraseanet.registry'].get('GV_seeOngChgDoc') or app['phraseanet.registry'].get('GV_seeNewThumb')) %}
                     <li>
                         <a href="#substitution">
-                            {% trans "substitution" %}
+                            {{ "substitution" | trans }}
                         </a>
                     </li>
                 {% endif %}
                 {% if metadatas %}
                     <li>
                         <a href="#exiftool">
-                            {% trans "meta-datas" %}
+                            {{ "meta-datas" | trans }}
                         </a>
                     </li>
                 {% endif %}
@@ -77,14 +77,14 @@
         <div id="subdefs" class="tabBox">
             <form id="new-img-form" action="{{ path('prod_tools_image') }}" method="post">
                 <fieldset style='border:1px solid #999; padding:20px;'>
-                    <legend style='color:#EEE'>&nbsp;<b>{% trans "Reconstruire les sous definitions" %}</b>&nbsp;</legend>
+                    <legend style='color:#EEE'>&nbsp;<b>{{ "Reconstruire les sous definitions" | trans }}</b>&nbsp;</legend>
                     {% if nbThumbSubstitute > 0 %}
                         <div style="color:#A00;">
-                            {% trans "Attention, certain documents ont des sous-definitions substituees"%}
+                            {{ "Attention, certain documents ont des sous-definitions substituees" | trans }}
                         </div>
                         <label for="FTS" class="checkbox">
                             <input type="checkbox" name="ForceThumbSubstit" value="1" id="FTS" />
-                            {% trans "Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees" %}
+                            {{ "Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees" | trans }}
                         </label>
                         <br/>
                     {% else %}
@@ -93,10 +93,10 @@
                     <div>
                         <select name="rebuild">
                             <option selected="selected" value="none">
-                                {% trans "recreer aucune sous-definitions" %}
+                                {{ "recreer aucune sous-definitions" | trans }}
                             </option>
                             <option value="all">
-                                {% trans "recreer toutes les sous-definitions" %}
+                                {{ "recreer toutes les sous-definitions" | trans }}
                             </option>
                         </select>
                     </div>
@@ -104,8 +104,8 @@
                     <input type="hidden" name="lst" value="{{records.serializedList()}}" />
                 </fieldset>
                 <div style='text-align:right;padding-top:10px;'>
-                    <button class="action_submiter btn btn-inverse" type="button">{% trans "validate" %}</button>
-                    <button class="action_cancel btn btn-inverse" type="button">{% trans "cancel" %}</button>
+                    <button class="action_submiter btn btn-inverse" type="button">{{ "validate" | trans }}</button>
+                    <button class="action_cancel btn btn-inverse" type="button">{{ "cancel" | trans }}</button>
                 </div>
             </form>
         </div>
@@ -116,7 +116,7 @@
           <div id="thumbExtractor"  class="tabBox">
             <div class="PNB10 main_title">
               <img src='/skins/prod/ThumbExtractor/camera_title.png'/>
-              {% trans "screenshot video" %}
+              {{ "screenshot video" | trans }}
             </div>
             <hr style='margin-top:25px;'/>
             <div class="PNB part_title_left"></div>
@@ -140,7 +140,7 @@
                 {% for subdef in previewHtml5 %}
                 <source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}" />
                 {% endfor %}
-                {% trans 'No preview available' %}
+                {{ 'No preview available' | trans }}
               </video>
             </div>
 
@@ -148,7 +148,7 @@
             </div>
 
             <div id="thumb_camera_button" class="PNB">
-              <img src="/skins/prod/ThumbExtractor/camera_button.png" alt="{% trans 'take a screenshot' %}" />
+              <img src="/skins/prod/ThumbExtractor/camera_button.png" alt="{{ 'take a screenshot' | trans }}" />
             </div>
 
             <div class="PNB part_title_right">
@@ -161,7 +161,7 @@
               <div id="thumb_delete_button">
                 <img src="/skins/prod/ThumbExtractor/delete.png" />
               </div>
-              <p id='thumb_info'>{% trans 'To take a screenshot click on camera' %}</p>
+              <p id='thumb_info'>{{ 'To take a screenshot click on camera' | trans }}</p>
               <canvas id="thumb_canvas">
               </canvas>
             </div>
@@ -188,7 +188,7 @@
             <div id="action_frame_brightness" class="PNB action_frame" style='background-color:#3B3D3B;z-index: 5;top:295px;left:380px;width:325px;height:125px;display: none;'>
               <div class='close_action_frame PNB' style='background: url("/skins/prod/Push/close_badge.png") #141616 no-repeat center center; top:5px;left:310px;width:10px;height:10px;'></div>
               <div>
-                {% trans 'brightness settings' %}
+                {{ 'brightness settings' | trans }}
                 <hr style='color:#141616' />
               </div>
               <table style="table-layout:fixed; width:100%">
@@ -204,7 +204,7 @@
                 </tbody>
               </table>
               <div class='PNB' style="top:80px;left:220px;width:90px;height:30px;">
-                <button class="apply-brightness btn btn-inverse">{% trans 'validate'%}</button>
+                <button class="apply-brightness btn btn-inverse">{{ 'validate' | trans }}</button>
               </div>
             </div>
 
@@ -212,7 +212,7 @@
               <div class='close_action_frame PNB' style='background: url("/skins/prod/Push/close_badge.png") #141616 no-repeat center center; top:5px;left:310px;width:10px;height:10px;'>
               </div>
               <div>
-                {% trans 'contrast settings' %}
+                {{ 'contrast settings' | trans }}
                 <hr style='color:#141616' />
               </div>
               <table style="table-layout:fixed;width:100%">
@@ -228,14 +228,14 @@
                 </tbody>
               </table>
               <div class='PNB' style="top:80px;left:220px;width:90px;height:30px;">
-                <button class="apply-contrast btn btn-inverse">{% trans 'validate'%}</button>
+                <button class="apply-contrast btn btn-inverse">{{ 'validate' | trans }}</button>
               </div>
             </div>
 
             <div id="thumb_validate_button" class="PNB">
               <input type="hidden" value='{{record.get_sbas_id()}}' name='sbas_id'>
               <input type="hidden" value='{{record.get_record_id()}}' name='record_id'>
-              <img src="/skins/prod/ThumbExtractor/validate_button.png" alt="{% trans 'take a screenshot' %}" />
+              <img src="/skins/prod/ThumbExtractor/validate_button.png" alt="{{ 'take a screenshot' | trans }}" />
             </div>
           </div>
         {% endif %}
@@ -246,23 +246,23 @@
         <div id="image" class="tabBox">
           <form name="formpushdoc" action="{{ path('prod_tools_rotate') }}" method="post">
             <fieldset style='border:1px solid #999;padding:20px;'>
-              <legend style='color:#EEE'>&nbsp;<b>{% trans "image rotation" %}</b>&nbsp;</legend>
+              <legend style='color:#EEE'>&nbsp;<b>{{ "image rotation" | trans }}</b>&nbsp;</legend>
                 <label for="ROTA_90" class="radio">
                     <input type="radio" name="rotation" id="ROTA_90" value="90" checked="checked">
-                    {% trans "rotation 90 degres horaire"%}
+                    {{ "rotation 90 degres horaire" | trans }}
                 </label>
                 <br />
                 <label for="ROTA_C90" class="radio">
                     <input type="radio" name="rotation" id="ROTA_C90" value="-90">
-                    {% trans "rotation 90 degres anti-horaires"%}
+                    {{ "rotation 90 degres anti-horaires" | trans }}
                 </label>
                 <input type="hidden" name="lst" value="{{records.serializedList()}}" />
                 <input type="hidden" name="element" value="" />
                 <input type="hidden" name="cchd" value="" />
             </fieldset>
             <div style='text-align:right;padding-top:10px;'>
-              <button class="action_submiter btn btn-inverse">{% trans "validate" %}</button>
-              <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+              <button class="action_submiter btn btn-inverse">{{ "validate" | trans }}</button>
+              <button class="action_cancel btn btn-inverse">{{ "cancel" | trans }}</button>
             </div>
           </form>
         </div>
@@ -274,7 +274,7 @@
         <div id="substitution" class="tabBox">
 
          {% if "unknown" == record.get_type() %}
-            <i class="icon-warning-sign icon-white"></i>{% trans "Substitution is not possible for this kind of record" %}
+            <i class="icon-warning-sign icon-white"></i>{{ "Substitution is not possible for this kind of record" | trans }}
          {% else %}
             {% if app['phraseanet.registry'].get('GV_seeOngChgDoc') %}
                 <div id="substitution-hd">
@@ -286,13 +286,13 @@
                     target="uploadHdsub">
 
                     <fieldset style='border:1px solid #999;padding:20px;'>
-                      <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
+                      <legend style='color:#EEE'>&nbsp;<b>{{ "substitution HD" | trans }}</b>&nbsp;</legend>
                       <div>
                         <input id='new-hd-file' name="newHD" type="file"/>
                         <br />
                         <label for="CCFNALP" class="checkbox">
                             <input type="checkbox" name="ccfilename" id="CCFNALP" value="1">
-                            {% trans "mettre a jour le nom original de fichier apres substitution"%}
+                            {{ "mettre a jour le nom original de fichier apres substitution" | trans }}
                         </label>
                         <input type="hidden" name="ACT" value="SEND" />
                         <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}"/>
@@ -301,8 +301,8 @@
                       </div>
                     </fieldset>
                     <div style='text-align:right;padding-top:10px;'>
-                      <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
-                      <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+                      <button class="iframe_submiter btn btn-inverse">{{ "validate" | trans }}</button>
+                      <button class="action_cancel btn btn-inverse">{{ "cancel" | trans }}</button>
                     </div>
                   </form>
                   <div class='resultAction'></div>
@@ -318,7 +318,7 @@
                     method="post"
                     target="uploadHdsub">
                     <fieldset style='border:1px solid #999;padding:20px;'>
-                      <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
+                      <legend style='color:#EEE'>&nbsp;<b>{{ "substitution SD" | trans }}</b>&nbsp;</legend>
                       <div>
                         <input id='new-sd-file' name="newThumb" type="file" />
                         <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
@@ -327,8 +327,8 @@
                       </div>
                     </fieldset>
                     <div style='text-align:right;padding-top:10px;'>
-                      <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
-                      <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+                      <button class="iframe_submiter btn btn-inverse">{{ "validate" | trans }}</button>
+                      <button class="action_cancel btn btn-inverse">{{ "cancel" | trans }}</button>
                     </div>
                   </form>
                   <div class='resultAction'></div>
@@ -596,7 +596,7 @@ $(document).ready(function(){
             {
                 var dialog = p4.Dialog.Create({
                     size:'Alert',
-                    title: '{% trans "alert" %}',
+                    title: '{{ "alert" | trans }}',
                     closeOnEscape:true
                 }, 3);
 
@@ -604,7 +604,7 @@ $(document).ready(function(){
                     'text-align':'center',
                     'width': '100%',
                     'font-size':'14px'
-                }).append('{% trans "no image selected" %}');
+                }).append('{{ "no image selected" | trans }}');
                 dialog.setContent(content);
 
                 return;
@@ -657,7 +657,7 @@ $(document).ready(function(){
                     },
                     beforeSend: function(){
                         disableConfirmButton(dialog);
-                        loadingDiv.empty().addClass('loading').append('{% trans "processing" %}');
+                        loadingDiv.empty().addClass('loading').append('{{ "processing" | trans }}');
                     },
                     success: function(data){
                         loadingDiv.empty().removeClass('loading');
@@ -669,7 +669,7 @@ $(document).ready(function(){
                         }
                         else
                         {
-                            //var content = $("<div />").css({'color':'#a00'}).append("{% trans "an error occured" %} " + data.message);
+                            //var content = $("<div />").css({'color':'#a00'}).append("{{ "an error occured" | trans }} " + data.message);
                             loadingDiv.append(content);
                             enableConfirmButton(dialog);
                         }
@@ -680,7 +680,7 @@ $(document).ready(function(){
             //show confirm box, content is loaded here /prod/tools/thumb-extractor/confirm-box/
             var dialog = p4.Dialog.Create({
                 size:'Small',
-                title:"{% trans 'thumbnail validation' %}",
+                title:"{{ 'thumbnail validation' | trans }}",
                 cancelButton:true,
                 buttons: buttons
             }, 2);
diff --git a/templates/web/prod/actions/collection_default.html.twig b/templates/web/prod/actions/collection_default.html.twig
index 720305616a..bb50e1c7de 100644
--- a/templates/web/prod/actions/collection_default.html.twig
+++ b/templates/web/prod/actions/collection_default.html.twig
@@ -3,15 +3,15 @@
     <form onsubmit="return false" action="{{ path('prod_move_collection_apply') }}" method="post">
         {% if records.databoxes() | length > 1 %}
             <div class="well-small">
-                {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %}
+                {{ 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' | trans }}
             </div>
         {% elseif records | length == 0 %}
             <div class="well-small">
-                {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %}
+                {{ 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' | trans }}
             </div>
         {% elseif collections | length == 0 %}
             <div class="well-small">
-                {% trans 'erreur : Vous n\'avez pas les droits' %}
+                {{ 'erreur : Vous n\'avez pas les droits' | trans }}
             </div>
         {% else %}
             {% set canValid = true %}
@@ -55,7 +55,7 @@
             {% if records.stories() | length > 0 %}
                 <div class="well-small">
                     <label class="checkbox text-info">
-                        <input type="checkbox" value="1" name="chg_coll_son"> {% trans 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' %}
+                        <input type="checkbox" value="1" name="chg_coll_son"> {{ 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' | trans }}
                     </label>
                 </div>
             {% endif %}
diff --git a/templates/web/prod/actions/delete_records_confirm.html.twig b/templates/web/prod/actions/delete_records_confirm.html.twig
index fe5bc11c3a..d4c2509c37 100644
--- a/templates/web/prod/actions/delete_records_confirm.html.twig
+++ b/templates/web/prod/actions/delete_records_confirm.html.twig
@@ -4,7 +4,7 @@
 {% if nbEligibleDocuments > 0 %}
     {% if nbReceived != records.count() %}
         <div class="well-small" style="text-align:center;">
-            <span class="label label-info">{% trans "You do not have rights to remove all selected documents. Are you sure ?" %}</span>
+            <span class="label label-info">{{ "You do not have rights to remove all selected documents. Are you sure ?" | trans }}</span>
         </div>
     {% endif %}
 
@@ -12,16 +12,16 @@
         <input type="hidden" value="{{ records.serializedList() }}" name="lst" />
         <div class="well-small label-important" style="background-color: red;color:#000;padding:5px;display:block;word-wrap:break-word;font-weight: bold;">
             <span class="ui-icon ui-icon-alert" ></span>
-            {% trans "These records will be definitely deleted and can not be recovered" %}
+            {{ "These records will be definitely deleted and can not be recovered" | trans }}
         </div>
         {% if records.stories().count() %}
             <label class="checkbox">
-            <input type="checkbox" id="del_children" name="del_children" value="1"> {% trans "Also delete records that rely on groupings." %}
+            <input type="checkbox" id="del_children" name="del_children" value="1"> {{ "Also delete records that rely on groupings." | trans }}
           </label>
         {% endif %}
         <div class="form-actions" style="background-color:transparent;">
-            <button type="button" class="btn btn-danger submiter">{% trans "Delete" %} ({{ nbEligibleDocuments }})</button>
-            <button type="button" class="btn cancel">{% trans "Cancel" %}</button>
+            <button type="button" class="btn btn-danger submiter">{{ "Delete" | trans }} ({{ nbEligibleDocuments }})</button>
+            <button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
             <span class="form-action-loader" style="display:none;">
                 <img src="../skins/icons/loader000.gif" />
             </span>
@@ -88,10 +88,10 @@
     </script>
 {% elseif nbReceived == 0 %}
     <div class="well-small" style="text-align:center;">
-        <span class="label label-important">{% trans "No document selected" %}</span>
+        <span class="label label-important">{{ "No document selected" | trans }}</span>
     </div>
 {% else %}
     <div class="well-small" style="text-align:center;">
-        <span class="label label-info">{% trans "You do not have rights to remove selected documents" %}</span>
+        <span class="label label-info">{{ "You do not have rights to remove selected documents" | trans }}</span>
     </div>
 {% endif %}
\ No newline at end of file
diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig
index 0e3e1c8217..d23e2eff3c 100644
--- a/templates/web/prod/actions/edit_default.html.twig
+++ b/templates/web/prod/actions/edit_default.html.twig
@@ -17,7 +17,7 @@
     {% if width > height %}
         {% set top = 50 - ( (ratio / 2) * height / width ) %}
         {% set left = 50 - ( (ratio * height / (2 * width)) * width / height ) %}
-        {% set width = ratio ~ "%"  %}
+        {% set width = ratio ~ "%" %}
         {% set height = "auto" %}
     {% else %}
         {% set top = (100 - ratio) / 2 %}
@@ -37,7 +37,7 @@
         </div>
         <img class="edit_IMGT" id="idEditDiapoImg_{{ i }}" style="position:absolute; top:{{ top|round }}%; width:{{ width }}; height:{{ height }}; left:{{ left|round }}%;" onclick="edit_clk_editimg(event, {{ i }});" src="{{ thumbnail }}" />
         <div style='position:absolute; top:0px; left:0px; height:20px'>
-            <img class="require_alert" src="/skins/icons/alert.png" style="display:none;cursor:help;" title="{% trans 'edit::Certains champs doivent etre remplis pour valider cet editing' %}">
+            <img class="require_alert" src="/skins/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
         </div>
         <div style='position:absolute; bottom:0px; left:0px; height:20px'>
             <div class="previewTips" tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}"></div>
@@ -51,7 +51,7 @@
                         <td>
                             <div class="context-menu context-menu-theme-vista">
                                 <div title="" class="context-menu-item">
-                                    <div class="context-menu-item-inner" onclick="setRegDefault('{{i}}','{{record.get_record_id()}}');">{% trans 'edit: chosiir limage du regroupement' %}</div>
+                                    <div class="context-menu-item-inner" onclick="setRegDefault('{{i}}','{{record.get_record_id()}}');">{{ 'edit: chosiir limage du regroupement' | trans }}</div>
                                 </div>
                             </div>
                         </td>
@@ -81,10 +81,10 @@
                 <img id="editSGtri_{{i}}" style="visibility:hidden;" src="/skins/prod/{{cssfile}}/images/suggested.gif" />
                 <img src="/skins/icons/info.gif" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" class="fieldTips" alt=""/>
                 {% if field.get_dces_element %}
-                    <img src="/skins/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{% trans 'Ce champ est decrit comme un element DublinCore' %}" class="DCESTips" />
+                    <img src="/skins/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{{ 'Ce champ est decrit comme un element DublinCore' | trans }}" class="DCESTips" />
                 {% endif %}
                 {% if field.get_thumbtitle %}
-                    <img src="/skins/icons/titre16.png" title="{% trans 'This field represents the title of the document' %}" />
+                    <img src="/skins/icons/titre16.png" title="{{ 'This field represents the title of the document' | trans }}" />
                 {% endif %}
                 <span id="spanidEditFieldBox_{{i}}">
                     {{field.get_label(app['locale.I18n'])}} {% if field.is_required() %}<span style="font-weight:bold;font-size:16px;"> * </span>{% endif %} :
@@ -189,10 +189,10 @@
                     </div>
                     <div id="ZTextStatus">
                         <div class="nostatus">
-                            {% trans 'Aucun statut editable' %}
+                            {{ 'Aucun statut editable' | trans }}
                         </div>
                         <div class="somestatus">
-                            {% trans'Les status de certains documents ne sont pas accessibles par manque de droits' %}
+                            {{ 'Les status de certains documents ne sont pas accessibles par manque de droits' | trans }}
                         </div>
                         <div class="displaystatus">
                             <table>
@@ -223,9 +223,9 @@
                     </div>
                 </div>
                 <div id="idDivButtons" class="PNB">
-                    <input id="ok"     type="button" value="{% trans 'boutton::remplacer' %}" class="btn btn-inverse" onclick="edit_validField(event, 'ok');return(false);">
-                    <input id="fusion" type="button" value="{% trans 'boutton::ajouter' %}" class="btn btn-inverse" onclick="edit_validField(event, 'fusion');return(false);">
-                    <input id="cancel" type="button" value="{% trans 'boutton::annuler' %}" class="btn btn-inverse" onclick="edit_validField(event, 'cancel');return(false);">
+                    <input id="ok"     type="button" value="{{ 'boutton::remplacer' | trans }}" class="btn btn-inverse" onclick="edit_validField(event, 'ok');return(false);">
+                    <input id="fusion" type="button" value="{{ 'boutton::ajouter' | trans }}" class="btn btn-inverse" onclick="edit_validField(event, 'fusion');return(false);">
+                    <input id="cancel" type="button" value="{{ 'boutton::annuler' | trans }}" class="btn btn-inverse" onclick="edit_validField(event, 'cancel');return(false);">
                 </div>
                 <div id="idExplain" class="PNB"></div>
             </div>
@@ -234,12 +234,12 @@
             <div style='position:absolute; top:0; left:0; right:0; bottom:0;' class='tabs'>
                 <ul>
                     {% if thesaurus %}
-                        <li><a href="#TH_Ofull">{% trans 'phraseanet:: thesaurus' %}</a></li>
+                        <li><a href="#TH_Ofull">{{ 'phraseanet:: thesaurus' | trans }}</a></li>
                     {% endif %}
-                    <li><a href="#TH_Oclipboard">{% trans 'phraseanet:: presse-papier' %}</a></li>
-                    <li><a href="#TH_Opreview">{% trans 'phraseanet:: preview' %}</a></li>
-                    <li><a href="#TH_Oreplace">{% trans 'prod::editing: rechercher-remplacer' %}</a></li>
-                    <li><a href="#TH_Opresets">{% trans 'prod::editing: modeles de fiches' %}</a></li>
+                    <li><a href="#TH_Oclipboard">{{ 'phraseanet:: presse-papier' | trans }}</a></li>
+                    <li><a href="#TH_Opreview">{{ 'phraseanet:: preview' | trans }}</a></li>
+                    <li><a href="#TH_Oreplace">{{ 'prod::editing: rechercher-remplacer' | trans }}</a></li>
+                    <li><a href="#TH_Opresets">{{ 'prod::editing: modeles de fiches' | trans }}</a></li>
                 </ul>
                 {% if thesaurus %}
                     <div id='TH_Ofull'>
@@ -247,7 +247,7 @@
                             <p id='TH_T.{{ databox.get_sbas_id() }}.T'>
                                 <u id='TH_P.{{ databox.get_sbas_id() }}.T'>+</u><a id='GL_W.{{ databox.get_sbas_id() }}.T' style='FONT-WEIGHT: bold;'>{{ databox.get_label(app['locale.I18n']) }}</a>
                             </p>
-                            <div id='TH_K.{{ databox.get_sbas_id() }}.T' class='c'>{% trans 'phraseanet::chargement' %}</div>
+                            <div id='TH_K.{{ databox.get_sbas_id() }}.T' class='c'>{{ 'phraseanet::chargement' | trans }}</div>
                         </div>
                         <img style="position:absolute; margin:auto" id="TH_searching" src="/skins/icons/ftp-loader-blank.gif" />
                     </div>
@@ -263,10 +263,10 @@
                 <div id='TH_Oreplace'>
                     <table style="position:relative; left:0; width:100%;">
                         <tr>
-                            <td width="100">{% trans 'prod::editing::replace: remplacer dans le champ' %}</td>
+                            <td width="100">{{ 'prod::editing::replace: remplacer dans le champ' | trans }}</td>
                             <td>
                                 <select id="EditSRField" class="input-xlarge">
-                                    <option value="">{% trans 'prod::editing::replace: remplacer dans tous les champs' %}</option>
+                                    <option value="">{{ 'prod::editing::replace: remplacer dans tous les champs' | trans }}</option>
                                     {% for field in fields %}
                                         <option value="{{ field.get_id() }}">{{ field.get_label(app['locale.I18n']) }}</option>
                                     {% endfor %}
@@ -274,22 +274,22 @@
                             </td>
                         </tr>
                         <tr>
-                            <td valign="top">{% trans 'prod::editing:replace: chaine a rechercher' %}</td>
+                            <td valign="top">{{ 'prod::editing:replace: chaine a rechercher' | trans }}</td>
                             <td>
                                 <textarea id="EditSearch"></textarea>
                             </td>
                         </tr>
                         <tr>
-                            <td valign="top">{% trans 'prod::editing:remplace: chaine remplacante' %}</td>
+                            <td valign="top">{{ 'prod::editing:remplace: chaine remplacante' | trans }}</td>
                             <td>
                                 <textarea id="EditReplace"></textarea>
                             </td>
                         </tr>
                         <tr>
-                            <td valign="top">{% trans 'prod::editing:remplace: options de remplacement' %}</td>
+                            <td valign="top">{{ 'prod::editing:remplace: options de remplacement' | trans }}</td>
                             <td>
                                 <input type="checkbox" class="checkbox" id="EditSROptionRX" value="regexp" onchange="changeReplaceMode(this);">
-                                {% trans 'prod::editing:remplace::option : utiliser une expression reguliere' %}
+                                {{ 'prod::editing:remplace::option : utiliser une expression reguliere' | trans }}
                                 {% set help_link = 'https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression' %}
                                 {% if app['locale.I18n'] == 'de' %}
                                     {% set help_link = 'https://secure.wikimedia.org/wikipedia/de/wiki/Regul%C3%A4rer_Ausdruck' %}
@@ -299,33 +299,33 @@
                                     {% set help_link = 'https://secure.wikimedia.org/wikipedia/ar/wiki/%D8%AA%D8%B9%D8%A7%D8%A8%D9%8A%D8%B1_%D9%86%D9%85%D8%B7%D9%8A%D8%A9' %}
                                 {% endif %}
                                 <a href="{{help_link}}" target="_blank">
-                                    <img src="/skins/icons/help.png" title="{% trans 'Aide sur les expressions regulieres' %}"/>
+                                    <img src="/skins/icons/help.png" title="{{ 'Aide sur les expressions regulieres' | trans }}"/>
                                 </a>
                                 <br/>
                                 <br/>
                                 <div id="EditSR_RX" style="display:none">
                                     <input type="checkbox" class="checkbox" id="EditSR_RXG">
-                                    {% trans 'prod::editing:remplace::option: remplacer toutes les occurences' %}
+                                    {{ 'prod::editing:remplace::option: remplacer toutes les occurences' | trans }}
                                     <br/>
                                     <input type="checkbox" class="checkbox" id="EditSR_RXI">
-                                    {% trans 'prod::editing:remplace::option: rester insensible a la casse' %}
+                                    {{ 'prod::editing:remplace::option: rester insensible a la casse' | trans }}
                                 </div>
                                 <div id="EditSR_TX" style="display:block">
                                     <input type="radio" class="checkbox" name="EditSR_Where" value="exact">
-                                    {% trans 'prod::editing:remplace::option la valeur du cahmp doit etre exacte' %}
+                                    {{ 'prod::editing:remplace::option la valeur du cahmp doit etre exacte' | trans }}
                                     <br />
                                     <input type="radio" class="checkbox" name="EditSR_Where" value="inside" checked>
-                                    {% trans 'prod::editing:remplace::option la valeur est comprise dans le champ' %}
+                                    {{ 'prod::editing:remplace::option la valeur est comprise dans le champ' | trans }}
                                     <br />
                                     <input type="checkbox" class="checkbox" id="EditSR_case">
-                                    {% trans 'prod::editing:remplace::option respecter la casse' %}
+                                    {{ 'prod::editing:remplace::option respecter la casse' | trans }}
                                 </div>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="2" align="center">
                             <br />
-                            <input type="button" class='btn btn-inverse' value="{% trans 'boutton::valider' %}" onclick="replace(); return(false);" />
+                            <input type="button" class='btn btn-inverse' value="{{ 'boutton::valider' | trans }}" onclick="replace(); return(false);" />
                             <br />
                             </td>
                         </tr>
@@ -333,7 +333,7 @@
                 </div>
                 <div id='TH_Opresets'>
                     <div class="PNB10">
-                        <button class="adder btn btn-inverse">{% trans 'boutton::ajouter' %}</button>
+                        <button class="adder btn btn-inverse">{{ 'boutton::ajouter' | trans }}</button>
                     </div>
                     <ul style="top:50px;" class="PNB10 EDIT_presets_list"></ul>
                 </div>
@@ -342,8 +342,8 @@
     </div>
 
     <div id="buttonEditing">
-        <input type='button' value="{% trans 'boutton::valider' %}" class="btn btn-inverse btn-small" onclick="edit_applyMultiDesc(event);" />
-        <input type='button' value="{% trans 'boutton::annuler' %}" class="btn btn-inverse btn-small" onclick="edit_cancelMultiDesc(event);" />
+        <input type='button' value="{{ 'boutton::valider' | trans }}" class="btn btn-inverse btn-small" onclick="edit_applyMultiDesc(event);" />
+        <input type='button' value="{{ 'boutton::annuler' | trans }}" class="btn btn-inverse btn-small" onclick="edit_cancelMultiDesc(event);" />
     </div>
 
 </div>
@@ -354,35 +354,35 @@
         <br/>
         <br/>
         <br/>
-        <b><h4>{% trans 'prod::editing:indexation en cours' %}</h4></b>
+        <b><h4>{{ 'prod::editing:indexation en cours' | trans }}</h4></b>
         <span id='saveeditPbarI'></span> / <span id='saveeditPbarN'></span>
         <br/>
         <br/>
         <br/>
         <input type="hidden" name="edit-lst" id="edit_lst" value="{{ recordsRequest.serializedList() }}" />
         <input type='button' class='btn btn-inverse'
-            value="{% trans 'boutton::fermer' %}"
+            value="{{ 'boutton::fermer' | trans }}"
             onClick="$('#EDITWINDOW').fadeOut();hideOverlay(2);return(false);" />
     </center>
 </div>
 
-<div id="EDIT_CLOSEDIALOG" style="display:none;" title="{% trans 'boutton::fermer' %}">
-  {% trans 'prod::editing: valider ou annuler les modifications' %}
+<div id="EDIT_CLOSEDIALOG" style="display:none;" title="{{ 'boutton::fermer' | trans }}">
+  {{ 'prod::editing: valider ou annuler les modifications' | trans }}
 </div>
 
 <div style="display:none" id="Edit_copyPreset_dlg">
     <form onsubmit="return false;">
-        <span>{% trans 'edit::preset:: titre' %} :</span>
+        <span>{{ 'edit::preset:: titre' | trans }} :</span>
         <input class="EDIT_presetTitle" type="text" name="name" style="width:300px;">
         <div class="Edit_preset_item"></div>
     </form>
 </div>
 
-<div id="dialog-edit-many-sbas" title="{% trans 'Edition impossible' %}" style="display:none;">
+<div id="dialog-edit-many-sbas" title="{{ 'Edition impossible' | trans }}" style="display:none;">
     <p>
         <span class="ui-icon ui-icon-alert " style="float:left; margin:0 7px 50px 0;"></span>
         {% if multipleDataboxes %}
-            {% trans 'prod::edit: Impossible d\'editer simultanement des documents provenant de bases differentes' %}
+            {{ 'prod::edit: Impossible d\'editer simultanement des documents provenant de bases differentes' | trans }}
         {% elseif actionable == 0 %}
             {% trans %}prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants{% endtrans %}
         {% endif %}
@@ -412,7 +412,7 @@
         {% if not_actionable > 1 %}
             alert("{% trans %}prod::editing: {{not_actionable}} documents ne peuvent etre edites car vos droits sont induffisants{% endtrans %}");
         {% elseif not_actionable == 1 %}
-            alert("{% trans 'prod::editing: 1 document ne peut etre edite car vos droits sont induffisants' %}");
+            alert("{{ 'prod::editing: 1 document ne peut etre edite car vos droits sont induffisants' | trans }}");
         {% endif %}
         startThisEditing({{ databox.get_sbas_id }},{% if recordsRequest.isSingleStory() %}'GRP'{% else %}'LST'{% endif %},"",'');
     {% endif %}
diff --git a/templates/web/prod/actions/printer_default.html.twig b/templates/web/prod/actions/printer_default.html.twig
index 163888c34f..20f33069c7 100644
--- a/templates/web/prod/actions/printer_default.html.twig
+++ b/templates/web/prod/actions/printer_default.html.twig
@@ -4,32 +4,32 @@
         <div style="padding:10px;">
             {% if printer.get_count_actionable() > 0 %}
                 {% if printer.get_count_preview() > 0 %}
-                <h4>{% trans 'phraseanet:: preview' %}</h4>
+                <h4>{{ 'phraseanet:: preview' | trans }}</h4>
                 <div style="margin: 10px 0 20px 0; padding: 0 10px;">
                     <label for="RADI_PRE_LAB" class="radio">
                         <input type="radio" name="lay" value="preview" id="RADI_PRE_LAB" />
-                            {% trans 'print:: image de choix seulement' %}
+                            {{ 'print:: image de choix seulement' | trans }}
                     </label>
                     <label for="RADI_PRE_CAP" class="radio">
                         <input type="radio" name="lay" value="previewCaption" id="RADI_PRE_CAP" />
-                            {% trans 'print:: image de choix et description' %}
+                            {{ 'print:: image de choix et description' | trans }}
                     </label>
                     <label for="RADI_PRE_TDM" class="radio">
                         <input type="radio" name="lay" value="previewCaptionTdm" id="RADI_PRE_TDM" />
-                            {% trans 'print:: image de choix et description avec planche contact' %}
+                            {{ 'print:: image de choix et description avec planche contact' | trans }}
                     </label>
                 </div>
                 {% endif %}
                 {% if printer.get_count_thumbnail() > 0 %}
-                <h4>{% trans 'print:: imagette' %}</h4>
+                <h4>{{ 'print:: imagette' | trans }}</h4>
                 <div style="margin: 10px 0 20px 0; padding: 0 10px;">
                     <label for="RADI_PRE_THUM" class="radio">
                         <input type="radio" name="lay" value="thumbnailList" id="RADI_PRE_THUM" />
-                            {% trans 'print:: liste d\'imagettes' %}
+                            {{ 'print:: liste d\'imagettes' | trans }}
                     </label>
                     <label for="RADI_PRE_THUMGRI" class="radio">
                         <input type="radio" name="lay" checked value="thumbnailGrid" id="RADI_PRE_THUMGRI" />
-                            {% trans 'print:: planche contact (mosaique)' %}
+                            {{ 'print:: planche contact (mosaique)' | trans }}
                     </label>
                 </div>
                 {% endif %}
@@ -37,13 +37,13 @@
                 {% if printer.get_count_thumbnail() > 0 or printer.get_count_preview() > 0 %}
                     <div style="margin-bottom: 10px; text-align: center;">
                         <input type="hidden" name="lst" value="{{ printer.get_serialize_list }}" />
-                        <button type="submit" class="btn btn-inverse">{% trans 'boutton::imprimer' %}</button>
+                        <button type="submit" class="btn btn-inverse">{{ 'boutton::imprimer' | trans }}</button>
                     </div>
                 {% endif %}
             {% elseif printer.get_count_element_received() > 0 %}
-                {% trans 'None of the selected records can be printed' %}
+                {{ 'None of the selected records can be printed' | trans }}
             {% else %}
-                {% trans 'export:: erreur : aucun document selectionne' %}
+                {{ 'export:: erreur : aucun document selectionne' | trans }}
             {% endif %}
             </div>
         </div>
diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig
index e90668f5f6..ccfa994483 100644
--- a/templates/web/prod/actions/publish/publish.html.twig
+++ b/templates/web/prod/actions/publish/publish.html.twig
@@ -40,27 +40,27 @@
                     {% set desc = publishing.basket().getDescription() %}
                 {% endif %}
                 <input class="required_text checkbox" checked="checked" type="checkbox" name="notify" id="feed_add_notify" value="1" />
-                <label for="feed_add_notify">{% trans 'Notify users about this publication' %}</label><br/>
-                <label for="feed_add_title">{% trans 'publication : titre' %}</label>
+                <label for="feed_add_notify">{{ 'Notify users about this publication' | trans }}</label><br/>
+                <label for="feed_add_title">{{ 'publication : titre' | trans }}</label>
                 <input class="required_text" type="text" name="title" id="feed_add_title" value="{{title}}" />
-                <label for="feed_add_subtitle">{% trans 'publication : sous titre' %}</label>
+                <label for="feed_add_subtitle">{{ 'publication : sous titre' | trans }}</label>
                 <textarea id="feed_add_subtitle" name="subtitle">{{desc}}</textarea>
-                <label for="feed_add_author_name">{% trans 'publication : autheur' %}</label>
+                <label for="feed_add_author_name">{{ 'publication : autheur' | trans }}</label>
                 <input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ app['authentication'].getUser().get_display_name() }}" />
-                <label for="feed_add_author_mail">{% trans 'publication : email autheur' %}</label>
+                <label for="feed_add_author_mail">{{ 'publication : email autheur' | trans }}</label>
                 <input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ app['authentication'].getUser().get_email() }}" />
             </div>
         </div>
         <div class="PNB" style="width:50%;left:auto;">
             <div class="PNB10 feeds">
-                <h1>{% trans 'Fils disponibles' %}</h1>
+                <h1>{{ 'Fils disponibles' | trans }}</h1>
                 <div class="list">
                     {% for feed in feeds %}
                         {% if feed.isPublisher(app['authentication'].getUser()) %}
                             <div class="feed {% if loop.index is odd%}odd{% endif %}">
                                 <span>{{ feed.getTitle() }}</span>
                                 {% if feed.isPublic() %}
-                                    <img src="/skins/icons/ligth-on.png" title="{% trans 'This feed is public' %}"/>
+                                    <img src="/skins/icons/ligth-on.png" title="{{ 'This feed is public' | trans }}"/>
                                 {% endif %}
                                 <input type="hidden" name="feed_proposal[]" value="{{ feed.getId() }}"/>
                             </div>
@@ -73,8 +73,8 @@
     </div>
     <div class="PNB" style="top:auto; height:50px; text-align:center;">
         <div class="PNB10">
-            <button class="valid_form btn btn-inverse">{% trans 'boutton::publier' %}</button>
-            <button class="close_dialog btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+            <button class="valid_form btn btn-inverse">{{ 'boutton::publier' | trans }}</button>
+            <button class="close_dialog btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
         </div>
     </div>
 </form>
diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig
index 0008ab0f25..e5d013a20e 100644
--- a/templates/web/prod/actions/publish/publish_edit.html.twig
+++ b/templates/web/prod/actions/publish/publish_edit.html.twig
@@ -31,19 +31,19 @@
   <div class="PNB" style="top:200px;bottom:50px;">
     <div class="PNB" style="width:50%;right:auto;">
       <div class="PNB10 fields">
-        <div><label for="feed_add_title">{% trans 'publication : titre' %}</label></div>
+        <div><label for="feed_add_title">{{ 'publication : titre' | trans }}</label></div>
         <div><input class="required_text" type="text" name="title" id="feed_add_title" value="{{ entry.getTitle() }}" /></div>
-        <div><label for="feed_add_subtitle">{% trans 'publication : sous titre' %}</label></div>
+        <div><label for="feed_add_subtitle">{{ 'publication : sous titre' | trans }}</label></div>
         <div><textarea id="feed_add_subtitle" name="subtitle">{{ entry.getSubtitle() }}</textarea></div>
-        <div><label for="feed_add_author_name">{% trans 'publication : autheur' %}</label></div>
+        <div><label for="feed_add_author_name">{{ 'publication : autheur' | trans }}</label></div>
         <div><input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ entry.getAuthorName() }}" /></div>
-        <div><label for="feed_add_author_mail">{% trans 'publication : email autheur' %}</label></div>
+        <div><label for="feed_add_author_mail">{{ 'publication : email autheur' | trans }}</label></div>
         <div><input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ entry.getAuthorEmail() }}" /></div>
       </div>
     </div>
     <div class="PNB" style="width:50%;left:auto;">
       <div class="PNB10 feeds">
-        <h1>{% trans 'Fils disponibles' %}</h1>
+        <h1>{{ 'Fils disponibles' | trans }}</h1>
         <div class="list">
           {% set feed_id = entry.getFeed().getId() %}
           {% for feed in feeds %}
@@ -63,8 +63,8 @@
   </div>
   <div class="PNB" style="top:auto;height:50px;text-align:center;">
     <div class="PNB10">
-      <button class="valid_form btn btn-inverse">{% trans 'boutton::mettre a jour' %}</button>
-      <button class="close_dialog btn btn-inverse">{% trans 'boutton::annuler' %}</button>
+      <button class="valid_form btn btn-inverse">{{ 'boutton::mettre a jour' | trans }}</button>
+      <button class="close_dialog btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
     </div>
   </div>
 </form>
diff --git a/templates/web/prod/feeds/entry_macro.html.twig b/templates/web/prod/feeds/entry_macro.html.twig
index cba0e2d12f..04834e3a2a 100644
--- a/templates/web/prod/feeds/entry_macro.html.twig
+++ b/templates/web/prod/feeds/entry_macro.html.twig
@@ -21,10 +21,10 @@
         <td style="width:60px;text-align:right;">
           {% if entry.getFeed().isOwner(app['authentication'].getUser()) or entry.isPublisher(app['authentication'].getUser()) %}
           <a class="tools options feed_edit" href="{{ path('prod_feeds_entry_update', { 'id' : entry.getId() }) }}">
-            <img src="/skins/icons/file-edit.png" title="{% trans 'boutton::editer' %}"/>
+            <img src="/skins/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}"/>
           </a>
           <a class="tools feed_delete" href="{{ path('prod_feeds_entry_delete', { 'id' : entry.getId() }) }}">
-            <img src="/skins/icons/delete.png" title="{% trans 'boutton::supprimer' %}"/>
+            <img src="/skins/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}"/>
           </a>
           {% endif %}
         </td>
diff --git a/templates/web/prod/feeds/feeds.html.twig b/templates/web/prod/feeds/feeds.html.twig
index f3c5fa6605..f192ce1c66 100644
--- a/templates/web/prod/feeds/feeds.html.twig
+++ b/templates/web/prod/feeds/feeds.html.twig
@@ -12,20 +12,20 @@
                                  /custom/feed_{{ feed.getId() }}.jpg
                                  {% endif %}" style="height:32px;"/>
                         {% if feed.isAggregated %}
-                            {% trans 'Toutes les publications' %}
+                            {{ 'Toutes les publications' | trans }}
                             <a class="feed_reload ajax_answers no_scroll" href="{{ path('prod_feeds') }}" >
-                                <img src="/skins/icons/reload.png" title="{% trans 'rafraichir' %}" />
+                                <img src="/skins/icons/reload.png" title="{{ 'rafraichir' | trans }}" />
                             </a>
                         {% else %}
                             {{ feed.getTitle() }}
                             <a class="feed_reload ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : feed.getId() }) }}" >
-                                <img src="/skins/icons/reload.png" title="{% trans 'rafraichir' %}" />
+                                <img src="/skins/icons/reload.png" title="{{ 'rafraichir' | trans }}" />
                             </a>
                         {% endif %}
                         {% if feed.isAggregated %}
-                            <a class="subscribe_rss" href="{{ path('prod_feeds_subscribe_aggregated') }}">{% trans 'publications:: s\'abonner aux publications' %}</a>
+                            <a class="subscribe_rss" href="{{ path('prod_feeds_subscribe_aggregated') }}">{{ 'publications:: s\'abonner aux publications' | trans }}</a>
                         {% else %}
-                            <a class="subscribe_rss" href="{{ path('prod_feeds_subscribe_feed', { 'id' : feed.getId() }) }}">{% trans 'publications:: s\'abonner aux publications' %}</a>
+                            <a class="subscribe_rss" href="{{ path('prod_feeds_subscribe_feed', { 'id' : feed.getId() }) }}">{{ 'publications:: s\'abonner aux publications' | trans }}</a>
                         {% endif %}
                     </h1>
                 </td>
@@ -33,7 +33,7 @@
                     <div class="menu_feeds">
                         <div class="btn-group">
                             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-                                {% trans 'Aller a' %}
+                                {{ 'Aller a' | trans }}
                                 <span class="caret"></span>
                             </button>
                             <ul class="submenu dropdown-menu">
@@ -64,7 +64,7 @@
         {{ _entry.format(feed, entry) }}
     {% endfor %}
     {% if entries|length == 0 %}
-        <p>{% trans 'Aucune entree pour le moment' %}</p>
+        <p>{{ 'Aucune entree pour le moment' | trans }}</p>
     {% endif %}
 
     {% if feed.getCountTotalEntries() > (page*5) %}
@@ -72,11 +72,11 @@
         <div class="see_more">
             {% if feed.isAggregated() %}
                 <a href="{{ path('prod_feeds', { page : next_page }) }}" class="ajax_answers append">
-                    {% trans 'charger d\'avantage de publications' %}
+                    {{ 'charger d\'avantage de publications' | trans }}
                 </a>
             {% else %}
                 <a href="{{ path('prod_feeds_feed', { 'id' : feed.getId(), 'page' : next_page }) }}" class="ajax_answers append">
-                    {% trans 'charger d\'avantage de publications' %}
+                    {{ 'charger d\'avantage de publications' | trans }}
                 </a>
             {% endif %}
         </div>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index d9a4db5a64..9cc695274a 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -115,7 +115,7 @@
     <div style="position:absolute; top:0; left:0; right:0; bottom:0; background-color:#1a1a1a; z-index:32766;">
         <div id="loader" style="top:200px; margin:0 auto; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; background-color:#CCCCCC; position:relative; margin:0 auto; text-align:center; width:400px; height:100px; padding:20px; z-index:32767;">
             <div style="margin:0 10px 10px; font-family:Helvetica,Arial,sans-serif; font-size:18px; color:#1A1A1A; text-align:left;">Phraseanet</div>
-            <div style="text-align:center;">{% trans 'Chargement' %}</div>
+            <div style="text-align:center;">{{ 'Chargement' | trans }}</div>
             <div style="width:220px; height:19px; margin:20px auto;">
                 <div id="loader_bar" style="height:19px;width:10%;background-image:url(/skins/icons/main-loader.gif)"></div>
             </div>
@@ -141,19 +141,19 @@
                         {% if GV_thesaurus %}
                         <li class="proposals_WZ">
                             <a href="#proposals" class="WZtabs">
-                                <img class="proposals_off" src="/skins/icons/proposition_off32.png" title="{% trans 'phraseanet:: propositions' %}"/>
-                                <img class="proposals_on" src="/skins/icons/proposition_on32.png" title="{% trans 'phraseanet:: propositions' %}"/>
+                                <img class="proposals_off" src="/skins/icons/proposition_off32.png" title="{{ 'phraseanet:: propositions' | trans }}"/>
+                                <img class="proposals_on" src="/skins/icons/proposition_on32.png" title="{{ 'phraseanet:: propositions' | trans }}"/>
                             </a>
                         </li>
                         <li>
                             <a href="#thesaurus_tab" class="WZtabs">
-                                <img src="/skins/icons/thesaurus_32.png" title="{% trans 'phraseanet:: thesaurus' %}"/>
+                                <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
                             </a>
                         </li>
                         {% endif %}
                         <li style="float:right;">
                             <a href="#" class="escamote" style="margin:8px 0;">
-                                <img src="/skins/icons/workzoneEscamote.png" title="{% trans 'Close the WorkZone' %}"/>
+                                <img src="/skins/icons/workzoneEscamote.png" title="{{ 'Close the WorkZone' | trans }}"/>
                             </a>
                         </li>
                     </ul>
@@ -168,9 +168,9 @@
                     <div id="thesaurus_tab" class="PNB" style="top:52px;">
                         <div id="THPD_tabs">
                             <ul>
-                                <li class="th_tab"><a href="#THPD_T"><span>{% trans 'prod::thesaurusTab:thesaurus' %}</span></a></li>
+                                <li class="th_tab"><a href="#THPD_T"><span>{{ 'prod::thesaurusTab:thesaurus' | trans }}</span></a></li>
                                 {% if app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus') %}
-                                    <li class="th_tab"><a href="#THPD_C"><span>{% trans 'prod::thesaurusTab:candidats' %}</span></a></li>
+                                    <li class="th_tab"><a href="#THPD_C"><span>{{ 'prod::thesaurusTab:candidats' | trans }}</span></a></li>
                                 {% endif %}
                             </ul>
                             <div class="ui-tabs-panels-container">
@@ -180,16 +180,16 @@
                                             <!-- empty wizard -->
                                         </div>
                                         <div class="wizard wiz_1" style="display:none">
-                                            <div class="txt">{% trans 'prod::thesaurusTab:wizard:accepter le terme candidat' %}</div>
+                                            <div class="txt">{{ 'prod::thesaurusTab:wizard:accepter le terme candidat' | trans }}</div>
                                         </div>
                                         <div class="wizard wiz_2" style="display:none">
-                                            <div class="txt">{% trans 'prod::thesaurusTab:wizard:remplacer par le terme' %}</div>
+                                            <div class="txt">{{ 'prod::thesaurusTab:wizard:remplacer par le terme' | trans }}</div>
                                         </div>
                                         <form class="gform form-inline" onsubmit="T_Gfilter(this);return(false);">
                                             <div class="input-append">
                                                 <input type="text" name="search_value" class="input-medium" onkeyup="T_Gfilter_delayed(this.value, 300);" />
-                                                <input type="submit" class="th_ok btn" value="{% trans 'boutton::rechercher' %}" />
-                                                <input type="button" class="th_cancel btn" value="{% trans 'boutton::annuler' %}" onclick="thesauCancelWizard();return(false);"/>
+                                                <input type="submit" class="th_ok btn" value="{{ 'boutton::rechercher' | trans }}" />
+                                                <input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}" onclick="thesauCancelWizard();return(false);"/>
                                              </div>
                                         </form>
                                     </div>
@@ -201,7 +201,7 @@
                                                     <li id="TX_P.{{base['sbas_id']}}.T" class="expandable{% if loop.last %} last{% endif %}">
                                                         <div class="hitarea expandable-hitarea"></div>
                                                         <span>{{base['sbas_id']|sbas_labels(app)}}</span>
-                                                        <ul style="display:none">{% trans 'chargement' %}</ul>
+                                                        <ul style="display:none">{{ 'chargement' | trans }}</ul>
                                                     </li>
                                                     {% endif %}
                                                 {% endfor %}
@@ -219,7 +219,7 @@
                                                     <li id="CX_P.{{base['sbas_id']}}.C" class="expandable{% if loop.last %} last{% endif %}">
                                                         <div class="hitarea expandable-hitarea"></div>
                                                         <span>{{base['sbas_id']|sbas_labels(app)}}</span>
-                                                        <ul style="display:none">{% trans 'chargement' %}</ul>
+                                                        <ul style="display:none">{{ 'chargement' | trans }}</ul>
                                                     </li>
                                                     {% endif %}
                                                 {% endfor %}
@@ -238,40 +238,40 @@
                 <ul style="list-style-type:none;margin:0;padding:0">
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner">
-                            <a title="{% trans 'action:: nouveau panier' %}" class="dialog small-dialog" href="{{ path('prod_baskets_create') }}">
-                                <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau panier' %}" />
-                                {% trans 'action:: nouveau panier' %}
+                            <a title="{{ 'action:: nouveau panier' | trans }}" class="dialog small-dialog" href="{{ path('prod_baskets_create') }}">
+                                <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{{ 'action:: nouveau panier' | trans }}" />
+                                {{ 'action:: nouveau panier' | trans }}
                             </a>
                         </div>
                         <div class="context-menu-item-inner">
-                            <a title="{% trans 'Browse Baskets' %}" class="dialog" href="{{ path('prod_workzone_browse') }}">
-                                {% trans 'Browse Baskets' %}
+                            <a title="{{ 'Browse Baskets' | trans }}" class="dialog" href="{{ path('prod_workzone_browse') }}">
+                                {{ 'Browse Baskets' | trans }}
                             </a>
                         </div>
                         {% if app['phraseanet.registry'].get('GV_multiAndReport') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
                             <div class="context-menu-item-inner">
-                                <a title="{% trans 'action:: nouveau reportage' %}" class="dialog small-dialog" href="{{ path('prod_stories_create') }}">
-                                    <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau reportage' %}" />
-                                    {% trans 'action:: nouveau reportage' %}
+                                <a title="{{ 'action:: nouveau reportage' | trans }}" class="dialog small-dialog" href="{{ path('prod_stories_create') }}">
+                                    <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{{ 'action:: nouveau reportage' | trans }}" />
+                                    {{ 'action:: nouveau reportage' | trans }}
                                 </a>
                             </div>
                        {% endif %}
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner" onclick="return p4.WorkZone.refresh('current','date');">
-                            <img style="cursor:pointer;" src="/skins/icons/cal.png" title="{% trans 'phraseanet:: tri par date' %}" />
-                            {% trans 'phraseanet:: tri par date' %}
+                            <img style="cursor:pointer;" src="/skins/icons/cal.png" title="{{ 'phraseanet:: tri par date' | trans }}" />
+                            {{ 'phraseanet:: tri par date' | trans }}
                         </div>
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner" onclick="return p4.WorkZone.refresh('current','name');">
-                            <img style="cursor:pointer;" src="/skins/icons/alpha.png" title="{% trans 'phraseanet:: tri par nom' %}" />
-                            {% trans 'phraseanet:: tri par nom' %}
+                            <img style="cursor:pointer;" src="/skins/icons/alpha.png" title="{{ 'phraseanet:: tri par nom' | trans }}" />
+                            {{ 'phraseanet:: tri par nom' | trans }}
                         </div>
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner" onclick="basketPrefs();">
-                            {% trans 'Preferences' %}
+                            {{ 'Preferences' | trans }}
                         </div>
                     </li>
                 </ul>
@@ -285,31 +285,31 @@
                         <div class="input-append">
                             <input autocomplete="off" class="search query" id="EDIT_query" name="qry" type="text" name="qry" value="{{app['authentication'].getUser().getPrefs('start_page_query')}}">
                             <a href="#" class="btn btn-inverse adv_trigger adv_search_button">
-                                <img src="/skins/icons/settings.png" title="{% trans 'Advanced Search' %}"/>
+                                <img src="/skins/icons/settings.png" title="{{ 'Advanced Search' | trans }}"/>
                             </a>
-                            <button type="submit" class="btn btn-inverse" style="font-size:14px">{% trans 'boutton::rechercher' %}</button>
+                            <button type="submit" class="btn btn-inverse" style="font-size:14px">{{ 'boutton::rechercher' | trans }}</button>
                         </div>
                         <div class="control-group" style="margin:5px;">
                             <div class="controls">
                                 {% if GV_multiAndReport %}
                                     <label for="mode_type_doc" class="radio inline">
                                         <input type="radio" value="0" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
-                                        {% trans 'phraseanet::type:: documents' %}
+                                        {{ 'phraseanet::type:: documents' | trans }}
                                     </label>
                                     <label for="mode_type_reg" class="radio inline">
                                         <input type="radio" value="1" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type != 0 %}checked="checked"{% endif %} id="mode_type_reg"/>
-                                        {% trans 'phraseanet::type:: reportages' %}
+                                        {{ 'phraseanet::type:: reportages' | trans }}
                                     </label>
                                 {% else %}
                                     <input type="hidden" value="0" name="search_type" />
                                 {% endif %}
                                 <select name="record_type" id="recordtype_sel" class="input-small">
-                                    <option value="">{% trans 'Tout type' %}</option>
-                                    <option value="image">{% trans 'Image' %}</option>
-                                    <option value="video">{% trans 'Video' %}</option>
-                                    <option value="audio">{% trans 'Audio' %}</option>
-                                    <option value="document">{% trans 'Document' %}</option>
-                                    <option value="flash">{% trans 'Flash' %}</option>
+                                    <option value="">{{ 'Tout type' | trans }}</option>
+                                    <option value="image">{{ 'Image' | trans }}</option>
+                                    <option value="video">{{ 'Video' | trans }}</option>
+                                    <option value="audio">{{ 'Audio' | trans }}</option>
+                                    <option value="document">{{ 'Document' | trans }}</option>
+                                    <option value="flash">{{ 'Flash' | trans }}</option>
                                 </select>
                             </div>
                         </div>
@@ -323,9 +323,9 @@
                                         <div class="sbasglob">
                                             <div class="btn-toolbar">
                                                 <input class="btn btn-inverse" type="button"
-                                                    value="{% trans 'boutton:: selectionner toutes les bases' %}" onclick="checkBases(true);" />
+                                                    value="{{ 'boutton:: selectionner toutes les bases' | trans }}" onclick="checkBases(true);" />
                                                 <input class="btn btn-inverse" type="button"
-                                                    value="{% trans 'boutton:: selectionner aucune base' %}" onclick="checkBases(false);" />
+                                                    value="{{ 'boutton:: selectionner aucune base' | trans }}" onclick="checkBases(false);" />
                                             </div>
                                             {{_self.bas_list(module_prod, search_datas)}}
                                         </div>
@@ -333,10 +333,10 @@
                                     <td style="width:50%; vertical-align:top;">
                                         <div id="sbasfiltercont">
                                             <div  class="btn-toolbar">
-                                                <input class="btn btn-inverse" type="button" value="{% trans 'Re-initialiser' %}" onclick="reset_adv_search();" />
+                                                <input class="btn btn-inverse" type="button" value="{{ 'Re-initialiser' | trans }}" onclick="reset_adv_search();" />
                                             </div>
 
-                                            <span>{% trans 'Trier par ' %}</span>
+                                            <span>{{ 'Trier par ' | trans }}</span>
                                             <select name="sort" class="input-small">
                                                 {% for sort, sort_name in app['phraseanet.SE'].getAvailableSort() %}
                                                 <option value="{{ sort }}" {% if sort == app['phraseanet.SE'].getDefaultSort() %}selected="selected" class="default-selection"{% endif %}>{{ sort_name }}</option>
@@ -350,14 +350,14 @@
                                             {% if app['phraseanet.SE'].hasStemming() and app['phraseanet.SE'].isStemmingEnabled() %}
                                             <div>
                                                 <label class="checkbox">
-                                                     <input type="checkbox" checked="checked" name="stemme" /> {% trans 'rechercher par stemme' %}
+                                                     <input type="checkbox" checked="checked" name="stemme" /> {{ 'rechercher par stemme' | trans }}
                                                 </label>
                                             </div>
                                             {% endif %}
                                             <div class="field_filter">
-                                                <span>{% trans 'Les termes apparaissent dans le(s) champs' %}</span>
+                                                <span>{{ 'Les termes apparaissent dans le(s) champs' | trans }}</span>
                                                 <select size="8" multiple onchange="checkFilters(true);" name="fields[]" style="vertical-align:middle; width:99%;">
-                                                    <option value="phraseanet--all--fields">{% trans 'rechercher dans tous les champs' %}</option>
+                                                    <option value="phraseanet--all--fields">{{ 'rechercher dans tous les champs' | trans }}</option>
                                                     {% for field_id, field in search_datas['fields'] %}
                                                         {% if field['type'] != 'date' %}
                                                             <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
@@ -370,7 +370,7 @@
                                             {% if status_length > 0 %}
                                                 <hr />
                                                 <div class="status_filter">
-                                                    <span>{% trans 'Status des documents a rechercher' %}</span>
+                                                    <span>{{ 'Status des documents a rechercher' | trans }}</span>
                                                     <table style="width: 100%;">
                                                         {% for n, stat in search_status %}
                                                             {% for s in stat %}
@@ -409,7 +409,7 @@
                                                 <div class="date_filter">
                                                     <table>
                                                         <tr>
-                                                            <td colspan="2">{% trans 'Rechercher dans un champ date' %}</td>
+                                                            <td colspan="2">{{ 'Rechercher dans un champ date' | trans }}</td>
                                                             <td colspan="2">
                                                                 <select name="date_field" class="input-medium">
                                                                     {% for field in app['phraseanet.SE'].getAvailableDateFields() %}
@@ -417,20 +417,20 @@
                                                                             class="" value="{{ field }}">{{ field }}</option>
                                                                     {% endfor %}
                                                                     <option value="{{ app['phraseanet.SE'].getAvailableDateFields()|join('|') }}" selected="selected">
-                                                                        {% trans 'rechercher dans tous les champs' %}
+                                                                        {{ 'rechercher dans tous les champs' | trans }}
                                                                     </option>
                                                                 </select>
                                                             </td>
                                                         </tr>
                                                         <tr>
-                                                            <td>{% trans 'phraseanet::time:: de' %}</td>
+                                                            <td>{{ 'phraseanet::time:: de' | trans }}</td>
                                                             <td style="padding-right: 5px;">
                                                                 <div class="input-prepend">
                                                                     <span class="add-on"><i class="icon-calendar"></i></span>
                                                                     <input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_min" placeholder="YYYY/MM/DD" style="margin: 0;position: relative; z-index: 10001;" />
                                                                 </div>
                                                             </td>
-                                                            <td>{% trans 'phraseanet::time:: a' %}</td>
+                                                            <td>{{ 'phraseanet::time:: a' | trans }}</td>
                                                             <td>
                                                                 <div class="input-prepend">
                                                                     <span class="add-on"><i class="icon-calendar"></i></span>
@@ -476,37 +476,37 @@
                             <ul class="dropdown-menu">
                                 <li>
                                     <a class="answer_selector all_selector">
-                                        {% trans 'reponses:: selectionner tout' %}
+                                        {{ 'reponses:: selectionner tout' | trans }}
                                     </a>
                                 </li>
                                 <li class="divider"></li>
                                 <li>
                                     <a class="answer_selector none_selector">
-                                        {% trans 'reponses:: selectionner rien' %}
+                                        {{ 'reponses:: selectionner rien' | trans }}
                                     </a>
                                 </li>
                                 <li class="divider"></li>
                                 <li>
                                     <a class="answer_selector image_selector">
-                                        {% trans 'phraseanet::type:: images' %}
+                                        {{ 'phraseanet::type:: images' | trans }}
                                     </a>
                                 </li>
                                 <li class="divider"></li>
                                 <li>
                                     <a class="answer_selector document_selector">
-                                        {% trans 'phraseanet::type:: documents' %}
+                                        {{ 'phraseanet::type:: documents' | trans }}
                                     </a>
                                 </li>
                                 <li class="divider"></li>
                                 <li>
                                     <a class="answer_selector video_selector">
-                                        {% trans 'phraseanet::type:: videos' %}
+                                        {{ 'phraseanet::type:: videos' | trans }}
                                     </a>
                                 </li>
                                 <li class="divider"></li>
                                 <li>
                                     <a class="answer_selector audio_selector">
-                                        {% trans 'phraseanet::type:: audios' %}
+                                        {{ 'phraseanet::type:: audios' | trans }}
                                     </a>
                                 </li>
                             </ul>
@@ -516,14 +516,14 @@
                     <span class="dropdownButton">
                         <div class="btn-group">
                             <button class="default_action TOOL_disktt_btn results_window btn btn-inverse">
-                                <img src="/skins/prod/000000/images/disktt_history.gif" height="16" width="16" /> {% trans 'action : exporter' %}
+                                <img src="/skins/prod/000000/images/disktt_history.gif" height="16" width="16" /> {{ 'action : exporter' | trans }}
                             </button>
                             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                             <ul class="dropdown-menu">
                                 <li>
                                     <a class="TOOL_print_btn results_window">
                                         <img src="/skins/prod/000000/images/print_history.gif" height="16" width="16" />
-                                        {% trans 'action : print' %}
+                                        {{ 'action : print' | trans }}
                                     </a>
                                 </li>
                             </ul>
@@ -533,19 +533,19 @@
                     {% set actions = {} %}
                     {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %}
                         {% set label %}
-                            {% trans 'action : editer' %}
+                            {{ 'action : editer' | trans }}
                         {% endset %}
                         {% set actions = actions|merge( { 'edit' : {'icon': "/skins/prod/000000/images/ppen_history.gif", 'class':'TOOL_ppen_btn', 'label' : label} }) %}
                     {% endif %}
                     {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
                         {% set label %}
-                            {% trans 'action : status' %}
+                            {{ 'action : status' | trans }}
                         {% endset %}
                         {% set actions = actions|merge( { 'status' : {'icon': "/skins/prod/000000/images/chgstatus_history.gif", 'class':'TOOL_chgstatus_btn', 'label' : label} }) %}
                     {% endif %}
                     {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
                         {% set label %}
-                            {% trans 'action : collection' %}
+                            {{ 'action : collection' | trans }}
                         {% endset %}
                         {% set actions = actions|merge( { 'move' : {'icon': "/skins/prod/000000/images/chgcoll_history.gif", 'class':'TOOL_chgcoll_btn', 'label' : label} }) %}
                     {% endif %}
@@ -595,28 +595,28 @@
                         <span class="dropdownButton">
                             <div class="btn-group">
                                 <button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse">
-                                    <img src="/skins/icons/push16.png" height="16" width="16" /> {% trans 'action : push' %}
+                                    <img src="/skins/icons/push16.png" height="16" width="16" /> {{ 'action : push' | trans }}
                                 </button>
                                 <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                                 <ul class="dropdown-menu">
                                     <li>
                                         <a class="TOOL_feedback_btn results_window">
                                             <img src="/skins/icons/feedback16.png" height="16" width="16" />
-                                            {% trans 'Feedback' %}
+                                            {{ 'Feedback' | trans }}
                                         </a>
                                     </li>
                                     <li class="divider"></li>
                                     <li>
                                         <a class="TOOL_bridge_btn results_window">
                                             <img src="/skins/icons/door.png" height="16" width="16" />
-                                            {% trans 'action : bridge' %}
+                                            {{ 'action : bridge' | trans }}
                                         </a>
                                     </li>
                                     <li class="divider"></li>
                                     <li>
                                         <a class="TOOL_publish_btn results_window">
                                             <img src="/skins/icons/rss16.png" height="16" width="16" />
-                                            {% trans 'action : publier' %}
+                                            {{ 'action : publier' | trans }}
                                         </a>
                                     </li>
                                 </ul>
@@ -626,14 +626,14 @@
                         <span class="dropdownButton">
                             <div class="btn-group">
                                 <button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" >
-                                    <img src="/skins/icons/push16.png" height="16" width="16" /> {% trans 'action : push' %}
+                                    <img src="/skins/icons/push16.png" height="16" width="16" /> {{ 'action : push' | trans }}
                                 </button>
                                 <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                                 <ul class="submenu dropdown-menu">
                                     <li>
                                         <a class="TOOL_feedback_btn results_window">
                                             <img src="/skins/icons/feedback16.png" height="16" width="16" />
-                                            {% trans 'Feedback' %}
+                                            {{ 'Feedback' | trans }}
                                         </a>
                                     </li>
                                 </ul>
@@ -643,14 +643,14 @@
                         <span class="dropdownButton">
                             <div class="btn-group">
                                 <button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" >
-                                    <img src="/skins/icons/door.png" height="16" width="16" /> {% trans 'action : bridge' %}
+                                    <img src="/skins/icons/door.png" height="16" width="16" /> {{ 'action : bridge' | trans }}
                                 </button>
                                 <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                                 <ul class="submenu dropdown-menu">
                                     <li>
                                         <a class="TOOL_publish_btn results_window">
                                             <img src="/skins/icons/rss16.png" height="16" width="16" />
-                                            {% trans 'action : publier' %}
+                                            {{ 'action : publier' | trans }}
                                         </a>
                                     </li>
                                 </ul>
@@ -662,7 +662,7 @@
                         <span class="classicButton">
                             <div class="btn-group">
                                 <button class="TOOL_imgtools_btn results_window btn btn-inverse" >
-                                    <img src="/skins/prod/000000/images/imgtools_history.gif" height="16" width="16" /> {% trans 'action : outils' %}
+                                    <img src="/skins/prod/000000/images/imgtools_history.gif" height="16" width="16" /> {{ 'action : outils' | trans }}
                                 </button>
                             </div>
                         </span>
@@ -671,7 +671,7 @@
                         <span class="classicButton">
                             <div class="btn-group">
                                 <button class="TOOL_trash_btn results_window btn btn-inverse" >
-                                    <img src="/skins/icons/delete.png" height="16" width="16" /> {% trans 'action : supprimer' %}
+                                    <img src="/skins/icons/delete.png" height="16" width="16" /> {{ 'action : supprimer' | trans }}
                                 </button>
                             </div>
                         </span>
@@ -694,7 +694,7 @@
                     <table>
                         <tr>
                             <td class="infos">
-                                <a href="#" onclick="lookBox(this,event);return false;">{% trans 'Preferences' %} </a>
+                                <a href="#" onclick="lookBox(this,event);return false;">{{ 'Preferences' | trans }} </a>
                                 |
                                 <span id="tool_results">
 
@@ -741,44 +741,44 @@
     <div id="MESSAGE-push"></div>
     <div id="MESSAGE-publi"></div>
     <div id="DIALOG"></div>
-    <div id="keyboard-dialog" class="{% if app['authentication'].getUser().getPrefs('keyboard_infos') != '0' %}auto{% endif %}" style="display:none;" title="{% trans 'raccourci :: a propos des raccourcis claviers' %}">
+    <div id="keyboard-dialog" class="{% if app['authentication'].getUser().getPrefs('keyboard_infos') != '0' %}auto{% endif %}" style="display:none;" title="{{ 'raccourci :: a propos des raccourcis claviers' | trans }}">
         <div>
-            <h1>{% trans 'Raccourcis claviers en cours de recherche : ' %}</h1>
+            <h1>{{ 'Raccourcis claviers en cours de recherche : ' | trans }}</h1>
             <ul>
-                <li>{% trans 'Raccourcis:: ctrl-a : tout selectionner ' %}</li>
-                <li>{% trans 'Raccourcis:: ctrl-p : imprimer la selection ' %}</li>
-                <li>{% trans 'Raccourcis:: ctrl-e : editer la selection ' %}</li>
-                <li>{% trans 'Raccourcis::fleche gauche : page precedente ' %}</li>
-                <li>{% trans 'Raccourcis::fleche droite : page suivante ' %}</li>
-                <li>{% trans 'Raccourcis::fleche haut : scroll vertical ' %}</li>
-                <li>{% trans 'Raccourcis::fleche bas : scroll vertical ' %}</li>
+                <li>{{ 'Raccourcis:: ctrl-a : tout selectionner ' | trans }}</li>
+                <li>{{ 'Raccourcis:: ctrl-p : imprimer la selection ' | trans }}</li>
+                <li>{{ 'Raccourcis:: ctrl-e : editer la selection ' | trans }}</li>
+                <li>{{ 'Raccourcis::fleche gauche : page precedente ' | trans }}</li>
+                <li>{{ 'Raccourcis::fleche droite : page suivante ' | trans }}</li>
+                <li>{{ 'Raccourcis::fleche haut : scroll vertical ' | trans }}</li>
+                <li>{{ 'Raccourcis::fleche bas : scroll vertical ' | trans }}</li>
             </ul>
         </div>
         <div>
-            <h1>{% trans 'Raccourcis claviers de la zone des paniers : ' %}</h1>
+            <h1>{{ 'Raccourcis claviers de la zone des paniers : ' | trans }}</h1>
             <ul>
-                <li>{% trans 'Raccourcis:: ctrl-a : tout selectionner ' %}</li>
-                <li>{% trans 'Raccourcis:: ctrl-p : imprimer la selection ' %}</li>
-                <li>{% trans 'Raccourcis:: ctrl-e : editer la selection ' %}</li>
+                <li>{{ 'Raccourcis:: ctrl-a : tout selectionner ' | trans }}</li>
+                <li>{{ 'Raccourcis:: ctrl-p : imprimer la selection ' | trans }}</li>
+                <li>{{ 'Raccourcis:: ctrl-e : editer la selection ' | trans }}</li>
             </ul>
         </div>
         <div>
-            <h1>{% trans 'Raccourcis claviers en cours de editing : ' %}</h1>
+            <h1>{{ 'Raccourcis claviers en cours de editing : ' | trans }}</h1>
             <ul>
-                <li>{% trans 'Raccourcis::tab/shift-tab se ballade dans les champs ' %}</li>
+                <li>{{ 'Raccourcis::tab/shift-tab se ballade dans les champs ' | trans }}</li>
             </ul>
         </div>
         <div>
-            <h1>{% trans 'Raccourcis claviers en cours de preview : ' %}</h1>
+            <h1>{{ 'Raccourcis claviers en cours de preview : ' | trans }}</h1>
             <ul>
-                <li>{% trans 'Raccourcis::fleche gauche : en avant ' %}</li>
-                <li>{% trans 'Raccourcis::fleche gauche : en arriere ' %}</li>
-                <li>{% trans 'Raccourcis::espace : arreter/demarrer le diaporama ' %}</li>
+                <li>{{ 'Raccourcis::fleche gauche : en avant ' | trans }}</li>
+                <li>{{ 'Raccourcis::fleche gauche : en arriere ' | trans }}</li>
+                <li>{{ 'Raccourcis::espace : arreter/demarrer le diaporama ' | trans }}</li>
             </ul>
         </div>
         <div>
             <ul>
-                <li>{% trans 'Vous pouvez quitter la plupart des fenetres survolantes via la touche echap ' %}</li>
+                <li>{{ 'Vous pouvez quitter la plupart des fenetres survolantes via la touche echap ' | trans }}</li>
             </ul>
         </div>
         <div>
@@ -786,7 +786,7 @@
                 <li>
                     <label class="checkbox" for="keyboard-stop">
                         <input id="keyboard-stop" type="checkbox"/>
-                        {% trans 'raccourcis :: ne plus montrer cette aide' %}
+                        {{ 'raccourcis :: ne plus montrer cette aide' | trans }}
                     </label>
                 </li>
             </ul>
@@ -795,81 +795,81 @@
 
     {{cgus_agreement|raw}}
 
-    <div style="display:none;position:relative;" id="look_box" title="{% trans 'Preferences' %}" >
+    <div style="display:none;position:relative;" id="look_box" title="{{ 'Preferences' | trans }}" >
         <div class="tabs">
             <ul>
-                <li><a href="#look_box_screen">{% trans 'Affichage' %}</a></li>
-                <li><a href="#look_box_settings">{% trans 'Configuration' %}</a></li>
+                <li><a href="#look_box_screen">{{ 'Affichage' | trans }}</a></li>
+                <li><a href="#look_box_settings">{{ 'Configuration' | trans }}</a></li>
             </ul>
             <div id="look_box_screen">
                 <div class="box">
                     <div class="" style="float:left; width:49%;">
-                        <h1>{% trans 'Mode de presentation' %}</h1>
+                        <h1>{{ 'Mode de presentation' | trans }}</h1>
                         {% set mod = app['authentication'].getUser().getPrefs('view') %}
                         <label class="radio inline" for="thumbs_view">
                             <input onchange="setPref('view',$(this).val());" name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio" value="thumbs" id="thumbs_view" {% if mod == 'thumbs' %}checked="checked"{% endif %}/>
-                            {% trans 'reponses:: mode vignettes' %}
+                            {{ 'reponses:: mode vignettes' | trans }}
                         </label>
                         <label class="radio inline" for="list_view">
                             <input onchange="setPref('view',$(this).val());" name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio" value="list" id="list_view" {% if mod == 'list' %}checked="checked"{% endif %}/>
-                            {% trans 'reponses:: mode liste' %}
+                            {{ 'reponses:: mode liste' | trans }}
                         </label>
                     </div>
                     <div style="float:right; width:49%;">
-                        <h1>{% trans 'Theme' %}</h1>
+                        <h1>{{ 'Theme' | trans }}</h1>
                         {% for color, file in css %}
-                            <div title="{% trans 'Selecteur de theme' %}" class="colorpicker_box"
+                            <div title="{{ 'Selecteur de theme' | trans }}" class="colorpicker_box"
                                 onclick="setCss('{{color}}');" style="width:16px;height:16px;background-color:{{ '#' ~ color ~ ';' }}">&nbsp;</div>
                         {% endfor %}
                     </div>
                 </div>
                 <div class="box">
                     {% set rollover_thumbnail = app['authentication'].getUser().getPrefs('rollover_thumbnail') %}
-                    <h1>{% trans 'Presentation de vignettes' %}</h1>
+                    <h1>{{ 'Presentation de vignettes' | trans }}</h1>
                     <label class="radio" for="rollover_caption">
                         <input onchange="setPref('rollover_thumbnail',$(this).val());" name="rollover_thumbnail" type="radio" class="radio" value="caption" id="rollover_caption" {% if rollover_thumbnail == 'caption' %}checked="checked" {% endif %}/>
-                        {% trans 'Iconographe (description au rollover)' %}
+                        {{ 'Iconographe (description au rollover)' | trans }}
                     </label>
                     <label class="radio" for="rollover_preview">
                         <input onchange="setPref('rollover_thumbnail',$(this).val());" name="rollover_thumbnail" type="radio" class="radio" value="preview" id="rollover_preview" {% if rollover_thumbnail == 'preview' %}checked="checked" {% endif %}/>
-                        {% trans 'Graphiste (preview au rollover)' %}
+                        {{ 'Graphiste (preview au rollover)' | trans }}
                     </label>
                 </div>
                 <div class="box">
                     {% set technical_display = app['authentication'].getUser().getPrefs('technical_display') %}
-                    <h1>{% trans 'Informations techniques' %}</h1>
+                    <h1>{{ 'Informations techniques' | trans }}</h1>
                     <label class="radio" for="technical_show">
                         <input onchange="setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="1" id="technical_show" {% if technical_display == '1' %}checked="checked"{% endif %}/>
-                        {% trans 'Afficher' %}
+                        {{ 'Afficher' | trans }}
                     </label>
                     <label class="radio" for="technical_group">
                         <input onchange="setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="group" id="technical_group" {% if technical_display == 'group' %}checked="checked"{% endif %}/>
-                        {% trans 'Afficher dans la notice' %}
+                        {{ 'Afficher dans la notice' | trans }}
                     </label>
                     <label class="radio" for="technical_hide">
                         <input onchange="setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="0" id="technical_hide" {% if technical_display == '0' %}checked="checked"{% endif %}/>
-                        {% trans 'Ne pas afficher' %}
+                        {{ 'Ne pas afficher' | trans }}
                     </label>
                 </div>
                 <div class="box">
                     {% set doctype_display = app['authentication'].getUser().getPrefs('doctype_display') %}
-                    <h1>{% trans 'Type de documents' %}</h1>
+                    <h1>{{ 'Type de documents' | trans }}</h1>
                     <label class="checkbox" for="doctype_display_show">
                         <input onchange="setPref('doctype_display',($(this).attr('checked') ? '1' :'0'));" name="doctype_display" type="checkbox" class="checkbox" value="1" id="doctype_display_show" {% if doctype_display != '0' %}checked="checked"{% endif %}/>
-                        {% trans 'Afficher une icone' %}
+                        {{ 'Afficher une icone' | trans }}
                     </label>
 
                 </div>
                 <div class="box">
                     <div class="" style="float:left; width:49%;">
-                        <h1>{% trans 'reponses:: images par pages : ' %}</h1>
+                        <h1>{{ 'reponses:: images par pages : ' | trans }}</h1>
                         <div class="box">
                             <div id="nperpage_slider" class="ui-corner-all" style="width:100px; display:inline-block;"></div>
                             <input type="text" readonly style="width:35px;" value="{{app['authentication'].getUser().getPrefs('images_per_page')}}" id="nperpage_value"/>
                         </div>
                     </div>
                     <div style="float:right; width:49%;">
-                        <h1>{% trans 'reponses:: taille des images : ' %}</h1>
+                        <h1>{{ 'reponses:: taille des images : ' | trans }}</h1>
                         <div class="box">
                             <div id="sizeAns_slider" class="ui-corner-all" style="width:100px;display:inline-block;"></div>
                             <input type="hidden" value="{{app['authentication'].getUser().getPrefs('images_size')}}" id="sizeAns_value"/>
@@ -877,34 +877,34 @@
                     </div>
                 </div>
                 <div class="box">
-                    <h1>{% trans 'Couleur de selection' %}</h1>
+                    <h1>{{ 'Couleur de selection' | trans }}</h1>
                     <div id="backcolorpickerHolder" class="colorpickerbox">
-                        <div class="submiter">{% trans 'choisir' %}</div>
+                        <div class="submiter">{{ 'choisir' | trans }}</div>
                     </div>
                 </div>
             </div>
             <div id="look_box_settings">
                 <div class="row-fluid">
                     <div class="box">
-                        <h1>{% trans 'Affichage au demarrage' %}</h1>
+                        <h1>{{ 'Affichage au demarrage' | trans }}</h1>
                         <form class="form-inline">
                             {% set start_page_pref = app['authentication'].getUser().getPrefs('start_page') %}
                             <select class="span4" name="start_page" onchange="start_page_selector();">
                                 <option value="LAST_QUERY" {% if start_page_pref == 'LAST_QUERY' %}selected="selected"{% endif %} >
-                                    {% trans 'Ma derniere question' %}
+                                    {{ 'Ma derniere question' | trans }}
                                 </option>
                                 <option value="QUERY" {% if start_page_pref == 'QUERY' %}selected="selected"{% endif %} >
-                                    {% trans 'Une question personnelle' %}
+                                    {{ 'Une question personnelle' | trans }}
                                 </option>
                                 <option value="PUBLI" {% if start_page_pref == 'PUBLI' %}selected="selected"{% endif %} >
-                                    {% trans 'Publications' %}
+                                    {{ 'Publications' | trans }}
                                 </option>
                                 <option value="HELP" {% if start_page_pref == 'HELP' %}selected="selected"{% endif %} >
-                                    {% trans 'Aide' %}
+                                    {{ 'Aide' | trans }}
                                 </option>
                             </select>
                             <input type="text" class="span4" name="start_page_value" value="{{app['authentication'].getUser().getPrefs('start_page_query')}}" style="display:{% if start_page_pref == 'QUERY' %}inline{% else %}none{% endif %}" />
-                            <input type="button" class="btn btn-inverse" value="{% trans 'boutton::valider' %}" onclick="set_start_page();" />
+                            <input type="button" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}" onclick="set_start_page();" />
                         </form>
                     </div>
                 </div>
@@ -932,10 +932,10 @@
                 <div id="PREVIEWRIGHT" class="preview_col PNB" style="top:7px;left:60%;overflow:hidden;">
                     <div id="PREVIEWIMGDESC" class="PNB10">
                         <ul class="PNB" style="height:30px;bottom:auto;">
-                            <li><a href="#PREVIEWIMGDESCINNER-BOX">{% trans 'preview:: Description' %}</a></li>
-                            <li><a href="#HISTORICOPS-BOX">{% trans 'preview:: Historique' %}</a></li>
+                            <li><a href="#PREVIEWIMGDESCINNER-BOX">{{ 'preview:: Description' | trans }}</a></li>
+                            <li><a href="#HISTORICOPS-BOX">{{ 'preview:: Historique' | trans }}</a></li>
                             {% if GV_google_api is not empty %}
-                            <li><a href="#popularity-BOX">{% trans 'preview:: Popularite' %}</a></li>
+                            <li><a href="#popularity-BOX">{{ 'preview:: Popularite' | trans }}</a></li>
                             {% endif %}
                         </ul>
                         <div id="PREVIEWIMGDESCINNER-BOX" class="descBoxes PNB">
@@ -956,7 +956,7 @@
         <div class="PNB" style="width:180px;left:auto;">
             <div class="PNB10 ui-corner-all" style="height:20px;">
                 <div onclick="closePreview();" style="cursor:pointer;color:#CCCCCC;font-size:14px;font-weight:bold;text-align:center;text-decoration:underline;">
-                    {% trans 'boutton::fermer' %}
+                    {{ 'boutton::fermer' | trans }}
                 </div>
             </div>
             <div id="PREVIEWOTHERS" style="top:40px;" class="PNB10 ui-corner-all">
@@ -971,14 +971,14 @@
 
     <div id="basket_preferences" style="display:none;">
         <div class="box">
-            <h1>{% trans 'Presentation de vignettes de panier' %}</h1>
+            <h1>{{ 'Presentation de vignettes de panier' | trans }}</h1>
             <div>
                 {% set basket_status_display = app['authentication'].getUser().getPrefs('basket_status_display') %}
                 <label for="basket_status_display" class="checkbox">
                     <input onchange="setPref('basket_status_display',($(this).attr('checked') ? '1' :'0'));"
                     name="basket_status_display" type="checkbox" class="checkbox" value="1"
                     id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} />
-                    {% trans 'Afficher les status' %}
+                    {{ 'Afficher les status' | trans }}
                 </label>
             </div>
             <div>
@@ -987,7 +987,7 @@
                     <input onchange="setPref('basket_caption_display',($(this).attr('checked') ? '1' :'0'));"
                     name="basket_caption_display" type="checkbox" class="checkbox" value="1"
                     id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} />
-                    {% trans 'Afficher la fiche descriptive' %}
+                    {{ 'Afficher la fiche descriptive' | trans }}
                 </label>
             </div>
             <div>
@@ -996,16 +996,16 @@
                     <input onchange="setPref('basket_title_display',($(this).attr('checked') ? '1' :'0'));"
                     name="basket_title_display" type="checkbox" class="checkbox" value="1"
                     id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} />
-                    {% trans 'Afficher le titre' %}
+                    {{ 'Afficher le titre' | trans }}
                 </label>
             </div>
         </div>
     </div>
 
-    <div id="dialog_publicator" title="{% trans 'action : bridge' %}" style="display:none;"></div>
+    <div id="dialog_publicator" title="{{ 'action : bridge' | trans }}" style="display:none;"></div>
 
-    <div id="modal_feed" title="{% trans 'action : publier' %}" style="display:none;"></div>
-    <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
+    <div id="modal_feed" title="{{ 'action : publier' | trans }}" style="display:none;"></div>
+    <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
 
     <script type="text/javascript">
         {% include "prod/thesaurus.js" %}
diff --git a/templates/web/prod/notifications.html.twig b/templates/web/prod/notifications.html.twig
index e4aa61501f..8773ab8023 100644
--- a/templates/web/prod/notifications.html.twig
+++ b/templates/web/prod/notifications.html.twig
@@ -2,11 +2,11 @@
 
 {% if notifications|length == 0%}
 <div class="notification_title">
-  <span>{% trans 'Aucune notification' %}</span>
+  <span>{{ 'Aucune notification' | trans }}</span>
 </div>
 {% else %}
 <div class="notification_title">
-  <a href="#" onclick="print_notifications(0);return false;">{% trans 'toutes les notifications' %}</a>
+  <a href="#" onclick="print_notifications(0);return false;">{{ 'toutes les notifications' | trans }}</a>
 </div>
 {% endif %}
 
diff --git a/templates/web/prod/orders/order_box.html.twig b/templates/web/prod/orders/order_box.html.twig
index f940e9a235..297dbd7e2c 100644
--- a/templates/web/prod/orders/order_box.html.twig
+++ b/templates/web/prod/orders/order_box.html.twig
@@ -6,17 +6,17 @@
         <div class="alert alert-success">
             <button type="button" class="close" data-dismiss="alert">×</button>
             {% if action == 'order' %}
-                {% trans 'The records have been properly ordered' %}
+                {{ 'The records have been properly ordered' | trans }}
             {% elseif action == 'send' %}
-                {% trans 'Order has been sent' %}
+                {{ 'Order has been sent' | trans }}
             {% elseif action == 'deny' %}
-                {% trans 'Order has been denied' %}
+                {{ 'Order has been denied' | trans }}
             {% endif %}
         </div>
-    {% elseif   success == '0'%}
+    {% elseif   success == '0' %}
         <div class="alert alert-error">
             <button type="button" class="close" data-dismiss="alert">×</button>
-            {% trans 'An error occured, please retry or contact an admin if problem persists' %}
+            {{ 'An error occured, please retry or contact an admin if problem persists' | trans }}
         </div>
     {% endif %}
 
@@ -31,11 +31,11 @@
             </thead>
             <thead>
                 <tr>
-                    <th>{% trans 'Utilisateur' %}</th>
-                    <th>{% trans 'Date de demande' %}</th>
-                    <th>{% trans 'Deadline' %}</th>
-                    <th>{% trans 'Utilisation prevue' %}</th>
-                    <th>{% trans 'Statut' %}</th>
+                    <th>{{ 'Utilisateur' | trans }}</th>
+                    <th>{{ 'Date de demande' | trans }}</th>
+                    <th>{{ 'Deadline' | trans }}</th>
+                    <th>{{ 'Utilisation prevue' | trans }}</th>
+                    <th>{{ 'Statut' | trans }}</th>
                 </tr>
             </thead>
             <tbody>
@@ -48,7 +48,7 @@
                             {% if deadline != '' %}
                                 {{deadline}}
                             {% else %}
-                                {% trans 'Aucune' %}
+                                {{ 'Aucune' | trans }}
                             {% endif %}
                         </td>
                         <td>{{ order.getOrderUsage() | nl2br }}</td>
@@ -62,11 +62,11 @@
     <div class='well-small'>
         <ul class="pager">
           {% if previousPage %}
-              <li  class="previous"><a class='self-ajax' href="{{ path('prod_orders', {'page': previousPage}) }}"><i class="icon-arrow-left"></i>{% trans 'Previous' %}</a></li>
+              <li  class="previous"><a class='self-ajax' href="{{ path('prod_orders', {'page': previousPage}) }}"><i class="icon-arrow-left"></i>{{ 'Previous' | trans }}</a></li>
           {% endif %}
 
           {% if nextPage %}
-              <li class="next"><a class='self-ajax' href="{{ path('prod_orders', {'page': nextPage}) }}"><i class="icon-arrow-right"></i>{% trans 'Next' %}</a></li>
+              <li class="next"><a class='self-ajax' href="{{ path('prod_orders', {'page': nextPage}) }}"><i class="icon-arrow-right"></i>{{ 'Next' | trans }}</a></li>
           {% endif %}
         </ul>
     </div>
diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig
index e877adcf53..6aada182d6 100644
--- a/templates/web/prod/orders/order_item.html.twig
+++ b/templates/web/prod/orders/order_item.html.twig
@@ -13,44 +13,44 @@
         <div class="alert alert-success">
             <button type="button" class="close" data-dismiss="alert">×</button>
              {% if action == 'send' %}
-                {% trans 'Order has been sent' %}
+                {{ 'Order has been sent' | trans }}
             {% elseif action == 'deny' %}
-                {% trans 'Order has been denied' %}
+                {{ 'Order has been denied' | trans }}
             {% endif %}
         </div>
-    {% elseif   success == '0'%}
+    {% elseif   success == '0' %}
         <div class="alert alert-error">
             <button type="button" class="close" data-dismiss="alert">×</button>
-            {% trans 'An error occured, please retry or contact an admin if problem persists' %}
+            {{ 'An error occured, please retry or contact an admin if problem persists' | trans }}
         </div>
     {% endif %}
 
     <div class="well">
         <table class="table" style="color:#333;">
             <tr>
-                <td>{% trans 'Destinataire' %}</td>
+                <td>{{ 'Destinataire' | trans }}</td>
                 <td>{{ displayName }}({{ order.getUser(app).get_email() }})</td>
             </tr>
             <tr>
-                <td>{% trans 'Date de commande' %}</td>
+                <td>{{ 'Date de commande' | trans }}</td>
                 <td>{{ app['date-formatter'].getPrettyString(order.getCreatedOn()) }}</td>
             </tr>
             <tr>
-                <td>{% trans 'Deadline' %}</td>
+                <td>{{ 'Deadline' | trans }}</td>
                 <td>{{ app['date-formatter'].getPrettyString(order.getDeadline()) }}</td>
             </tr>
             <tr>
-                <td>{% trans 'Utilisation prevue' %}</td>
+                <td>{{ 'Utilisation prevue' | trans }}</td>
                 <td>{{ order.getOrderUsage() | nl2br }}</td>
             </tr>
             <tr>
-                <td>{% trans 'Nombre total d\'element commandes' %}</td>
+                <td>{{ 'Nombre total d\'element commandes' | trans }}</td>
                 <td>{{ order.getTotal() }}</td>
             </tr>
         </table>
     </div>
     <div class="alert">
-        {% trans 'Il se peux que vous ne voyez pas tous les elements. Vous ne verrez que les  elements correspondants aux collections sur lesquelles vous gerez les commandes' %}
+        {{ 'Il se peux que vous ne voyez pas tous les elements. Vous ne verrez que les  elements correspondants aux collections sur lesquelles vous gerez les commandes' | trans }}
     </div>
 
     <div class="order_list well-small">
@@ -90,10 +90,10 @@
     </div>
 
     <div class="form-actions" style="color:#333;">
-        {% trans 'Selectionnez des documents et ' %}
-        <button class="btn btn-primary send">{% trans 'Send' %}</button>
-        <button class="btn deny">{% trans 'Deny' %}</button>
-        <button class="order_launcher btn">{% trans 'Retour aux commandes' %}</button>
+        {{ 'Selectionnez des documents et ' | trans }}
+        <button class="btn btn-primary send">{{ 'Send' | trans }}</button>
+        <button class="btn deny">{{ 'Deny' | trans }}</button>
+        <button class="order_launcher btn">{{ 'Retour aux commandes' | trans }}</button>
         <img src="/skins/icons/loader000000.gif" class="activity_indicator" style="display:none;"/>
         <input name="order_id" type="hidden" value="{{ order.getId() }}" />
     </div>
diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig
index 21a4f63091..534af17af8 100644
--- a/templates/web/prod/preview/appears_in.html.twig
+++ b/templates/web/prod/preview/appears_in.html.twig
@@ -1,7 +1,7 @@
 
 {% if parents.get_count() > 0 %}
 <ul>
-  <li class="title">{% trans 'Apparait aussi dans ces reportages' %}</li>
+  <li class="title">{{ 'Apparait aussi dans ces reportages' | trans }}</li>
   {% for par in parents %}
     <li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
         class="otherRegToolTip" {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}>
@@ -14,7 +14,7 @@
 
 {% if baskets|length > 0 %}
 <ul>
-  <li class="title">{% trans 'Apparait aussi dans ces paniers' %}</li>
+  <li class="title">{{ 'Apparait aussi dans ces paniers' | trans }}</li>
 {% for basket in baskets %}
   <li onclick="openPreview('BASK',0,'{{basket.getId()}}',true); return(false);"
                    class="otherBaskToolTip" title="{{basket.getDescription()}}">
diff --git a/templates/web/prod/preview/basket_train.html.twig b/templates/web/prod/preview/basket_train.html.twig
index 5ac250418d..d5ba20541a 100644
--- a/templates/web/prod/preview/basket_train.html.twig
+++ b/templates/web/prod/preview/basket_train.html.twig
@@ -34,8 +34,8 @@
     <div>
       <img src="/skins/icons/light_left.gif" style="margin-right:10px;" onclick="getPrevious();"/>
       <img src="/skins/icons/light_right.gif" style="margin-left:10px;" onclick="getNext();"/><br/>
-      <span onclick="startSlide()" id="start_slide">{% trans 'preview:: demarrer le diaporama' %}</span>
-      <span onclick="stopSlide()" id="stop_slide">{% trans 'preview:: arreter le diaporama' %}</span>
+      <span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
+      <span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
     </div>
   </div>
   <div id="PREVIEWTOOL">
diff --git a/templates/web/prod/preview/caption.html.twig b/templates/web/prod/preview/caption.html.twig
index 98a226273d..46ac12b327 100644
--- a/templates/web/prod/preview/caption.html.twig
+++ b/templates/web/prod/preview/caption.html.twig
@@ -4,7 +4,7 @@
     <div class="edit_button" style="text-align:right">
       <a href="#" onclick="editThis('IMGT','{{record.get_serialize_key()}}');">
         <img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" />
-        {% trans 'action : editer' %}
+        {{ 'action : editer' | trans }}
       </a>
     </div>
   {% endif %}
diff --git a/templates/web/prod/preview/feed_train.html.twig b/templates/web/prod/preview/feed_train.html.twig
index da1d1cc77c..47a87ff9d6 100644
--- a/templates/web/prod/preview/feed_train.html.twig
+++ b/templates/web/prod/preview/feed_train.html.twig
@@ -34,8 +34,8 @@
     <div>
       <img src="/skins/icons/light_left.gif" style="margin-right:10px;" onclick="getPrevious();"/>
       <img src="/skins/icons/light_right.gif" style="margin-left:10px;" onclick="getNext();"/><br/>
-      <span onclick="startSlide()" id="start_slide">{% trans 'preview:: demarrer le diaporama' %}</span>
-      <span onclick="stopSlide()" id="stop_slide">{% trans 'preview:: arreter le diaporama' %}</span>
+      <span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
+      <span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
     </div>
   </div>
   <div id="PREVIEWTOOL">
diff --git a/templates/web/prod/preview/popularity.html.twig b/templates/web/prod/preview/popularity.html.twig
index b66e47694c..be0569d4d2 100644
--- a/templates/web/prod/preview/popularity.html.twig
+++ b/templates/web/prod/preview/popularity.html.twig
@@ -1,7 +1,7 @@
 
   {% if record.get_view_popularity() %}
     <br>
-    {% trans 'preview::statistiques de visualisation pour le lien' %}
+    {{ 'preview::statistiques de visualisation pour le lien' | trans }}
     <br/>
     <img src="{{record.get_view_popularity().get_url()}}" />
   {% endif %}
@@ -13,7 +13,7 @@
 
   {% if record.get_download_popularity() %}
     <br>
-    {% trans 'preview::statistiques de telechargement' %}
+    {{ 'preview::statistiques de telechargement' | trans }}
     <br>
     <img src="{{record.get_download_popularity().get_url()}}" />
   {% endif %}
diff --git a/templates/web/prod/preview/reg_train.html.twig b/templates/web/prod/preview/reg_train.html.twig
index 7567305393..882f679081 100644
--- a/templates/web/prod/preview/reg_train.html.twig
+++ b/templates/web/prod/preview/reg_train.html.twig
@@ -53,8 +53,8 @@
           <div>
           <img src="/skins/icons/light_left.gif" style="margin-right:10px;" onclick="getPrevious();"/>
           <img src="/skins/icons/light_right.gif" style="margin-left:10px;" onclick="getNext();"/><br/>
-          <span onclick="startSlide()" id="start_slide">{% trans 'preview:: demarrer le diaporama' %}</span>
-          <span onclick="stopSlide()" id="stop_slide">{% trans 'preview:: arreter le diaporama' %}</span>
+          <span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
+          <span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
           </div>
           </div>
           <div id="PREVIEWTOOL">
diff --git a/templates/web/prod/preview/result_train.html.twig b/templates/web/prod/preview/result_train.html.twig
index 68d5d0053d..ecead5183c 100644
--- a/templates/web/prod/preview/result_train.html.twig
+++ b/templates/web/prod/preview/result_train.html.twig
@@ -34,8 +34,8 @@
     <div>
       <img src="/skins/icons/light_left.gif" style="margin-right:10px;" onclick="getPrevious();"/>
       <img src="/skins/icons/light_right.gif" style="margin-left:10px;" onclick="getNext();"/><br/>
-      <span onclick="startSlide()" id="start_slide">{% trans 'preview:: demarrer le diaporama' %} </span>
-      <span onclick="stopSlide()" id="stop_slide"> {% trans 'preview:: arreter le diaporama' %} </span>
+      <span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }} </span>
+      <span onclick="stopSlide()" id="stop_slide"> {{ 'preview:: arreter le diaporama' | trans }} </span>
     </div>
   </div>
   <div id="PREVIEWTOOL"></div>
diff --git a/templates/web/prod/preview/result_train_options.html.twig b/templates/web/prod/preview/result_train_options.html.twig
index 0050fa29b8..e88d4d765a 100644
--- a/templates/web/prod/preview/result_train_options.html.twig
+++ b/templates/web/prod/preview/result_train_options.html.twig
@@ -2,8 +2,8 @@
             <div id="PREVIEWCURRENTCONT" class="PNB10">
               <div style="margin:2px 0;">
                 <img src="/skins/icons/light_left.gif" style="margin-right:20px;" onclick="getPrevious();"/>
-                <span onclick="startSlide()" id="start_slide">{% trans 'preview:: demarrer le diaporama' %}</span>
-                <span onclick="stopSlide()" id="stop_slide">{% trans 'preview:: arreter le diaporama' %}</span>
+                <span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
+                <span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
                 <img src="/skins/icons/light_right.gif" style="margin-left:20px;" onclick="getNext();"/><br/>
               </div>
             </div>
diff --git a/templates/web/prod/preview/short_history.html.twig b/templates/web/prod/preview/short_history.html.twig
index 7e1541e327..351fbb8028 100644
--- a/templates/web/prod/preview/short_history.html.twig
+++ b/templates/web/prod/preview/short_history.html.twig
@@ -20,13 +20,13 @@
           {% set appbox = appbox ~ '</span>' %}
           {% trans %}report::Demande de validation vers {{n_user}} utilisateurs depuis lapplication box {{appbox}}{% endtrans %}
         {% elseif action == 'edit' %}
-          {% trans 'report::Edition des meta-donnees' %}
+          {{ 'report::Edition des meta-donnees' | trans }}
         {% elseif action == 'collection' %}
           {% set dest = done['final']|join(', ') %}
           {% set coll_name = dest|bas_labels(app) %}
           {% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %}
         {% elseif action == 'status' %}
-          {% trans 'report::Edition des status' %}
+          {{ 'report::Edition des status' | trans }}
         {% elseif action == 'print' %}
           {% set format = done['final']|join(', ') %}
           {% trans %}report::Impression des formats : {{format}}{% endtrans %}
@@ -48,11 +48,11 @@
           {% set content = done['final']|join(', ') %}
           {% trans %}Envoi par ftp a {{dest}} de {{content}}{% endtrans %}
         {% elseif action == 'delete' %}
-          {% trans 'report::supression du document' %}
+          {{ 'report::supression du document' | trans }}
         {% elseif action == 'add' %}
-          {% trans 'report::ajout du documentt' %}
+          {{ 'report::ajout du documentt' | trans }}
         {% else %}
-          {% trans 'report::Modification du document -- je ne me souviens plus de quoi...' %}
+          {{ 'report::Modification du document -- je ne me souviens plus de quoi...' | trans }}
         {% endif %}
           <span class="actor">
           {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canreport') %}
diff --git a/templates/web/prod/preview/tools.html.twig b/templates/web/prod/preview/tools.html.twig
index fb2ddd4428..4345600321 100644
--- a/templates/web/prod/preview/tools.html.twig
+++ b/templates/web/prod/preview/tools.html.twig
@@ -1,23 +1,23 @@
 
 {% if (record.is_from_basket is empty) and app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canputinalbum') %}
   <div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
-       class="baskAdder" title="{% trans 'action : ajouter au panier' %}"
+       class="baskAdder" title="{{ 'action : ajouter au panier' | trans }}"
        onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
 {% endif %}
 
 {% if record.is_from_basket() %}
     <a sbas="{{record.get_sbas_id()}}" id="PREV_BASKDEL_{{record.get_serialize_key}}"
-       class="baskDeleter WorkZoneElementRemover" title="{% trans 'Remove from basket' %}"
+       class="baskDeleter WorkZoneElementRemover" title="{{ 'Remove from basket' | trans }}"
        data-context="reg_train_basket"
        onclick="remove_from_basket($(this), false);return false;"
        href="{{ path('prod_baskets_basket_element_remove', { 'basket' :  record.get_container().getId(), 'basket_element_id' : record.get_original_item().getId()}) }}">
     </a>
 {% endif %}
 
-  <div class="printer" title="'{% trans 'action : print' %}"
+  <div class="printer" title="'{{ 'action : print' | trans }}"
        onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 
 {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'candwnldhd') or app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'candwnldpreview') %}
-    <div class="downloader" title="{% trans 'action : exporter' %}"
+    <div class="downloader" title="{{ 'action : exporter' | trans }}"
     onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 {% endif %}
diff --git a/templates/web/prod/results/help.html.twig b/templates/web/prod/results/help.html.twig
index d0f2a9e093..1416ca03d6 100644
--- a/templates/web/prod/results/help.html.twig
+++ b/templates/web/prod/results/help.html.twig
@@ -8,7 +8,7 @@
 {% endif %}
 
 <p>
-  {% trans 'Votre recherche ne retourne aucun resultat' %}
+  {{ 'Votre recherche ne retourne aucun resultat' | trans }}
 </p>
 
 
@@ -24,63 +24,63 @@
 
 {% if app['locale.I18n'] == 'fr' %}
     <div class="client_help">
-    <h5>{% trans 'La recherche s\'effectue grâce à la boîte de dialogue qui se trouve en haut à gauche de l\'écran.' %}
-    {% trans 'Sachez que vous pouvez utiliser les opérateurs ou caractères spéciaux suivants :' %}</h5>
-    <h5 style="border:#CCCCCC 2px solid">{% trans '* , ? , ET , OU , SAUF , DANS , DERNIERS , TOUT (ou AND , OR , EXCEPT , LAST , ALL)' %}</h5>
+    <h5>{{ 'La recherche s\'effectue grâce à la boîte de dialogue qui se trouve en haut à gauche de l\'écran.' | trans }}
+    {{ 'Sachez que vous pouvez utiliser les opérateurs ou caractères spéciaux suivants :' | trans }}</h5>
+    <h5 style="border:#CCCCCC 2px solid">{{ '* , ? , ET , OU , SAUF , DANS , DERNIERS , TOUT (ou AND , OR , EXCEPT , LAST , ALL)' | trans }}</h5>
 
-    <H5>{% trans 'Caractères de troncature' %}</H5>
+    <H5>{{ 'Caractères de troncature' | trans }}</H5>
 
     <table>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'auto*' %}</kbd></td>
-            <td valign="top"> {% trans 'retourne "automobile", "automate", "autoroute", ...' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'auto*' | trans }}</kbd></td>
+            <td valign="top"> {{ 'retourne "automobile", "automate", "autoroute", ...' | trans }}</td>
         </tr>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'dé?it' %}</kbd></td>
-            <td valign="top"> {% trans 'retourne "délit", "débit", ...' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'dé?it' | trans }}</kbd></td>
+            <td valign="top"> {{ 'retourne "délit", "débit", ...' | trans }}</td>
         </tr>
     </table>
 
-    <H5>{% trans 'Visualiser tous les enregistrements / les derniers enregistrements' %}</H5>
+    <H5>{{ 'Visualiser tous les enregistrements / les derniers enregistrements' | trans }}</H5>
     <table>
         <tr>
-            <td valign="top"><kbd class="ky"><b>{% trans 'TOUT' %}</b></kbd></td>
-            <td valign="top">{% trans 'retourne tous les enregistrements des collections selectionnees' %}</td>
+            <td valign="top"><kbd class="ky"><b>{{ 'TOUT' | trans }}</b></kbd></td>
+            <td valign="top">{{ 'retourne tous les enregistrements des collections selectionnees' | trans }}</td>
         </tr>
         <tr>
-            <td valign="top"><kbd class="ky"><b>{% trans 'LAST 20' %}</b></kbd></td>
-            <td valign="top">{% trans 'retourne les 20 derniers enregistrements archives dans les collections selectionnees' %}</td>
+            <td valign="top"><kbd class="ky"><b>{{ 'LAST 20' | trans }}</b></kbd></td>
+            <td valign="top">{{ 'retourne les 20 derniers enregistrements archives dans les collections selectionnees' | trans }}</td>
         </tr>
     </table>
 
-    <H5>{% trans 'Recherche multicritères' %}</H5>
-    {% trans 'Vous pouvez affiner votre recherche avec les opérateurs : ET, OU, SAUF ou DANS' %}<br>
+    <H5>{{ 'Recherche multicritères' | trans }}</H5>
+    {{ 'Vous pouvez affiner votre recherche avec les opérateurs : ET, OU, SAUF ou DANS' | trans }}<br>
     <table>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'sport' %} <b>ET</b> {% trans 'automobile' %}</kbd></td>
-            <td valign="top">{% trans 'retourne les documents comprenant les deux mots.' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'sport' | trans }} <b>ET</b> {{ 'automobile' | trans }}</kbd></td>
+            <td valign="top">{{ 'retourne les documents comprenant les deux mots.' | trans }}</td>
         </tr>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'journal OU jt' %}</kbd></td>
-            <td valign="top">{% trans 'retourne les documents comprenant un mot et/ou l\'autre.' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'journal OU jt' | trans }}</kbd></td>
+            <td valign="top">{{ 'retourne les documents comprenant un mot et/ou l\'autre.' | trans }}</td>
         </tr>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'cannes SAUF festival' %}</kbd></td>
-            <td valign="top">{% trans 'retourne les documents comprenant cannes sans le mot festival.' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'cannes SAUF festival' | trans }}</kbd></td>
+            <td valign="top">{{ 'retourne les documents comprenant cannes sans le mot festival.' | trans }}</td>
         </tr>
         <tr>
-            <td valign="top"><kbd class="ky">{% trans 'thalassa DANS titre' %}</kbd></td>
-            <td valign="top">{% trans 'retourne les documents où le terme est au moins présent dans le titre, en évitant par exemple celles où le terme est uniquement cité dans la légende.' %}</td>
+            <td valign="top"><kbd class="ky">{{ 'thalassa DANS titre' | trans }}</kbd></td>
+            <td valign="top">{{ 'retourne les documents où le terme est au moins présent dans le titre, en évitant par exemple celles où le terme est uniquement cité dans la légende.' | trans }}</td>
         </tr>
     </table>
 
     <center>
-    <h3 style="background-color:#CCCCCC; color:#000000">{% trans 'Attention' %}</h3>
-    <h4> {% trans 'pour chercher une phrase contenant un des mots-clé ci-dessus, utilisez les guillemets :' %}</h4>
-    <kbd class='tx'><i>"</i>{% trans 'C dans l\'air' %}<i>"</i></kbd>
-    ,  <kbd class='tx'><i>"</i>{% trans 'Et Dieu créa la femme' %}<i>"</i></kbd>
-    , <kbd class='tx'><i>"</i>{% trans 'bijou en or' %}<i>"</i></kbd>
-    , <kbd class='tx'><i>"</i>{% trans 'tout le sport' %}<i>"</i></kbd>
+    <h3 style="background-color:#CCCCCC; color:#000000">{{ 'Attention' | trans }}</h3>
+    <h4> {{ 'pour chercher une phrase contenant un des mots-clé ci-dessus, utilisez les guillemets :' | trans }}</h4>
+    <kbd class='tx'><i>"</i>{{ 'C dans l\'air' | trans }}<i>"</i></kbd>
+    ,  <kbd class='tx'><i>"</i>{{ 'Et Dieu créa la femme' | trans }}<i>"</i></kbd>
+    , <kbd class='tx'><i>"</i>{{ 'bijou en or' | trans }}<i>"</i></kbd>
+    , <kbd class='tx'><i>"</i>{{ 'tout le sport' | trans }}<i>"</i></kbd>
     </center>
     </div>
 {% endif %}
diff --git a/templates/web/prod/thesaurus.js b/templates/web/prod/thesaurus.js
index 13d1074867..f3940ea0be 100644
--- a/templates/web/prod/thesaurus.js
+++ b/templates/web/prod/thesaurus.js
@@ -99,7 +99,7 @@ function T_replaceBy2(f)
   trees.C._toReplace = { 'sbas':sbas, 'cid':cid, 'replaceby':f };
 
   {% set message %}
-   {% trans 'prod::thesaurusTab:dlg:Remplacement du candidat "%(from)s" par "%(to)s"' %}
+   {{ 'prod::thesaurusTab:dlg:Remplacement du candidat "%(from)s" par "%(to)s"' | trans }}
   {% endset %}
 
   var msg = $.sprintf("{{ message | e('js') }}", {'from':term, 'to':f});
@@ -224,7 +224,7 @@ function T_filter_delayed2(f, delay, mode)
 function T_replaceCandidates_OK()
 {
   {% set replaceing_msg %}
-    {% trans 'prod::thesaurusTab:dlg:Remplacement en cours.' %}
+    {{ 'prod::thesaurusTab:dlg:Remplacement en cours.' | trans }}
   {% endset %}
 
   var replacingBox = p4.Dialog.Create({
@@ -277,7 +277,7 @@ function T_replaceCandidates_OK()
 function T_acceptCandidates_OK()
 {
   {% set accepting_msg %}
-    {% trans 'prod::thesaurusTab:dlg:Acceptation en cours.' %}
+    {{ 'prod::thesaurusTab:dlg:Acceptation en cours.' | trans }}
   {% endset %}
 
   var acceptingBox = p4.Dialog.Create({
@@ -360,7 +360,7 @@ function T_acceptCandidates_OK()
 function C_deleteCandidates_OK()
 {
   {% set deleting_msg %}
-    {% trans 'prod::thesaurusTab:dlg:Suppression en cours.' %}
+    {{ 'prod::thesaurusTab:dlg:Suppression en cours.' | trans }}
   {% endset %}
 
   var deletingBox = p4.Dialog.Create({
@@ -424,10 +424,10 @@ function T_acceptCandidates(menuItem, menu, type)
     return;
 
   {% set messageOne %}
-   {% trans 'prod::thesaurusTab:dlg:accepter le terme candidat "%s" ?' %}
+   {{ 'prod::thesaurusTab:dlg:accepter le terme candidat "%s" ?' | trans }}
   {% endset %}
   {% set messageMany %}
-   {% trans 'prod::thesaurusTab:dlg:accepter les %d termes candidats ?' %}
+   {{ 'prod::thesaurusTab:dlg:accepter les %d termes candidats ?' | trans }}
   {% endset %}
 
   var msg;
@@ -523,10 +523,10 @@ function C_MenuOption(menuItem, menu, option, parm)
       var msg;
 
       {% set messageOne %}
-        {% trans 'prod::thesaurusTab:wizard:clic-droit / accepter le terme candidat "%s"' %}
+        {{ 'prod::thesaurusTab:wizard:clic-droit / accepter le terme candidat "%s"' | trans }}
       {% endset %}
       {% set messageMany %}
-        {% trans "prod::thesaurusTab:wizard:clic-droit / accepter les %s termes candidats" %}
+        {{ "prod::thesaurusTab:wizard:clic-droit / accepter les %s termes candidats" | trans }}
       {% endset %}
 
       if(trees.C._selInfos.n == 1)
@@ -551,10 +551,10 @@ function C_MenuOption(menuItem, menu, option, parm)
       var msg;
 
       {% set messageOne %}
-        {% trans "prod::thesaurusTab:dlg:remplacer le terme \"%s\" des fiches par :" %}
+        {{ "prod::thesaurusTab:dlg:remplacer le terme \"%s\" des fiches par :" | trans }}
       {% endset %}
       {% set messageMany %}
-        {% trans "prod::thesaurusTab:dlg:remplacer les %d termes des fiches par :" %}
+        {{ "prod::thesaurusTab:dlg:remplacer les %d termes des fiches par :" | trans }}
       {% endset %}
 
       if(trees.C._selInfos.n == 1)
@@ -581,10 +581,10 @@ function C_MenuOption(menuItem, menu, option, parm)
       // display helpful message into the thesaurus box...
 
       {% set messageOne %}
-        {% trans 'prod::thesaurusTab:dlg:supprimer le terme "%s" des fiches ?' %}
+        {{ 'prod::thesaurusTab:dlg:supprimer le terme "%s" des fiches ?' | trans }}
       {% endset %}
       {% set messageMany %}
-        {% trans 'prod::thesaurusTab:dlg:supprimer les %d termes des fiches ?' %}
+        {{ 'prod::thesaurusTab:dlg:supprimer les %d termes des fiches ?' | trans }}
       {% endset %}
 
      var msg;
@@ -637,9 +637,9 @@ function Xclick(e)
             var oldField = ul.attr('field');
             ul.remove();
             if(oldField)
-              li.append('<ul field="'+oldField+'">{% trans 'prod::thesaurusTab:tree:loading' %}</ul>');
+              li.append('<ul field="'+oldField+'">{{ 'prod::thesaurusTab:tree:loading' | trans }}</ul>');
             else
-              li.append('<ul>{% trans 'prod::thesaurusTab:tree:loading' %}</ul>');
+              li.append('<ul>{{ 'prod::thesaurusTab:tree:loading' | trans }}</ul>');
             li.removeAttr('loaded');
           }
 
@@ -890,7 +890,7 @@ function thesau_thesaurus_ow(id)	// on ouvre ou ferme une branche de thesaurus
     // on ferme
     o.className = "c";
     document.getElementById("TH_P."+id).innerHTML = "+";
-    document.getElementById("TH_K."+id).innerHTML = "{% trans 'prod::thesaurusTab:tree:loading' %}";
+    document.getElementById("TH_K."+id).innerHTML = "{{ 'prod::thesaurusTab:tree:loading' | trans }}";
   }
   else if(o.className=="c" || o.className=="h")
   {
@@ -1221,21 +1221,21 @@ function startThesaurus(){
   trees.T.tree.contextMenu(
   [
     {
-      label:'{% trans 'boutton::chercher' %}',
+      label:'{{ 'boutton::chercher' | trans }}',
       onclick:function(menuItem, menu, cmenu, e, label)
       {
         T_search(menuItem, menu, cmenu, e, label);
       }
     },
     {
-      label:'{% trans 'prod::thesaurusTab:tmenu:Accepter comme terme specifique' %}',
+      label:'{{ 'prod::thesaurusTab:tmenu:Accepter comme terme specifique' | trans }}',
       onclick:function(menuItem, menu)
       {
         T_acceptCandidates(menuItem, menu, 'TS');
       }
     },
     {
-      label:'{% trans 'prod::thesaurusTab:tmenu:Accepter comme synonyme' %}',
+      label:'{{ 'prod::thesaurusTab:tmenu:Accepter comme synonyme' | trans }}',
       onclick:function(menuItem, menu)
       {
         T_acceptCandidates(menuItem, menu, 'SY');
@@ -1318,7 +1318,7 @@ function startThesaurus(){
     ,
     {% endfor %}
     {
-      label:'{% trans 'prod::thesaurusTab:cmenu:Remplacer par...' %}',
+      label:'{{ 'prod::thesaurusTab:cmenu:Remplacer par...' | trans }}',
 //      disabled:true,
       onclick:function(menuItem, menu)
       {
@@ -1326,7 +1326,7 @@ function startThesaurus(){
       }
     },
     {
-      label:'{% trans 'boutton::supprimer' %}',
+      label:'{{ 'boutton::supprimer' | trans }}',
 //      disabled:true,
       onclick:function(menuItem, menu)
       {
diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig
index 4dc5655cd5..a1fc28defe 100644
--- a/templates/web/prod/upload/lazaret.html.twig
+++ b/templates/web/prod/upload/lazaret.html.twig
@@ -3,8 +3,8 @@
     {% if lazaretFiles is not none %}
         {% if lazaretFiles|length > 0 %}
             <div class="btn-group" style="text-align:center; padding:5px 0;">
-                <button class="btn empty-lazaret" title="{% trans "Empty quarantine"%}">
-                    <img src="/skins/icons/delete.png">{% trans "Empty quarantine"%}
+                <button class="btn empty-lazaret" title="{{ "Empty quarantine" | trans }}">
+                    <img src="/skins/icons/delete.png">{{ "Empty quarantine" | trans }}
                 </button>
             </div>
 
@@ -16,10 +16,10 @@
                 {% endfor %}
             </ul>
         {% else %}
-            {% trans "No document in quarantine" %}
+            {{ "No document in quarantine" | trans }}
         {% endif %}
     {% else %}
-        {% trans "You do not have enough rights to access quarantine" %}
+        {{ "You do not have enough rights to access quarantine" | trans }}
     {% endif %}
 </div>
 
@@ -76,7 +76,7 @@
         // empty lazaret
         $('button.empty-lazaret', scope).bind('click', function(){
 
-            if(!confirm("{% trans "Empty quarantine will remove all items, are you sure you want to continue ?" %}")) {
+            if(!confirm("{{ "Empty quarantine will remove all items, are you sure you want to continue ?" | trans }}")) {
                 return false;
             }
 
@@ -258,14 +258,14 @@
     {% import "common/thumbnail.html.twig" as thumb %}
     {% set records = file.getRecordsToSubstitute(app) %}
     <div class="lazaret-file span4">
-        <h5>{% trans "Last uploaded version" %}</h5>
+        <h5>{{ "Last uploaded version" | trans }}</h5>
         <ul class="thumbnails">
             <li class="span12" >
                 <div class="thumbnail">
                     <img src="/prod/lazaret/{{ file.getId() }}/thumbnail/"/>
                     <div class="caption">
-                        <p>{% trans "Filename" %} : <span class="info">{{ file.getOriginalName() }}</span></p>
-                        <p>{% trans "Date" %} : <span class="info">{{ app['date-formatter'].getPrettyString(file.getCreated()) }}</span></p>
+                        <p>{{ "Filename" | trans }} : <span class="info">{{ file.getOriginalName() }}</span></p>
+                        <p>{{ "Date" | trans }} : <span class="info">{{ app['date-formatter'].getPrettyString(file.getCreated()) }}</span></p>
                         {% if file.getSession().getUser(app) is not none %}
                             <p>
                                 {% set username = '<a href="#" class="username userTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : file.getSession().getUser(app).get_id() }) ~ '/">' ~ file.getSession().getUser(app).get_display_name() ~ '</a>' %}
@@ -274,7 +274,7 @@
                                 {% endtrans %}
                             </p>
                         {% endif %}
-                        <p>{% trans "Collection" %} : <span class="info">{{ file.getCollection(app).get_label(app['locale.I18n']) }}</span></p>
+                        <p>{{ "Collection" | trans }} : <span class="info">{{ file.getCollection(app).get_label(app['locale.I18n']) }}</span></p>
                     </div>
                     <div class="caption">
                         {% for check in file.getChecks() %}
@@ -282,15 +282,15 @@
                         {% endfor %}
                     </div>
                     <div class="btn-group" style="text-align:center; padding:5px;">
-                        <button class="btn add-lazaret" title="{% trans "Add"%}">
-                            <img src="/skins/icons/add.png">{% trans "Add"%}
+                        <button class="btn add-lazaret" title="{{ "Add" | trans }}">
+                            <img src="/skins/icons/add.png">{{ "Add" | trans }}
                         </button>
-                        <button class="btn delete-lazaret" title="{% trans "Delete"%}">
-                            <img src="/skins/icons/delete.png">{% trans "Delete"%}
+                        <button class="btn delete-lazaret" title="{{ "Delete" | trans }}">
+                            <img src="/skins/icons/delete.png">{{ "Delete" | trans }}
                         </button>
                         {% if records|length > 0 %}
-                            <button class="btn subtitute-lazaret" title="{% trans "Substitute" %}">
-                                <img src="/skins/icons/reload.png">{% trans "Substitute" %}
+                            <button class="btn subtitute-lazaret" title="{{ "Substitute" | trans }}">
+                                <img src="/skins/icons/reload.png">{{ "Substitute" | trans }}
                             </button>
                         {% endif %}
                     </div>
diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig
index 57a2c53ecc..a2d1f47ccf 100644
--- a/templates/web/prod/upload/upload-flash.html.twig
+++ b/templates/web/prod/upload/upload-flash.html.twig
@@ -5,14 +5,14 @@
         <ul>
             <li>
                 <a href="#tab-upload">
-                    {% trans 'Upload' %}
+                    {{ 'Upload' | trans }}
                 </a>
             </li>
             <li>
                 {# template prod/upload/lazaret.html.twig loaded via ajax #}
                 <a href="{{ path('lazaret_elements') }}">
                     {# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
-                    {% trans 'Quarantine' %}<span>&nbsp;</span>
+                    {{ 'Quarantine' | trans }}<span>&nbsp;</span>
                 </a>
             </li>
         </ul>
@@ -22,7 +22,7 @@
 
                 <div id="uploadBoxLeft" class="well">
 
-                    {# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #}
+                    {# <h5 style="margin-top: 10px;">{{ 'Choose files to add' | trans }} :</h5> #}
                     {# action bar #}
                     <table id="addFileList">
                         <tr>
@@ -34,20 +34,20 @@
                                 </span>
                             </td>
                             <td class='uploader-icon'>
-                                <img src='/skins/icons/logo-flash.png' width="32px" heigh="32px" title="{% trans 'You are using the Flash uploader.'%}"/>
+                                <img src='/skins/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>
                             </td>
                             <td class='uploader-info'>
                                 <p>
-                                    {% trans 'You are using the Flash uploader.'%}
-                                    {% trans 'This version does not allow you to access all the features offered by the HTML5 uploader' %}
+                                    {{ 'You are using the Flash uploader.' | trans }}
+                                    {{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}
                                 </p>
-                                <a href="{{ path('upload_form') }}" class="dialog full-dialog">{% trans 'Use the HTML5 uploader' %}</a>
+                                <a href="{{ path('upload_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
                             </td>
                         </tr>
                      </table>
                     {# settings box #}
                     <div class='settings-box'>
-                        <h5>{% trans 'upload:: Destination (collection) :' %} :</h5>
+                        <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                         {# collections list #}
                         {% if collections|length > 0 %}
                             <select name="base_id" class="span3" style="margin-left: 10px;">
@@ -63,7 +63,7 @@
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
                                     <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "display:block" :"display:none" }}'>
-                                        <h5>{% trans 'upload:: Status :' %} :</h5>
+                                        <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>
                                             {% for bit, status in availableCollections['databox'].get_statusbits() %}
@@ -90,15 +90,15 @@
                                 {% endfor %}
                             {% endfor %}
                         {% else %}
-                            {% trans 'You can not upload files' %}
+                            {{ 'You can not upload files' | trans }}
                         {% endif %}
                     </div>
 
                     {# upload box #}
                     <div class='upload-box' style="display: none;">
-                        <h5>{% trans 'Selected files' %} :</h5>
-                        <button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{% trans 'Clear list' %}</button>
-                        <button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{% trans 'Send' %}</button>
+                        <h5>{{ 'Selected files' | trans }} :</h5>
+                        <button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Clear list' | trans }}</button>
+                        <button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Send' | trans }}</button>
                         <div class="clear"></div>
                         <div class='upload-box-addedfiles flash-box'></div>
                         <div class="clear"></div>
@@ -106,10 +106,10 @@
                 </div>
 
                 <div id="uploadBoxRight" class="well">
-                    <h5 style="margin-top: 10px;">{% trans 'Transmited files' %} : </h5>
+                    <h5 style="margin-top: 10px;">{{ 'Transmited files' | trans }} : </h5>
                     <div class='well-small'>
                         <button id="cancel-all" class="btn disabled" type="button" disabled="disabled">
-                            {% trans "Cancel all" %}
+                            {{ "Cancel all" | trans }}
                         </button>
                     </div>
                     {# download box #}
@@ -181,7 +181,7 @@
             button_image_url : "/skins/icons/theme_button_background.png",
             button_width : 170,
             button_height : 40,
-            button_text : "<span class='btn'>{% trans 'Select files...' %}</span>",
+            button_text : "<span class='btn'>{{ 'Select files...' | trans }}</span>",
             button_text_style :
                 ".btn {"
                 + "font-family: verdana, Helvetica Neue, Helvetica, Arial, sans-serif; "
@@ -223,25 +223,25 @@
                 }
 
                 if (errorCode === SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
-                    alert(" {% trans "You have attempted to queue too many files" %}");
+                    alert(" {{ "You have attempted to queue too many files" | trans }}");
                     return false;
                 }
 
-                var error = "{% trans "Unknow Error" %}";
+                var error = "{{ "Unknow Error" | trans }}";
 
                 switch (errorCode) {
                   case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
                     error = language.errorFileApiTooBig;
                     break;
                   case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
-                      error = "{% trans "Cannot upload Zero Byte files" %}";
+                      error = "{{ "Cannot upload Zero Byte files" | trans }}";
                     break;
                   case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
-                      error = "{% trans "Invalid file type" %}";
+                      error = "{{ "Invalid file type" | trans }}";
                     break;
                   default:
                     if (file !== null) {
-                      error = "{% trans "Unhandled Error" %}";
+                      error = "{{ "Unhandled Error" | trans }}";
                     }
                     break;
                 }
@@ -271,42 +271,42 @@
             },
             upload_error_handler : function(file, errorCode, message) {
 
-                var reasons = "{% trans "Unknow reason" %}";
+                var reasons = "{{ "Unknow reason" | trans }}";
 
                 switch (errorCode) {
                     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-                        reasons = "{% trans "Bad request, please contact an admin" %}";
+                        reasons = "{{ "Bad request, please contact an admin" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
-                        reasons = "{% trans "Upload URL is not set, please contact an admin" %}";
+                        reasons = "{{ "Upload URL is not set, please contact an admin" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-                        reasons = "{% trans "Connection terminates unexpetecdly, please retry" %}";
+                        reasons = "{{ "Connection terminates unexpetecdly, please retry" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-                        reasons = "{% trans "The upload violates a security restriction, please retry" %}";
+                        reasons = "{{ "The upload violates a security restriction, please retry" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
                         reasons = "{% trans  %} File upload limit ({{ maxFileSizeReadable }}) has been reached {% endtrans %}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-                        reasons = "{% trans "Could not initiate upload, please retry" %}";
+                        reasons = "{{ "Could not initiate upload, please retry" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
-                        reasons = "{% trans "Could not retrieve the file ID, please retry or contact an admin if problem persist" %}";
+                        reasons = "{{ "Could not retrieve the file ID, please retry or contact an admin if problem persist" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-                        reasons = "{% trans "File validation failed" %}";
+                        reasons = "{{ "File validation failed" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
-                        reasons = "{% trans "File upload has been cancelled" %}";
+                        reasons = "{{ "File upload has been cancelled" | trans }}";
                     break;
                     case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-                        reasons = "{% trans "File upload has been stopped" %}";
+                        reasons = "{{ "File upload has been stopped" | trans }}";
                     break;
                 }
 
-                var html = _.template($("#download_finish_tpl").html(), {heading:"{% trans "Error while uploading" %}", reasons: [reasons]});
+                var html = _.template($("#download_finish_tpl").html(), {heading:"{{ "Error while uploading" | trans }}", reasons: [reasons]});
                 $("#"+file.id, UploaderManager.getDownloadBox()).find('p.error').append(html).show();
 
             },
@@ -397,7 +397,7 @@
             $("button.upload-submitter", UploaderManager.getContainer()).attr("disabled", true).addClass('disabled');
 
             if (nbElements === 0) {
-                alert("{% trans 'Please select at least one valid file' %}");
+                alert("{{ 'Please select at least one valid file' | trans }}");
             }
         });
 
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 94c331a368..6fe0b0df79 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -5,14 +5,14 @@
         <ul>
             <li>
                 <a href="#tab-upload">
-                    {% trans 'Upload' %}
+                    {{ 'Upload' | trans }}
                 </a>
             </li>
             <li>
                 {# template prod/upload/lazaret.html.twig loaded via ajax #}
                 <a href="{{ path('lazaret_elements') }}">
                     {# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
-                    {% trans 'Quarantine' %}<span>&nbsp;</span>
+                    {{ 'Quarantine' | trans }}<span>&nbsp;</span>
                 </a>
             </li>
         </ul>
@@ -28,7 +28,7 @@
                             <tr>
                                 <td class='uploader-button'>
                                     <span class="btn btn-inverse fileinput-button input-medium">
-                                        <span>{% trans 'Select files...' %}</span>
+                                        <span>{{ 'Select files...' | trans }}</span>
                                         <input type="file" name="files[]" multiple>
                                     </span>
                                         <br />
@@ -37,23 +37,23 @@
                                     </span>
                                 </td>
                                 <td class='uploader-icon'>
-                                    <img src='/skins/icons/html5-logo.png' width="32px" heigh="32px"  title="{% trans 'You are using the HTML5 uploader.'%}"/>
+                                    <img src='/skins/icons/html5-logo.png' width="32px" heigh="32px"  title="{{ 'You are using the HTML5 uploader.' | trans }}"/>
                                 </td>
                                 <td class="uploader-info">
                                     <p>
-                                        {% trans 'You are using the HTML5 uploader.' %}
+                                        {{ 'You are using the HTML5 uploader.' | trans }}
                                         {% if not app['browser'].supportFileAPI() %}
-                                            {% trans 'Your browser does not support all HTML5 features properly.' %}
+                                            {{ 'Your browser does not support all HTML5 features properly.' | trans }}
                                         {% endif %}
                                     </p>
-                                    <a href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{% trans 'Use the Flash uploader' %}</a>
+                                    <a href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
                                 </td>
                             </tr>
                         </table>
 
                         {# settings box #}
                         <div class='settings-box'>
-                            <h5>{% trans 'upload:: Destination (collection) :' %} :</h5>
+                            <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                             {# collections list #}
                             <select name="base_id" class="span3" style="margin-left: 10px;">
                             {% for  sbasId, availableCollections in collections %}
@@ -68,7 +68,7 @@
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
                                     <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "display:block" :"display:none" }}'>
-                                        <h5>{% trans 'upload:: Status :' %} :</h5>
+                                        <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>
                                             {% for bit, status in availableCollections['databox'].get_statusbits() %}
@@ -100,8 +100,8 @@
                         <div class='upload-box' style="display: none;">
                             {% set quantity = '<span class="number-files">0</span>' %}
                             <h5>{% trans %}{{ quantity }}selected files{% endtrans %}</h5>
-                            <button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{% trans 'Clear list' %}</button>
-                            <button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{% trans 'Send' %}</button>
+                            <button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Clear list' | trans }}</button>
+                            <button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Send' | trans }}</button>
                             <div class="clear"></div>
                             <div class='upload-box-addedfiles'></div>
                             <div class="clear"></div>
@@ -110,7 +110,7 @@
 
                     <div id="uploadBoxRight" class="well">
                         <div>
-                            <h5 style="margin-top: 10px;">{% trans 'Transmited files' %} :
+                            <h5 style="margin-top: 10px;">{{ 'Transmited files' | trans }} :
                                 <span class='bitrate-box'></span>
                                 <span class="transmit-box pull-right" style="display: none;">
                                     <span class="number-files-transmited">0</span>
@@ -119,7 +119,7 @@
                                 </span>
                             </h5>
                             <button id="cancel-all" class="btn" type="button" disabled="disabled">
-                                {% trans "Cancel all" %}
+                                {{ "Cancel all" | trans }}
                             </button>
                         </div>
                         <div class="progress progress-striped active">
@@ -132,7 +132,7 @@
 
                 </form>
             {% else %}
-                {% trans 'You can not upload files' %}
+                {{ 'You can not upload files' | trans }}
             {% endif %}
          </div>
     </div>
diff --git a/templates/web/report/ajax_dashboard_content.html.twig b/templates/web/report/ajax_dashboard_content.html.twig
index 564633a812..20c71d9956 100644
--- a/templates/web/report/ajax_dashboard_content.html.twig
+++ b/templates/web/report/ajax_dashboard_content.html.twig
@@ -1,5 +1,5 @@
 {%block dashboard_content %}
-    <div id="title_dash" class="center" style="clear:left;">{% trans "report:: Dashboard" %}</div>
+    <div id="title_dash" class="center" style="clear:left;">{{ "report:: Dashboard" | trans }}</div>
         <div id="periode_dash" class="center" >{{ dashboard.getTitleDate('dmin') }} - {{ dashboard.getTitleDate('dmax') }}</div>
         <div id="liste_dash"  class="center">
             <em id="em_all" class="selected_em" >Toutes les bases</em>
diff --git a/templates/web/report/ajax_data_content.html.twig b/templates/web/report/ajax_data_content.html.twig
index ba32969cc8..e7dc01cd5e 100644
--- a/templates/web/report/ajax_data_content.html.twig
+++ b/templates/web/report/ajax_data_content.html.twig
@@ -55,8 +55,8 @@
 
     {% if is_plot %}
         <script type="text/javascript">
-                $("table:visible:first thead tr").prepend("<th>{% trans 'report::Heures' %}</th>");
-                $("table:visible:first tbody tr:first").prepend("<th>{% trans 'report:: Connexion' %}</th>");
+                $("table:visible:first thead tr").prepend("<th>{{ 'report::Heures' | trans }}</th>");
+                $("table:visible:first tbody tr:first").prepend("<th>{{ 'report:: Connexion' | trans }}</th>");
                 $colspan = $("table:visible:first tfoot tr:first td").attr("colspan");
                 $colspan++;
                 $("table:visible:first tfoot tr:first td").attr("colspan", $colspan);
@@ -105,7 +105,7 @@
                 </thead>
                 <tbody>
                     <tr>
-                    <th>{% trans "report:: Connexion" %}</th>
+                    <th>{{ "report:: Connexion" | trans }}</th>
                     {% if result.result.0|length > 1 %}
                         {% for key, value in result.result.0 %}
                             <td>{{ value }}</td>
diff --git a/templates/web/report/ajax_report_dashboard.html.twig b/templates/web/report/ajax_report_dashboard.html.twig
index 66db84dd4c..55dc82f051 100644
--- a/templates/web/report/ajax_report_dashboard.html.twig
+++ b/templates/web/report/ajax_report_dashboard.html.twig
@@ -2,11 +2,11 @@
 {% block alldash %}
     <div style="margin-top:15px;">
         <div style="float:left;">
-            <label for="dmin">{% trans "report:: Du (date)" %}</label>
+            <label for="dmin">{{ "report:: Du (date)" | trans }}</label>
             <input class= "dminDash" name="dmin" type="text" value="{{ dashboard_array.date.date.dmin}}" size="10" />
         </div>
         <div style="float:left;">
-            <label for="dmax">{% trans "report:: Au (date)" %}</label>
+            <label for="dmax">{{ "report:: Au (date)" | trans }}</label>
             <input class="dmaxDash" name="dmax" type="text" value="{{dashboard_array.date.date.dmax}}" size="10" />
         </div>
     </div>
@@ -18,7 +18,7 @@
         {% endfor %}
         </select>
     </div>
-    <div id="title_dash" class="center" style="clear:left;">{% trans "report:: Dashboard" %}</div>
+    <div id="title_dash" class="center" style="clear:left;">{{ "report:: Dashboard" | trans }}</div>
     <div id="periode_dash" class="center" >{{ dashboard_array.date.title.dmin }} - {{ dashboard_array.date.title.dmax }}</div>
     <div id="liste_dash"  class="center">{{ dashboard_array.listeStringBase }}</div>
     <div id="dashboard-table" >
diff --git a/templates/web/report/all_content.html.twig b/templates/web/report/all_content.html.twig
index 46aee17c58..b2f5b7d87a 100644
--- a/templates/web/report/all_content.html.twig
+++ b/templates/web/report/all_content.html.twig
@@ -15,12 +15,12 @@
             var usrId = '{{ dashboard.usr.get_id() }}' ;
 
             var language = {
-                valider : '{% trans "boutton::valider" %}',
-                choix_collection : '{% trans "veuillez choisir au minimum une collection" %}',
-                annuler : '{% trans "boutton::annuler" %}',
-                fermer : '{% trans "boutton::fermer" %}',
-        connexion : '{% trans "report:: Connexion" %}',
-        heure : '{% trans "report::Heures" %}'
+                valider : '{{ "boutton::valider" | trans }}',
+                choix_collection : '{{ "veuillez choisir au minimum une collection" | trans }}',
+                annuler : '{{ "boutton::annuler" | trans }}',
+                fermer : '{{ "boutton::fermer" | trans }}',
+        connexion : '{{ "report:: Connexion" | trans }}',
+        heure : '{{ "report::Heures" | trans }}'
             };
 
             var date = {
@@ -29,11 +29,11 @@
             };
 
             var dashboard ={
-                title_connexion : '{% trans "report::Nombre de connexions" %}',
-                title_jour : '{% trans "report:: jour" %}',
-                title_heure : '{% trans "report:: Heures" %}',
-                title_doc_add: '{% trans "report::Nombre de document ajoute" %}',
-                title_doc_edit:'{% trans "report::Nombre de document edite" %}'
+                title_connexion : '{{ "report::Nombre de connexions" | trans }}',
+                title_jour : '{{ "report:: jour" | trans }}',
+                title_heure : '{{ "report:: Heures" | trans }}',
+                title_doc_add: '{{ "report::Nombre de document ajoute" | trans }}',
+                title_doc_edit:'{{ "report::Nombre de document edite" | trans }}'
             }
 
     </script>
diff --git a/templates/web/report/chart.html.twig b/templates/web/report/chart.html.twig
index aa0df9ae0e..5d6c94c121 100644
--- a/templates/web/report/chart.html.twig
+++ b/templates/web/report/chart.html.twig
@@ -3,7 +3,7 @@
     {% if rs|length > 0 %}
         <div class="aroundTable">
             <table class="center imgdash" id="mytableday">
-                <caption>{% trans "report:: activite par jour" %}</caption>
+                <caption>{{ "report:: activite par jour" | trans }}</caption>
                 <thead>
                     <tr>
                         <th></th>
@@ -14,7 +14,7 @@
                 </thead>
                 <tbody>
                     <tr>
-                        <th>{% trans "report:: Connexion" %} {{  sbas_id|sbas_labels(app) }}</th>
+                        <th>{{ "report:: Connexion" | trans }} {{  sbas_id|sbas_labels(app) }}</th>
                         {% for key, value in rs %}
                             <td>{{ value }}</td>
                         {% endfor %}
@@ -27,7 +27,7 @@
     {% if dashboard_array.dashboard.activity_day|length > 0 %}
         <div class="aroundTable">
             <table class="center imgdash" id="mytableday">
-                <caption>{% trans "report:: activite par jour" %}</caption>
+                <caption>{{ "report:: activite par jour" | trans }}</caption>
                 <thead>
                     <tr>
                         <th></th>
@@ -40,7 +40,7 @@
                 {% for key, value in dashboard_array.dashboard.activity_day %}
                     {% if loop.index == 1 %}
                         <tr>
-                            <th>{% trans "report:: Connexion" %} {{ key|sbas_labels(app)}}</th>
+                            <th>{{ "report:: Connexion" | trans }} {{ key|sbas_labels(app)}}</th>
                             {% if value|length > 0 %}
                                 {% for k, v in value %}
                                     <td>{{ v }}</td>
diff --git a/templates/web/report/colFilter.html.twig b/templates/web/report/colFilter.html.twig
index 2c58a5e01d..dcd276ae41 100644
--- a/templates/web/report/colFilter.html.twig
+++ b/templates/web/report/colFilter.html.twig
@@ -2,17 +2,17 @@
     <form>
         <fieldset>
             <select name='filtre'>
-                <option value="{{ field }}">{% trans "report:: Enlever le filtre" %}</option>
+                <option value="{{ field }}">{{ "report:: Enlever le filtre" | trans }}</option>
                 {% for value in result %}
                     <option value="{{ value.value }}">
                     {% if value.val == "" %}
-                        {% trans "report:: non-renseigne"  %}
+                        {{ "report:: non-renseigne" | trans }}
                     {% else %}
                         {{ value.val }}
                     {% endif %}
                     </option>
                 {% else %}
-                    <option value="">{% trans "report:: non-renseigne" %}</option>
+                    <option value="">{{ "report:: non-renseigne" | trans }}</option>
                 {%endfor %}
             </select>
         </fieldset>
diff --git a/templates/web/report/dashboard_macro.html.twig b/templates/web/report/dashboard_macro.html.twig
index 619fe128fd..7f905a0a00 100644
--- a/templates/web/report/dashboard_macro.html.twig
+++ b/templates/web/report/dashboard_macro.html.twig
@@ -15,7 +15,7 @@
                     {% if value.id == "false" %}
                         <td>{{ value.lib|e }}</td>
                     {% else %}
-                        {% if sbasid == "true"%}
+                        {% if sbasid == "true" %}
                             <td><a href="#" id= "id_{{ value.id }}_{{ value.sbasid }}" class ="hasSbas">{{ value.lib|e }}</a></td>
                         {% else %}
                             <td><a href="#" id= "id_{{ value.id }}" >{{ value.lib|e }}</a></td>
diff --git a/templates/web/report/form_date_and_base.html.twig b/templates/web/report/form_date_and_base.html.twig
index bd8c202659..a7c76e0ebc 100644
--- a/templates/web/report/form_date_and_base.html.twig
+++ b/templates/web/report/form_date_and_base.html.twig
@@ -1,15 +1,15 @@
 
 {% block form_date_and_base %}
     <div class="form1">
-        <div class="form_titre">{% trans "report:: 1 - Periode" %}</div>
+        <div class="form_titre">{{ "report:: 1 - Periode" | trans }}</div>
         <div class="control-group">
-            <label for="dmin">{% trans "report:: Du (date)" %}</label>
+            <label for="dmin">{{ "report:: Du (date)" | trans }}</label>
             <div class="controls" style="display:inline-block">
                 <input class= "dmin" name="dmin" type="text" value="{{ dashboard.dmin}}" size="10" style='width:100px'/>
             </div>
         </div>
         <div class="control-group">
-             <label for="dmax">{% trans "report:: Au (date)" %}</label>
+             <label for="dmax">{{ "report:: Au (date)" | trans }}</label>
             <div class="controls" style="display:inline-block">
                 <input class="dmax" name="dmax" type="text" value="{{dashboard.dmax}}" size="10" style='width:100px'/>
             </div>
@@ -17,7 +17,7 @@
     </div>
  {% set all_coll = dashboard.getAllColl() %}
     <div class="form2">
-        <div class="form_titre">{% trans "report:: 2 - Bases" %}</div>
+        <div class="form_titre">{{ "report:: 2 - Bases" | trans }}</div>
         <div id="select_one">
             <ul class="multiselect" style="max-height: 150px; overflow-y: auto; overflow-x: hidden;">
                 <li>
diff --git a/templates/web/report/generate_tab.html.twig b/templates/web/report/generate_tab.html.twig
index 94ceabf266..15efabb4c0 100644
--- a/templates/web/report/generate_tab.html.twig
+++ b/templates/web/report/generate_tab.html.twig
@@ -12,10 +12,10 @@
                 <div class="left titleleft">
                     <div class="title left">{{ result.title }}</div>
                     {% if result.config %}
-                        <a href="#" class="config left"><img title="{% trans 'report :: configurer le tableau' %}" src="/skins/report/img/config.png"/></a>
+                        <a href="#" class="config left"><img title="{{ 'report :: configurer le tableau' | trans }}" src="/skins/report/img/config.png"/></a>
                     {% endif %}
                     {% if result.print %}
-                        <a href="#" class="jqprint left"><img  title="{% trans 'report :: imprimer le tableau' %}" src="/skins/report/img/print.png"/></a>
+                        <a href="#" class="jqprint left"><img  title="{{ 'report :: imprimer le tableau' | trans }}" src="/skins/report/img/print.png"/></a>
                     {% endif %}
                     {% if result.csv %}
                         <form class="form_csv left" method="POST" action="{{ path('report_export_csv') }}" target="iframe" >
@@ -41,7 +41,7 @@
                                     {{ total_count }} results
                                 {% endtrans %}
                             {% endif %}
-                            
+
                         </i>
                     {% endif %}
                 </div>
@@ -53,8 +53,8 @@
                 <th class="{{ key }}" scope="col" >
                 {% if value.sort == 1 %}
                     <div class="orderby">
-                        <img title="{% trans "Trier" %}" style="float:left;top:0;left:0;" class="asc" src="/skins/report/img/arrow_up.png"  />
-                        <img title="{% trans "Trier" %}" style="float:left;top:0;left:0;" class="desc" src="/skins/report/img/arrow_down.png" />
+                        <img title="{{ "Trier" | trans }}" style="float:left;top:0;left:0;" class="asc" src="/skins/report/img/arrow_up.png"  />
+                        <img title="{{ "Trier" | trans }}" style="float:left;top:0;left:0;" class="desc" src="/skins/report/img/arrow_down.png" />
                 {% endif %}
 
                 <div class="title_th" style="clear:both;color:black;">{{ value.title }}</div>
@@ -66,11 +66,11 @@
                 <div style="height:8px;">
 
                 {% if value.filter == 1 %}
-                    <a href="#" title="{% trans "Filtrer" %}" style="float:left;bottom:0;left:0;font-size:8px;" class="{{ key }} filter ">{% trans "report :: filtrer" %}</a>
+                    <a href="#" title="{{ "Filtrer" | trans }}" style="float:left;bottom:0;left:0;font-size:8px;" class="{{ key }} filter ">{{ "report :: filtrer" | trans }}</a>
                 {% endif %}
 
                 {% if value.groupby == 1 %}
-                    <a href="#" title="{% trans "Grouper" %}" style="float:right;bottom:0;right:0;font-size:8px;" class="{{ key }} groupby ">{% trans "report :: grouper" %}</a>
+                    <a href="#" title="{{ "Grouper" | trans }}" style="float:right;bottom:0;right:0;font-size:8px;" class="{{ key }} groupby ">{{ "report :: grouper" | trans }}</a>
                 {% endif %}
                 </div>
                 </th>
@@ -89,7 +89,7 @@
                     {% for key , res in value %}
                        {% if key == class %}
                             {% if config.bound == 1 and "</i>" not in res %}
-                                {% if key == "user" and value.user == "<b>TOTAL</b>"%}
+                                {% if key == "user" and value.user == "<b>TOTAL</b>" %}
                                     {{ res|raw }}
                                 {% elseif is_nav or is_doc %}
                                     <a href="#" rel ="" class="{{res}} bound">{{ res|raw }}</a>
@@ -119,6 +119,6 @@
         <br />
         <img src="/skins/report/img/noresults.png" />
         <br />
-        <i>{% trans "report :: aucun resultat trouve" %}</i><br />
+        <i>{{ "report :: aucun resultat trouve" | trans }}</i><br />
     </div>
 {% endif %}
diff --git a/templates/web/report/listColumn.html.twig b/templates/web/report/listColumn.html.twig
index 63ef919db6..127c476bd0 100644
--- a/templates/web/report/listColumn.html.twig
+++ b/templates/web/report/listColumn.html.twig
@@ -1,14 +1,14 @@
 {% block listColumn %}
 
   <div class='modalwrapper' style="height:400px; overflow-y: auto">
-    <div class="columnjson_title">{% trans "Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report" %} </div> <br />
+    <div class="columnjson_title">{{ "Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report" | trans }} </div> <br />
         <div>
             <div class="columnjson_link_box">
-                <a class="columnjson_link" href='#' id='on'><img src ='/skins/report/img/checkbox_checked.png' />{% trans "cocher tout" %}</a>
+                <a class="columnjson_link" href='#' id='on'><img src ='/skins/report/img/checkbox_checked.png' />{{ "cocher tout" | trans }}</a>
             </div>
             &nbsp;&nbsp;
             <div class="columnjson_link_box">
-                <a class="columnjson_link" href='#' id='off'><img src ='/skins/report/img/checkbox_unchecked.png' />{% trans "tout decocher" %}</a>
+                <a class="columnjson_link" href='#' id='off'><img src ='/skins/report/img/checkbox_unchecked.png' />{{ "tout decocher" | trans }}</a>
             </div>
         </div>
         <br />
@@ -24,7 +24,7 @@
             {% if key == "date" %}
                 {% set val = "ddate" %}
             {% endif %}
-            {% if k == "true"%}
+            {% if k == "true" %}
                 <input type='checkbox' value='{{ val }}' name='{{ key }}' checked='checked' /><label style='color:yellow;'>{{ value.0 }}</label><br />
             {% else %}
                 <input type='checkbox' value='{{ val }}' name='{{ key }}' checked='checked'/><label>{{ value.0 }}</label><br />
diff --git a/templates/web/report/report_layout.html.twig b/templates/web/report/report_layout.html.twig
index f1932ec228..54061f81c5 100644
--- a/templates/web/report/report_layout.html.twig
+++ b/templates/web/report/report_layout.html.twig
@@ -4,10 +4,10 @@
     <div id="form-container" >
         <div id="mainTabs">
             <ul id="navigation">
-              <li><a href="#dash">{% trans "report:: Dashboard" %}</a></li>
-                <li><a href="#report-connexions">{% trans "report:: Connexion" %}</a></li>
-              <li><a href="#report-telechargement">{% trans "report:: telechargements" %}</a></li>
-               <li><a href="#report-activite">{% trans "report:: activite du site" %}</a></li>
+              <li><a href="#dash">{{ "report:: Dashboard" | trans }}</a></li>
+                <li><a href="#report-connexions">{{ "report:: Connexion" | trans }}</a></li>
+              <li><a href="#report-telechargement">{{ "report:: telechargements" | trans }}</a></li>
+               <li><a href="#report-activite">{{ "report:: activite du site" | trans }}</a></li>
             </ul>
 
             {% block report_dashboard_layout %}
diff --git a/templates/web/report/report_layout_child.html.twig b/templates/web/report/report_layout_child.html.twig
index 0178704eac..aab7902f88 100644
--- a/templates/web/report/report_layout_child.html.twig
+++ b/templates/web/report/report_layout_child.html.twig
@@ -8,16 +8,16 @@
                     <div id="panel" style="height:40px;width:100%;display:none;">
                         <div style="margin-top:15px;float:left;margin-bottom:20px;">
                             <div style="float:left;" >
-                                <label for="dmin" class="form_titre">{% trans "report:: Du (date)" %}</label>
+                                <label for="dmin" class="form_titre">{{ "report:: Du (date)" | trans }}</label>
                                 <input class= "dminDash" name="dmin" type="text" value="{{ dashboard.dmin}}" size="10" />
                             </div>
                             <div style="float:left;margin-left:15px;">
-                                <label for="dmax" class="form_titre">{% trans "report:: Au (date)" %}</label>
+                                <label for="dmax" class="form_titre">{{ "report:: Au (date)" | trans }}</label>
                                 <input class="dmaxDash" name="dmax" type="text" value="{{dashboard.dmax}}" size="10" />
                             </div>
                         </div>
                         {# <div id="chooose" style="margin-left:15px;float:left;margin-top:15px;"> #}
-                        {#  <div class="form_titre">{% trans "report:: 2 - Bases" %}</div> #}
+                        {#  <div class="form_titre">{{ "report:: 2 - Bases" | trans }}</div> #}
                         {#  <label for="nameDash"></label> #}
                         {#  <select name="nameDash" style = "background-color:#555;color:orange;border:none;"> #}
                         {#    <option value="all">Global</option> #}
@@ -49,31 +49,31 @@
             {% include "report/form_date_and_base.html.twig" %}
             {% block form_connexion %}
                 <div class="form3">
-                    <div class="form_titre">{% trans "report:: 3 - Type de report" %} </div>
+                    <div class="form_titre">{{ "report:: 3 - Type de report" | trans }} </div>
                     {% if not anonymous %}
                         <div>
                             <input name="tbl" type="radio" value="CNXU" data-action="{{ path('report_activity_users_connexions') }}" id="CNXU-input" class="formsubmiter" />
-                            <label for="CNXU-input">{% trans "report:: (connexions) Par utilisateurs" %}</label>
+                            <label for="CNXU-input">{{ "report:: (connexions) Par utilisateurs" | trans }}</label>
                         </div>
                     {% else %}
                         <div>
                             <input name="tbl" type="radio" value="CNXU" data-action="{{ path('report_activity_users_connexions') }}" id="CNXU-input" class="formsubmiter" />
-                            <label for="CNXU-input">{% trans "report:: Grouper par" %}</label>
+                            <label for="CNXU-input">{{ "report:: Grouper par" | trans }}</label>
                             <select class="options" style="display:inline;display:none;" id="list-select" name="on" >
-                                <option selected ="selected" value="fonction" class="formsubmiter">{% trans "report:: fonction" %}</option>
-                                <option value="societe" class="formsubmiter">{% trans "report:: societe" %}</option>
-                                <option value="activite" class="formsubmiter">{% trans "report:: activite" %}</option>
-                                <option value="pays" class="formsubmiter">{% trans "report:: pays" %}</option>
+                                <option selected ="selected" value="fonction" class="formsubmiter">{{ "report:: fonction" | trans }}</option>
+                                <option value="societe" class="formsubmiter">{{ "report:: societe" | trans }}</option>
+                                <option value="activite" class="formsubmiter">{{ "report:: activite" | trans }}</option>
+                                <option value="pays" class="formsubmiter">{{ "report:: pays" | trans }}</option>
                             </select>
                         </div>
                     {% endif %}
                     <div>
                         <input name="tbl" type="radio" value="CNX" data-action="{{ path('report_connexions') }}" id="CNX-input" class="formsubmiter" />
-                        <label for="CNX-input">{% trans "report:: (connexions) Globales" %}</label>
+                        <label for="CNX-input">{{ "report:: (connexions) Globales" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="CNXB" data-action="{{ path('report_clients') }}" id="CNXB-input" class="formsubmiter" />
-                        <label for="CNXB-input">{% trans "report:: (connexions) OS et navigateurs" %}</label>
+                        <label for="CNXB-input">{{ "report:: (connexions) OS et navigateurs" | trans }}</label>
                     </div>
                 </div>
             {% endblock form_connexion %}
@@ -99,35 +99,35 @@
                     {% if anonymous %}
                         <div>
                             <input name="tbl" type="radio" value="USR" data-action="{{ path('report_activity_users_downloads') }}" id="USR-dl" class="formsubmiter" />
-                            <label for="USR-dl">{% trans "report:: Grouper par" %}</label>
+                            <label for="USR-dl">{{ "report:: Grouper par" | trans }}</label>
                             <select class="options" style="display:inline;display:none;" id="list-select2" name="on" >
-                                <option selected ="selected" value="fonction" class="formsubmiter">{% trans "report:: fonction" %}</option>
-                                <option value="societe" class="formsubmiter">{% trans "report:: societe" %}</option>
-                                <option value="activite" class="formsubmiter">{% trans  "report:: activite" %}</option>
-                                <option value="pays" class="formsubmiter">{% trans "report:: pays" %}</option>
+                                <option selected ="selected" value="fonction" class="formsubmiter">{{ "report:: fonction" | trans }}</option>
+                                <option value="societe" class="formsubmiter">{{ "report:: societe" | trans }}</option>
+                                <option value="activite" class="formsubmiter">{{ "report:: activite" | trans }}</option>
+                                <option value="pays" class="formsubmiter">{{ "report:: pays" | trans }}</option>
                             </select>
                         </div>
                     {% else %}
                         <div>
                             <input name="tbl" type="radio" value="USR" data-action="{{ path('report_activity_users_downloads') }}" id="USR-input" class="formsubmiter" />
-                            <label for="USR-input">{% trans "report:: par utilisateurs" %}</label>
+                            <label for="USR-input">{{ "report:: par utilisateurs" | trans }}</label>
                         </div>
                     {% endif %}
                     <div>
                         <input name="tbl" type="radio" value="GEN" data-action="{{ path('report_downloads') }}" id="GEN-input" class="formsubmiter" />
-                        <label for="GEN-input">{% trans "report:: (telechargement) Global" %}</label>
+                        <label for="GEN-input">{{ "report:: (telechargement) Global" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="DAY" data-action="{{ path('report_activity_instance_days') }}" id="DAY-input" class="formsubmiter" />
-                        <label for="DAY-input">{% trans "report:: (telechargement) Par jours base par base" %}</label>
+                        <label for="DAY-input">{{ "report:: (telechargement) Par jours base par base" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="DOC" data-action="{{ path('report_documents') }}" id="DOC-input" class="formsubmiter" />
-                        <label for="DOC-input">{% trans "report:: (telechargement) Par documents sur la base" %}</label>
+                        <label for="DOC-input">{{ "report:: (telechargement) Par documents sur la base" | trans }}</label>
                         <select class="options" id="precise" name="precise" style="display:none;">
-                            <option value="0">{% trans "report::aucune precision" %}</option>
-                            <option value="1">{% trans "report::la description contient" %}</option>
-                            <option value="2">{% trans "report:: recordid" %}</option>
+                            <option value="0">{{ "report::aucune precision" | trans }}</option>
+                            <option value="1">{{ "report::la description contient" | trans }}</option>
+                            <option value="2">{{ "report:: recordid" | trans }}</option>
                         </select>
                         <input name="preciseWord" type="text" value="" class="options entersubmiter" />
                     </div>
@@ -151,35 +151,35 @@
             {% include "report/form_date_and_base.html.twig" %}
             {% block form_activite %}
                 <div class="form3">
-                    <div class="form_titre">{% trans "report:: 3 - Type de report" %} </div>
+                    <div class="form_titre">{{ "report:: 3 - Type de report" | trans }} </div>
                     {% if anonymous %}
                         <input name="on" type="hidden" value="" checked="checked"/>
                     {% endif %}
                     <div>
                         <input name="tbl" type="radio" value="ASK" data-action="{{ path('report_questions') }}" id="ASK-input" class="formsubmiter" />
-                        <label for="ASK-input">{% trans "report:: toutes les questions" %}</label>
+                        <label for="ASK-input">{{ "report:: toutes les questions" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="BESTOF" data-action="{{ path('report_activity_questions_bestof') }}" id="BESTOF-input" class="formsubmiter" />
-                        <label for="BESTOF-input">{% trans "report:: Les questions les plus posees" %}</label>
+                        <label for="BESTOF-input">{{ "report:: Les questions les plus posees" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="NOBESTOF" data-action="{{ path('report_activity_questions_nobestof') }}" id="NOBESTOF-input" class="formsubmiter" />
-                        <label for="NOBESTOF-input">{% trans "report:: questions sans reponses" %}</label>
+                        <label for="NOBESTOF-input">{{ "report:: questions sans reponses" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="SITEACTIVITY" data-action="{{ path('report_activity_questions_nobestof') }}" id="SITEACTIVITY-input" class="formsubmiter" />
-                        <label for="SITEACTIVITY-input">{% trans "report:: activite du site" %}</label>
+                        <label for="SITEACTIVITY-input">{{ "report:: activite du site" | trans }}</label>
                     </div>
                     <div>
                         <input name="tbl" type="radio" value="WDOC" data-action="{{ path('report_activity_documents_pushed') }}" id="WDOC" class="formsubmiter" />
-                        <label for="WDOC">{% trans "report:: document" %}</label>
+                        <label for="WDOC">{{ "report:: document" | trans }}</label>
                         <select class="options" style="display:inline;display:none;" id="list-select3" name="docwhat" >
-                            <option selected ="selected" value="PUSHDOC" data-action="{{ path('report_activity_documents_pushed') }}" class="formsubmiter">{% trans "report:: pushe" %}</option>
-                            <option value="ADDDOC" data-action="{{ path('report_activity_documents_added') }}" class="formsubmiter">{% trans "report:: ajoute" %}</option>
-                            <option value="EDIDOC" data-action="{{ path('report_activity_documents_edited') }}" class="formsubmiter">{% trans "report:: edite" %}</option>
-                            <option value="VALIDOC" data-action="{{ path('report_activity_documents_validated') }}" class="formsubmiter">{% trans "report:: valide" %}</option>
-                            <option value="SENTDOC" data-action="{{ path('report_activity_documents_sent') }}" class="formsubmiter">{% trans "Sent" %}</option>
+                            <option selected ="selected" value="PUSHDOC" data-action="{{ path('report_activity_documents_pushed') }}" class="formsubmiter">{{ "report:: pushe" | trans }}</option>
+                            <option value="ADDDOC" data-action="{{ path('report_activity_documents_added') }}" class="formsubmiter">{{ "report:: ajoute" | trans }}</option>
+                            <option value="EDIDOC" data-action="{{ path('report_activity_documents_edited') }}" class="formsubmiter">{{ "report:: edite" | trans }}</option>
+                            <option value="VALIDOC" data-action="{{ path('report_activity_documents_validated') }}" class="formsubmiter">{{ "report:: valide" | trans }}</option>
+                            <option value="SENTDOC" data-action="{{ path('report_activity_documents_sent') }}" class="formsubmiter">{{ "Sent" | trans }}</option>
                         </select>
                     </div>
                 </div>
diff --git a/templates/web/setup/step2.html.twig b/templates/web/setup/step2.html.twig
index d74217aed9..a518061035 100644
--- a/templates/web/setup/step2.html.twig
+++ b/templates/web/setup/step2.html.twig
@@ -32,25 +32,25 @@
             return false;
           });
           var language = {
-            ajaxError        : "{% trans 'Erreur lors du contact avec le serveur WEB' %}",
-            ajaxTimeout        : "{% trans 'Delai depasse lors du contact avec le serveur WEB' %}",
-            requiredField      : "{% trans 'Required' %}",
-            validateEmail      : "{% trans 'forms::merci d\'entrer une adresse e-mail valide' %}",
-            validatePassword    : "{% trans 'forms::ce champ est requis' %}",
-            validatePasswordConfirm  : "{% trans 'forms::ce champ est requis' %}",
-            validatePasswordEqual  : "{% trans 'forms::les mots de passe ne correspondent pas' %}",
-            wrongCredentials    : "{% trans 'Vous devez specifier une adresse email et un mot de passe valides' %}",
-            wrongDatabasename    : "{% trans 'Le nom de base de donnee est incorrect' %}",
-            someErrors        : "{% trans 'Il y a des erreurs, merci de les corriger avant de continuer' %}"
+            ajaxError        : "{{ 'Erreur lors du contact avec le serveur WEB' | trans }}",
+            ajaxTimeout        : "{{ 'Delai depasse lors du contact avec le serveur WEB' | trans }}",
+            requiredField      : "{{ 'Required' | trans }}",
+            validateEmail      : "{{ 'forms::merci d\'entrer une adresse e-mail valide' | trans }}",
+            validatePassword    : "{{ 'forms::ce champ est requis' | trans }}",
+            validatePasswordConfirm  : "{{ 'forms::ce champ est requis' | trans }}",
+            validatePasswordEqual  : "{{ 'forms::les mots de passe ne correspondent pas' | trans }}",
+            wrongCredentials    : "{{ 'Vous devez specifier une adresse email et un mot de passe valides' | trans }}",
+            wrongDatabasename    : "{{ 'Le nom de base de donnee est incorrect' | trans }}",
+            someErrors        : "{{ 'Il y a des erreurs, merci de les corriger avant de continuer' | trans }}"
           }
 
           $.validator.passwordRating.messages = {
-            "similar-to-username": "{% trans 'forms::le mot de passe est trop similaire a l\'identifiant' %}",
-            "too-short": "{% trans 'forms::la valeur donnee est trop courte' %}",
-            "very-weak": "{% trans 'forms::le mot de passe est trop simple' %}",
-            "weak": "{% trans 'forms::le mot de passe est trop simple' %}",
-            "good": "{% trans 'forms::le mot de passe est bon' %}",
-            "strong": "{% trans 'forms::le mot de passe est tres bon' %}"
+            "similar-to-username": "{{ 'forms::le mot de passe est trop similaire a l\'identifiant' | trans }}",
+            "too-short": "{{ 'forms::la valeur donnee est trop courte' | trans }}",
+            "very-weak": "{{ 'forms::le mot de passe est trop simple' | trans }}",
+            "weak": "{{ 'forms::le mot de passe est trop simple' | trans }}",
+            "good": "{{ 'forms::le mot de passe est bon' | trans }}",
+            "strong": "{{ 'forms::le mot de passe est tres bon' | trans }}"
           };
 
           $("#create_admin").validate({
@@ -93,7 +93,7 @@
             var $current = $(this).closest('.steps');
             if($('input.field_error, input.error', $current).length > 0)
             {
-              alert('{% trans "Veuillez corriger les erreurs avant de poursuivre" %}');
+              alert('{{ "Veuillez corriger les erreurs avant de poursuivre" | trans }}');
 
               return false;
             }
@@ -235,10 +235,10 @@
                 if(datas.connection === true && datas.database === true)
                 {
                   el_status.attr('src','/skins/icons/ok.png').show();
-                  el_message.empty().append("{% trans 'Successfull connection' %}");
+                  el_message.empty().append("{{ 'Successfull connection' | trans }}");
                   if(!datas.is_empty)
                   {
-                    el_message.append("<br>{% trans 'Warning, this database is not empty' %}");
+                    el_message.append("<br>{{ 'Warning, this database is not empty' | trans }}");
                     el_status.attr('src','/skins/icons/alert.png').show();
                   }
                   if(typeof callback == 'function')
@@ -248,11 +248,11 @@
                 }
                 if(datas.connection === true)
                 {
-                  el_message.empty().append("{% trans 'Connection is OK but database does not exists or can not be accessed' %}");
+                  el_message.empty().append("{{ 'Connection is OK but database does not exists or can not be accessed' | trans }}");
                 }
                 else
                 {
-                  el_message.empty().append("{% trans 'Unable to connect to MySQL server' %}");
+                  el_message.empty().append("{{ 'Unable to connect to MySQL server' | trans }}");
                 }
                 el_status.attr('src', '/skins/icons/delete.png').show();
 
@@ -261,12 +261,12 @@
               timeout:function(){
                 el_loader.css('visibility', 'hidden');
                 el_status.attr('src', '/skins/icons/delete.png').show();
-                el_message.empty().append("{% trans 'Unable to connect to MySQL server' %}");
+                el_message.empty().append("{{ 'Unable to connect to MySQL server' | trans }}");
               },
               error:function(datas){
                 el_loader.css('visibility', 'hidden');
                 el_status.attr('src', '/skins/icons/delete.png').show();
-                el_message.empty().append("{% trans 'Unable to connect to MySQL server' %}");
+                el_message.empty().append("{{ 'Unable to connect to MySQL server' | trans }}");
               }
             });
           }
@@ -335,7 +335,7 @@
                                 {% if warnings is not empty %}
                                     <tr>
                                         <td>
-                                            <a href="{{ path('install_root') }}">{% trans 'Review system configuration' %}</a>
+                                            <a href="{{ path('install_root') }}">{{ 'Review system configuration' | trans }}</a>
                                         </td>
                                     </tr>
                                 {% endif %}
@@ -352,7 +352,7 @@
                           <td>
                             <p>
                               <a href="https://docs.phraseanet.com/3.8/Admin/" target="_blank">
-                                {% trans 'Prerequisite and Configuration' %}
+                                {{ 'Prerequisite and Configuration' | trans }}
                               </a>
                             </p>
                           </td>
@@ -367,7 +367,7 @@
                       <td>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next">{% trans 'boutton::suivant' %}</button>
+                        <button class="next">{{ 'boutton::suivant' | trans }}</button>
                       </td>
                     </tr>
                   </table>
@@ -380,7 +380,7 @@
                   <div class="PNB10 wrapper_left">
                     <div class="PNB10 section_title">
                       <h2>
-                        1/5 {% trans 'Executables externes' %}
+                        1/5 {{ 'Executables externes' | trans }}
                       </h2>
                     </div>
                     <div class="PNB10" style="top:50px;overflow-x:hidden;">
@@ -395,7 +395,7 @@
                                 {% endif %}
                               <tr>
                                 <td><label>{{ binary['name'] }}</label> </td>
-                                <td><input autocomplete="off" name="binary_{{key}}" class="path_to_test test_executable {% if required == "1" %}required{% endif %}" type="text" value="{{ binary['binary'] }}" /> {% if required == "1" %}{% trans 'Required field' %}{% endif %}</td>
+                                <td><input autocomplete="off" name="binary_{{key}}" class="path_to_test test_executable {% if required == "1" %}required{% endif %}" type="text" value="{{ binary['binary'] }}" /> {% if required == "1" %}{{ 'Required field' | trans }}{% endif %}</td>
                               </tr>
                               {% endfor %}
                             </table>
@@ -410,13 +410,13 @@
                         <tr>
                           <td>
                             <p>
-                              {% trans 'Phraseanet may require many binaries.' %}
+                              {{ 'Phraseanet may require many binaries.' | trans }}
                             </p>
                             <p>
-                              {% trans 'Some of them are required, like the indexer, Exiftool or ImageMagick components, some others are optionnal, like FFmpeg which is used to preview video files.' %}
+                              {{ 'Some of them are required, like the indexer, Exiftool or ImageMagick components, some others are optionnal, like FFmpeg which is used to preview video files.' | trans }}
                             </p>
                             <p>
-                              {% trans 'Don\'t worry, You can modify your configuration later' %}
+                              {{ 'Don\'t worry, You can modify your configuration later' | trans }}
                             </p>
                           </td>
                         </tr>
@@ -428,10 +428,10 @@
                   <table>
                     <tr>
                       <td>
-                        <button class="previous">{% trans 'boutton::precedent' %}</button>
+                        <button class="previous">{{ 'boutton::precedent' | trans }}</button>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next">{% trans 'boutton::suivant' %}</button>
+                        <button class="next">{{ 'boutton::suivant' | trans }}</button>
                       </td>
                     </tr>
                   </table>
@@ -446,7 +446,7 @@
                   <div class="PNB10 wrapper_left">
                     <div class="PNB10 section_title">
                       <h2>2/5
-                          {% trans 'Creation de votre compte' %}
+                          {{ 'Creation de votre compte' | trans }}
                       </h2>
                     </div>
                     <div class="PNB10" style="top:50px;overflow-x:hidden;">
@@ -455,11 +455,11 @@
                           <td>
                             <table class="main_content_table">
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Votre adresse email' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Votre adresse email' | trans }}</label></td>
                                 <td><input class="error" type="text" name="email" value="" /></td>
                               </tr>
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Votre mot de passe' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Votre mot de passe' | trans }}</label></td>
                                 <td><input autocomplete="off" type="password" name="password" value="" /></td>
                               </tr>
                               <tr>
@@ -475,20 +475,20 @@
                                 </td>
                               </tr>
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Confirmation de votre mot de passe' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Confirmation de votre mot de passe' | trans }}</label></td>
                                 <td><input autocomplete="off" type="password" name="password_confirm" value="" /></td>
                               </tr>
                               <tr>
                               <tr>
                                 <td colspan="2">
                                   <div style="border:1px solid #404040;padding:0 10px;margin:20px 0">
-                                    <h3>{% trans 'admin::compte-utilisateur A propos de la securite des mots de passe :' %}</h3>
-                                    <p>{% trans 'admin::compte-utilisateur Les mots de passe doivent etre clairement distincts du login et contenir au moins deux types parmis les caracteres suivants :' %}</p>
+                                    <h3>{{ 'admin::compte-utilisateur A propos de la securite des mots de passe :' | trans }}</h3>
+                                    <p>{{ 'admin::compte-utilisateur Les mots de passe doivent etre clairement distincts du login et contenir au moins deux types parmis les caracteres suivants :' | trans }}</p>
                                     <dl style="border:none;float:none;">
-                                      <dt>{% trans 'admin::compte-utilisateur::securite caracteres speciaux' %}</dt>
-                                      <dt>{% trans 'admin::compte-utilisateur::securite caracteres majuscules' %}</dt>
-                                      <dt>{% trans 'admin::compte-utilisateur::securite caracteres minuscules' %}</dt>
-                                      <dt>{% trans 'admin::compte-utilisateur::securite caracteres numeriques' %}</dt>
+                                      <dt>{{ 'admin::compte-utilisateur::securite caracteres speciaux' | trans }}</dt>
+                                      <dt>{{ 'admin::compte-utilisateur::securite caracteres majuscules' | trans }}</dt>
+                                      <dt>{{ 'admin::compte-utilisateur::securite caracteres minuscules' | trans }}</dt>
+                                      <dt>{{ 'admin::compte-utilisateur::securite caracteres numeriques' | trans }}</dt>
                                     </dl>
                                   </div>
                                 </td>
@@ -505,8 +505,8 @@
                         <tr>
                           <td>
                             <p>
-                              {% trans 'Your email will be used to log in the application.'%} <br/><br/>
-                              {% trans 'Please be sure it is still valid and you can access it' %}
+                              {{ 'Your email will be used to log in the application.' | trans }} <br/><br/>
+                              {{ 'Please be sure it is still valid and you can access it' | trans }}
                             </p>
                           </td>
                         </tr>
@@ -518,10 +518,10 @@
                   <table>
                     <tr>
                       <td>
-                        <button class="previous">{% trans 'boutton::precedent' %}</button>
+                        <button class="previous">{{ 'boutton::precedent' | trans }}</button>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next">{% trans 'boutton::suivant' %}</button>
+                        <button class="next">{{ 'boutton::suivant' | trans }}</button>
                       </td>
                     </tr>
                   </table>
@@ -554,32 +554,32 @@
                             <table class="main_content_table">
                               <tr>
                                 <td colspan="2">
-                                  <h3>{% trans 'MySQL database connection parameters' %}</h3>
+                                  <h3>{{ 'MySQL database connection parameters' | trans }}</h3>
                                 </td>
                               </tr>
                               <tr class="optional_ab_datas">
-                                <td style="width:200px;"><label>{% trans 'phraseanet:: adresse' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'phraseanet:: adresse' | trans }}</label></td>
                                 <td><input autocomplete="off" type="text" name="ab_hostname" value="localhost" /></td>
                               </tr>
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Database user' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Database user' | trans }}</label></td>
                                 <td><input type="text" name="ab_user" value=""  /></td>
                               </tr>
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'admin::compte-utilisateur mot de passe' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'admin::compte-utilisateur mot de passe' | trans }}</label></td>
                                 <td><input type="password" name="ab_password" value="" autocomplete="off" /></td>
                               </tr>
                               <tr class="optional_ab_datas">
-                                <td style="width:200px;"><label>{% trans 'phraseanet:: port' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'phraseanet:: port' | trans }}</label></td>
                                 <td><input autocomplete="off" type="text" name="ab_port" value="3306" /></td>
                               </tr>
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Database' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Database' | trans }}</label></td>
                                 <td><input type="text" name="ab_name" value="" /></td>
                               </tr>
                               <tr style="height:40px;">
                                 <td style="text-align:center;">
-                                  <button class="ab_tester error">{% trans 'boutton::tester' %}</button>
+                                  <button class="ab_tester error">{{ 'boutton::tester' | trans }}</button>
                                   <img class="tester_loader" style="visibility:hidden;" src="/skins/icons/loader-black.gif"/>
                                   <img class="tester_status" style="display:none;" src="/skins/icons/delete.png"/>
                                 </td>
@@ -610,10 +610,10 @@
                         <tr>
                           <td>
                             <p>
-                              {% trans 'ApplicationBox is a Mysql database.' %}
+                              {{ 'ApplicationBox is a Mysql database.' | trans }}
                             </p>
                             <p>
-                              {% trans 'It stores users datas, rights, and references to DataBoxes where records are stored.' %}
+                              {{ 'It stores users datas, rights, and references to DataBoxes where records are stored.' | trans }}
                             </p>
                             <p>
                               {% set link_start = '<a href="https://mariadb.org/" target="_blank">' %}
@@ -637,10 +637,10 @@
                   <table>
                     <tr>
                       <td>
-                        <button class="previous">{% trans 'boutton::precedent' %}</button>
+                        <button class="previous">{{ 'boutton::precedent' | trans }}</button>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next">{% trans 'boutton::suivant' %}</button>
+                        <button class="next">{{ 'boutton::suivant' | trans }}</button>
                       </td>
                     </tr>
                   </table>
@@ -655,7 +655,7 @@
                   <div class="PNB10 wrapper_left">
                     <div class="PNB10 section_title">
                       <h2>4/5
-                        {% trans 'setup::Configuration des repertoires de stockage' %}
+                        {{ 'setup::Configuration des repertoires de stockage' | trans }}
                       </h2>
                     </div>
                     <div class="PNB10" style="top:50px;overflow-x:hidden;">
@@ -664,7 +664,7 @@
                           <td>
                             <table class="main_content_table">
                               <tr>
-                                <td><label>{% trans 'Repertoire de stockage des fichiers' %}</label></td>
+                                <td><label>{{ 'Repertoire de stockage des fichiers' | trans }}</label></td>
                                 <td><input class="path_to_test test_writeable required" type="text" name="datapath_noweb" value="" /></td>
                               </tr>
                             </table>
@@ -679,13 +679,13 @@
                         <tr>
                           <td>
                             <p>
-                              {% trans 'Your medias and their subdefinitions (previews, thumbnails..) will be stored in these directories.' %}
+                              {{ 'Your medias and their subdefinitions (previews, thumbnails..) will be stored in these directories.' | trans }}
                             </p>
                             <p>
-                              {% trans 'Thumbnails directory is mounted to be accessible via HTTP, while other files are not.' %}
+                              {{ 'Thumbnails directory is mounted to be accessible via HTTP, while other files are not.' | trans }}
                             </p>
                             <p>
-                              {% trans 'If you plan to store large files, be sure it will fit in these directories.' %}
+                              {{ 'If you plan to store large files, be sure it will fit in these directories.' | trans }}
                             </p>
                           </td>
                         </tr>
@@ -697,10 +697,10 @@
                   <table>
                     <tr>
                       <td>
-                        <button class="previous">{% trans 'boutton::precedent' %}</button>
+                        <button class="previous">{{ 'boutton::precedent' | trans }}</button>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next">{% trans 'boutton::suivant' %}</button>
+                        <button class="next">{{ 'boutton::suivant' | trans }}</button>
                       </td>
                     </tr>
                   </table>
@@ -725,21 +725,21 @@
                           <td>
                             <table class="main_content_table">
                               <tr>
-                                <td colspan="2"><h3>{% trans 'MySQL database connection parameters' %}</h3></td>
+                                <td colspan="2"><h3>{{ 'MySQL database connection parameters' | trans }}</h3></td>
                               </tr>
 
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Ne pas creer de DataBox maintenant' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Ne pas creer de DataBox maintenant' | trans }}</label></td>
                                 <td><input type="checkbox" class="databox_create" /></td>
                               </tr>
 
                               <tr>
-                                <td style="width:200px;"><label>{% trans 'Database' %}</label></td>
+                                <td style="width:200px;"><label>{{ 'Database' | trans }}</label></td>
                                 <td><input class="databox_creation_input" type="text" name="db_name" value="" /></td>
                               </tr>
                               <tr style="height:40px;">
                                 <td style="text-align:center;">
-                                  <button class="db_tester error">{% trans 'boutton::tester' %}</button>
+                                  <button class="db_tester error">{{ 'boutton::tester' | trans }}</button>
                                   <img class="tester_loader" style="visibility:hidden;" src="/skins/icons/loader-black.gif"/>
                                   <img class="tester_status" style="display:none;" src="/skins/icons/delete.png"/>
                                 </td>
@@ -748,7 +748,7 @@
                                 </td>
                               </tr>
                               <tr>
-                                <td><label>{% trans 'Modele de donnees' %}</label></td>
+                                <td><label>{{ 'Modele de donnees' | trans }}</label></td>
                                 <td>
                                   <select name="db_template" class="databox_creation_input">
                                   {% for template in available_templates %}
@@ -766,7 +766,7 @@
                                       Creation des taches
                                     {% endtrans %}
                                   </h3>
-                                  {% trans 'Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations' %}
+                                  {{ 'Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations' | trans }}
                                   <br/><br/>
                                 </td>
                               </tr>
@@ -774,19 +774,19 @@
                                 <td style="width:100px;text-align:right;">
                                   <input  type="checkbox" name="create_task[]" value="writemeta" checked />
                                 </td>
-                                <td><label>{% trans 'Creer la tache d\'ecriture des metadonnees' %}</label></td>
+                                <td><label>{{ 'Creer la tache d\'ecriture des metadonnees' | trans }}</label></td>
                               </tr>
                               <tr>
                                 <td style="width:100px;text-align:right;">
                                   <input  type="checkbox" name="create_task[]" value="subdef" checked />
                                 </td>
-                                <td><label>{% trans 'Creer la tache de creation des sous-definitions' %}</label></td>
+                                <td><label>{{ 'Creer la tache de creation des sous-definitions' | trans }}</label></td>
                               </tr>
                               <tr>
                                 <td style="width:100px;text-align:right;">
                                   <input  type="checkbox" name="create_task[]" value="cindexer" checked />
                                 </td>
-                                <td><label>{% trans 'Creer la tache d\'indexation' %}</label></td>
+                                <td><label>{{ 'Creer la tache d\'indexation' | trans }}</label></td>
                               </tr>
                             </table>
                           </td>
@@ -800,8 +800,8 @@
                         <tr>
                           <td>
                             <p>
-                              {% trans 'Phraseanet DataBoxes are MySQL databases, queryable by Phraseanet ApplicationBox.' %}<br/><br/>
-                              {% trans 'Databoxes store records, metadatas and their classifications' %}
+                              {{ 'Phraseanet DataBoxes are MySQL databases, queryable by Phraseanet ApplicationBox.' | trans }}<br/><br/>
+                              {{ 'Databoxes store records, metadatas and their classifications' | trans }}
                             </p>
                           </td>
                         </tr>
@@ -813,17 +813,17 @@
                   <table>
                     <tr>
                       <td>
-                        <button class="previous">{% trans 'boutton::precedent' %}</button>
+                        <button class="previous">{{ 'boutton::precedent' | trans }}</button>
                       </td>
                       <td style="text-align:right;">
-                        <button class="next install" type="submit">{% trans 'button::Install' %}</button>
+                        <button class="next install" type="submit">{{ 'button::Install' | trans }}</button>
                       </td>
                     </tr>
                   </table>
                 </div>
               </div>
             </form>
-        <div id="install_wait" style="display:none;" title="{% trans 'Install in progess' %}">
+        <div id="install_wait" style="display:none;" title="{{ 'Install in progess' | trans }}">
           <p>
             <img src="/skins/icons/loader111111.gif"/>
             {% trans %}
diff --git a/templates/web/thesaurus/accept.html.twig b/templates/web/thesaurus/accept.html.twig
index 1412f6761d..25caa0c203 100644
--- a/templates/web/thesaurus/accept.html.twig
+++ b/templates/web/thesaurus/accept.html.twig
@@ -6,7 +6,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: accepter...' %}</title>
+        <title>{{ 'thesaurus:: accepter...' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <style type="text/css">
             .path_separator
@@ -102,32 +102,32 @@
                 <br/>
                 <br/>
                 <br/>
-                {% trans 'thesaurus:: removed_src' %}
+                {{ 'thesaurus:: removed_src' | trans }}
                 <br/>
                 <br/>
-                {% trans 'thesaurus:: refresh' %}
+                {{ 'thesaurus:: refresh' | trans }}
                 <br/>
                 <br/>
                 <br/>
                 <br/>
                 <br/>
-                <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{% trans 'boutton::fermer' %}" onclick="self.close();">
+                <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
         {% else %}
             {% if not term_found %}
                 <center>
                     <br/>
                     <br/>
                     <br/>
-                    {% trans 'thesaurus:: removed tgt' %}
+                    {{ 'thesaurus:: removed tgt' | trans }}
                     <br/>
                     <br/>
-                    {% trans 'thesaurus:: refresh' %}
+                    {{ 'thesaurus:: refresh' | trans }}
                     <br/>
                     <br/>
                     <br/>
                     <br/>
                     <br/>
-                    <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{% trans 'boutton::fermer' %}" onclick="self.close();">
+                    <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
             {% else %}
                 {% if acceptable %}
                     <center>
@@ -139,10 +139,10 @@
                             <input type="hidden" name="tgt" value="{{ tgt | url_encode }}">
                             <input type="hidden" name="tgt" value="{{ tgt | url_encode }}">
                     {% if nts == 0 %}
-                        {% trans 'thesaurus:: Accepter le terme comme' %}
+                        {{ 'thesaurus:: Accepter le terme comme' | trans }}
                         <br/><br/><h4>{{ fullpath_src | raw }}</h4><br/><br/>
                         <br/>
-                        <input type='radio' name='as' value='TS' checked>{% trans 'thesaurus:: comme terme specifique' %}
+                        <input type='radio' name='as' value='TS' checked>{{ 'thesaurus:: comme terme specifique' | trans }}
                         <br/><br/>
                         <input type='radio' name='as' value='SY'>
                         {% set fullpath_tgt_raw = fullpath_tgt | raw %}
@@ -152,16 +152,16 @@
                         <br/>
                     {% else %}
                         <br/><br/><h4>{{ fullpath_src | raw }}</h4><br/><br/>
-                        {% trans 'thesaurus:: Accepter la branche comme' %}
-                        &nbsp;{% trans 'thesaurus:: comme terme specifique' %}
+                        {{ 'thesaurus:: Accepter la branche comme' | trans }}
+                        &nbsp;{{ 'thesaurus:: comme terme specifique' | trans }}
                         <br/><br/><h4>{{ fullpath_tgt | raw }}</h4><br/><br/>
                         <input type='hidden' name='as' value='TS'>
                     {% endif %}
                             <br/>
                             <br/>
-                            <input style="position:relative; z-index:2; width:100px" type="button" id="ok_button" value="{% trans 'boutton::valider' %}" onclick="ok();">
+                            <input style="position:relative; z-index:2; width:100px" type="button" id="ok_button" value="{{ 'boutton::valider' | trans }}" onclick="ok();">
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="self.close();">
+                            <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="self.close();">
                         </form>
                     </center>
                 {% else %}
@@ -179,7 +179,7 @@
                         <br/>
                         <br/>
                         <br/>
-                        <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="self.close();">
+                        <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="self.close();">
                 {% endif %}
             {% endif %}
         {% endif %}
diff --git a/templates/web/thesaurus/export-text-dialog.html.twig b/templates/web/thesaurus/export-text-dialog.html.twig
index 228b341bbd..3ea9552139 100644
--- a/templates/web/thesaurus/export-text-dialog.html.twig
+++ b/templates/web/thesaurus/export-text-dialog.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: export au format texte' %}</title>
+        <title>{{ 'thesaurus:: export au format texte' | trans }}</title>
 
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript">
@@ -68,8 +68,8 @@
             <table>
                 <thead>
                     <tr>
-                        <th>{% trans 'thesaurus:: options d\'export : ' %}</th>
-                        <th>{% trans 'thesaurus:: example' %}</th>
+                        <th>{{ 'thesaurus:: options d\'export : ' | trans }}</th>
+                        <th>{{ 'thesaurus:: example' | trans }}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -77,28 +77,28 @@
                         <td valign="top" style="padding:5px">
                             <div style="white-space:nowrap">
                                 <input type='radio' name='ofm' checked value='text'>
-                                {% trans 'thesaurus:: export au format texte' %}
+                                {{ 'thesaurus:: export au format texte' | trans }}
                             </div>
                             <div id='subform_text' style="margin-left:10px;">
                                 <div style="white-space:nowrap">
                                     <input type='radio' name='osl' checked value='1' onclick="chgFormat();">
-                                    {% trans 'thesaurus:: exporter avec les synonymes sur la meme ligne' %}
+                                    {{ 'thesaurus:: exporter avec les synonymes sur la meme ligne' | trans }}
                                 </div>
                                 <div style="white-space:nowrap">
                                     <input type='radio' name='osl' value='0' onclick="chgFormat();">
-                                    {% trans 'thesaurus:: exporter avec une ligne par synonyme' %}
+                                    {{ 'thesaurus:: exporter avec une ligne par synonyme' | trans }}
                                 </div>
                                 <div style="white-space:nowrap">
                                     <input type='checkbox' name='iln' value='1' onclick="chgFormat();">
-                                    {% trans 'thesaurus:: export : numeroter les lignes ' %}
+                                    {{ 'thesaurus:: export : numeroter les lignes ' | trans }}
                                 </div>
                                 <div style="white-space:nowrap">
                                     <input type='checkbox' name='ilg' value='1' onclick="chgFormat();">
-                                    {% trans 'thesaurus:: export : inclure la langue' %}
+                                    {{ 'thesaurus:: export : inclure la langue' | trans }}
                                 </div>
                                 <div style="white-space:nowrap">
                                     <input type='checkbox' name='hit' value='1' onclick="chgFormat();">
-                                    {% trans 'thesaurus:: export : inclure les hits' %}
+                                    {{ 'thesaurus:: export : inclure les hits' | trans }}
                                 </div>
                             </div>
                         </td>
@@ -110,9 +110,9 @@
             </table>
             <br/>
             <br/>
-            <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:100px;">
+            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:100px;">
+            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/export-text.html.twig b/templates/web/thesaurus/export-text.html.twig
index 8ef4380856..63f7e119ca 100644
--- a/templates/web/thesaurus/export-text.html.twig
+++ b/templates/web/thesaurus/export-text.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: export au format texte' %}</title>
+        <title>{{ 'thesaurus:: export au format texte' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript">
             function loaded()
diff --git a/templates/web/thesaurus/export-topics-dialog.html.twig b/templates/web/thesaurus/export-topics-dialog.html.twig
index a2901f9320..1a16fd488a 100644
--- a/templates/web/thesaurus/export-topics-dialog.html.twig
+++ b/templates/web/thesaurus/export-topics-dialog.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: export en topics' %}</title>
+        <title>{{ 'thesaurus:: export en topics' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript">
             var format = '???';
@@ -68,10 +68,10 @@
 
             <div style="padding:10px;">
                 <div class="x3Dbox">
-                    <span class="title">{% trans 'thesaurus:: exporter' %}</span>
+                    <span class="title">{{ 'thesaurus:: exporter' | trans }}</span>
                     <div style="white-space:nowrap">
                         <input type='radio' name='ofm' checked value='tofiles' onclick="chgFormat();">
-                        {% trans 'thesaurus:: exporter vers topics pour toutes les langues' %}
+                        {{ 'thesaurus:: exporter vers topics pour toutes les langues' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='ofm' value='toscreen' onclick="chgFormat();">
@@ -84,60 +84,60 @@
                 <br/>
 
                 <div class="x3Dbox">
-                    <span class="title">{% trans 'phraseanet:: tri' %}</span>
+                    <span class="title">{{ 'phraseanet:: tri' | trans }}</span>
                     <div style="white-space:nowrap">
                         <input type='checkbox' name='srt' checked onclick="chgFormat();">
-                        {% trans 'phraseanet:: tri par date' %}
+                        {{ 'phraseanet:: tri par date' | trans }}
                     </div>
                 </div>
 
                 <br/>
 
                 <div class="x3Dbox">
-                    <span class="title">{% trans 'thesaurus:: recherche' %}</span>
+                    <span class="title">{{ 'thesaurus:: recherche' | trans }}</span>
                     <div style="white-space:nowrap">
                         <input type='radio' name='sth' value="1" checked onclick="chgFormat();">
-                        {% trans 'thesaurus:: recherche thesaurus *:"query"' %}
+                        {{ 'thesaurus:: recherche thesaurus *:"query"' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='sth' value="0" onclick="chgFormat();">
-                        {% trans 'thesaurus:: recherche fulltext' %}
+                        {{ 'thesaurus:: recherche fulltext' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='checkbox' name='sand' onclick="chgFormat();">
-                        {% trans 'thesaurus:: question complete (avec operateurs)' %}
+                        {{ 'thesaurus:: question complete (avec operateurs)' | trans }}
                     </div>
                 </div>
 
                 <br/>
 
                 <div class="x3Dbox">
-                    <span class="title">{% trans 'thesaurus:: presentation' %}</span>
+                    <span class="title">{{ 'thesaurus:: presentation' | trans }}</span>
                     <div style="white-space:nowrap">
                         <input type='radio' name='obrf' value="from_itf_closable" checked onclick="chgFormat();">
-                        {% trans 'thesaurus:: presentation : branches refermables' %}
+                        {{ 'thesaurus:: presentation : branches refermables' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='obrf' value="from_itf_static" onclick="chgFormat();">
-                        {% trans 'thesaurus:: presentation : branche ouvertes' %}
+                        {{ 'thesaurus:: presentation : branche ouvertes' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='obrf' value="all_opened_closable" onclick="chgFormat();">
-                        {% trans 'thesaurus:: tout deployer - refermable' %}
+                        {{ 'thesaurus:: tout deployer - refermable' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='obrf' value="all_opened_static" onclick="chgFormat();">
-                        {% trans 'thesaurus:: tout deployer - statique' %}
+                        {{ 'thesaurus:: tout deployer - statique' | trans }}
                     </div>
                     <div style="white-space:nowrap">
                         <input type='radio' name='obrf' value="all_closed" onclick="chgFormat();">
-                        {% trans 'thesaurus:: tout fermer' %}
+                        {{ 'thesaurus:: tout fermer' | trans }}
                     </div>
                 </div>
             </div>
-            <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:100px;">
+            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:100px;">
+            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/export-topics.html.twig b/templates/web/thesaurus/export-topics.html.twig
index 6e9fa9738b..04aad22eb5 100644
--- a/templates/web/thesaurus/export-topics.html.twig
+++ b/templates/web/thesaurus/export-topics.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: export en topics' %}</title>
+        <title>{{ 'thesaurus:: export en topics' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <style>
             .toscreen
@@ -35,7 +35,7 @@
                     <br/>
                     <br/>
                     <br/>
-                    <input type="button" value="{% trans 'boutton::fermer' %}" onclick="self.close();" style="width:100px;">
+                    <input type="button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();" style="width:100px;">
                 </center>
             {% endif %}
         </div>
diff --git a/templates/web/thesaurus/import-dialog.html.twig b/templates/web/thesaurus/import-dialog.html.twig
index bf0de8c7de..3133a8ba9c 100644
--- a/templates/web/thesaurus/import-dialog.html.twig
+++ b/templates/web/thesaurus/import-dialog.html.twig
@@ -7,7 +7,7 @@
 <html lang="{{ app['locale.I18n'] }}">
     <head>
         <base target="_self">
-        <title>{% trans 'thesaurus:: Importer' %}</title>
+        <title>{{ 'thesaurus:: Importer' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript">
             function clkBut(button)
@@ -49,26 +49,26 @@
             <input type="hidden" name="id" value="{{ id }}" >
             <input type="hidden" name="dlg" value="{{ dlg }}" >
             <div>
-                <div style="float:right">{% trans 'thesaurus:: langue par default' %} <img src='/skins/icons/flag_18.gif' /> {{ piv }}</div>
+                <div style="float:right">{{ 'thesaurus:: langue par default' | trans }} <img src='/skins/icons/flag_18.gif' /> {{ piv }}</div>
             </div>
             <br/>
-            {% trans 'Fichier ASCII tabule' %}
+            {{ 'Fichier ASCII tabule' | trans }}
             <input type="file" name="fil" /> (max 16Mo)
             <br/>
 
             <div style="text-align:center">
                 <table>
                     <tr>
-                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="dlk" checked="checked">{% trans 'thesaurus:: supprimer les liens des champs tbranch' %}</td>
+                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="dlk" checked="checked">{{ 'thesaurus:: supprimer les liens des champs tbranch' | trans }}</td>
                     </tr>
                     <tr>
-                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="rdx">{% trans 'thesaurus:: reindexer la base apres l\'import' %}</td>
+                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="rdx">{{ 'thesaurus:: reindexer la base apres l\'import' | trans }}</td>
                     </tr>
                 </table>
                 <br/>
-                <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:100px;">
+                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
                 &nbsp;&nbsp;&nbsp;
-                <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:100px;">
+                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
             </div>
         </form>
         <iframe style="display:block; height:50px;" name="IFRIM"></iframe>
diff --git a/templates/web/thesaurus/index.html.twig b/templates/web/thesaurus/index.html.twig
index c8b3800a95..bfd6fd298b 100644
--- a/templates/web/thesaurus/index.html.twig
+++ b/templates/web/thesaurus/index.html.twig
@@ -2,7 +2,7 @@
 <html lang="{{ app['locale.I18n'] }}">
     <head>
         <meta http-equiv="X-UA-Compatible" content="chrome=1">
-        <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {% trans 'phraseanet:: thesaurus' %}</title>
+        <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ 'phraseanet:: thesaurus' | trans }}</title>
         <link rel="shortcut icon" type="image/x-icon" href="/skins/thesaurus/favicon.ico">
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
     </head>
@@ -15,9 +15,9 @@
     {% if count_bases > 0 %}
 
         <form name="fBase" action="{{ path('thesaurus_thesaurus') }}" method="post">
-            {% trans 'thesaurus:: Editer le thesaurus' %}
+            {{ 'thesaurus:: Editer le thesaurus' | trans }}
             <select name="bid" onchange="ckok();return(true);">
-                <option value="">{% trans 'phraseanet:: choisir' %}</option>
+                <option value="">{{ 'phraseanet:: choisir' | trans }}</option>
                 {% for sbas_id, name in bases %}
                 <option value="{{ sbas_id }}">{{ name }}</option>
                 {% endfor %}
@@ -37,7 +37,7 @@
             </script>
             <table>
                 <tr>
-                    <td>{% trans 'thesaurus:: langue pivot' %}</td>
+                    <td>{{ 'thesaurus:: langue pivot' | trans }}</td>
             {% for code, language in languages %}
                     <td style="text-align:left">
                         <input type='radio' onclick="ckok();return(true);" value='{{ code }}' name='piv'>
@@ -48,10 +48,10 @@
             </table>
             <br/>
             <br/>
-            <input disabled="disabled" id="button_ok" type="submit" style="width:80px;" value="{% trans 'boutton::valider' %}" /><br/>
+            <input disabled="disabled" id="button_ok" type="submit" style="width:80px;" value="{{ 'boutton::valider' | trans }}" /><br/>
         </form>
     {% else %}
-        {% trans 'thesaurus:: Vous n\'avez acces a aucune base' %}
+        {{ 'thesaurus:: Vous n\'avez acces a aucune base' | trans }}
     {% endif %}
     </center>
 </body>
diff --git a/templates/web/thesaurus/link-field-step1.html.twig b/templates/web/thesaurus/link-field-step1.html.twig
index cf709905e7..253191fbb0 100644
--- a/templates/web/thesaurus/link-field-step1.html.twig
+++ b/templates/web/thesaurus/link-field-step1.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: Lier la branche de thesaurus au champ' %}</title>
+        <title>{{ 'thesaurus:: Lier la branche de thesaurus au champ' | trans }}</title>
 
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
 
@@ -57,9 +57,9 @@
                 {% endfor %}
                 </div>
                 <br/>
-                <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');">
+                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
                 &nbsp;&nbsp;&nbsp;
-                <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');">
+                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
             </form>
         </center>
     </body>
diff --git a/templates/web/thesaurus/link-field-step2.html.twig b/templates/web/thesaurus/link-field-step2.html.twig
index 12f6f8bb1d..c37272074f 100644
--- a/templates/web/thesaurus/link-field-step2.html.twig
+++ b/templates/web/thesaurus/link-field-step2.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: Lier la branche de thesaurus' %}</title>
+        <title>{{ 'thesaurus:: Lier la branche de thesaurus' | trans }}</title>
 
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
 
@@ -43,19 +43,19 @@
                     {% endtrans %}
                     <br/>
                 {% endif %}
-                {% trans 'thesaurus:: nouvelle branche' %} : {{ branches['new_branch'] }}
+                {{ 'thesaurus:: nouvelle branche' | trans }} : {{ branches['new_branch'] }}
                 <br/>
 
                 {% if branches['old_branch'] is not none and '' == branches['new_branch'] %}
-                    <b>{{ fieldname }}</b>{% trans 'thesaurus:: ce champ n\'est plus lie au thesaurus, les termes indexes et candidats seront supprimes' %}
+                    <b>{{ fieldname }}</b>{{ 'thesaurus:: ce champ n\'est plus lie au thesaurus, les termes indexes et candidats seront supprimes' | trans }}
                     <br/>
                     <input type="hidden" name="f2unlk[]" value="{{ fieldname }}">
                 {% endif %}
                 {% if '' != branches['new_branch'] %}
                     {% if '' == branches['old_branch'] %}
-                        <b>{{ fieldname }}</b>{% trans 'thesaurus:: ce champ doit etre lie au thesaurus. La reindexation de la base est necessaire' %}
+                        <b>{{ fieldname }}</b>{{ 'thesaurus:: ce champ doit etre lie au thesaurus. La reindexation de la base est necessaire' | trans }}
                     {% else %}
-                        <b>{{ fieldname }}</b>{% trans 'thesaurus:: le lien au thesaurus doit etre modifie, la reindexation de la base est necessaire' %}
+                        <b>{{ fieldname }}</b>{{ 'thesaurus:: le lien au thesaurus doit etre modifie, la reindexation de la base est necessaire' | trans }}
                     {% endif %}
                     <br/>
                     <input type="hidden" name="fbranch[]" value="{{fieldname}}<{{ branches['new_branch'] }}"/>
@@ -65,14 +65,14 @@
 
             {% if need_reindex %}
                 <input type="hidden" name="reindex" value="1">
-                <div style='position:absolute; top:5px; left:0px; width:100%; text-align:center; color:red'>{% trans 'thesaurus:: reindexation necessaire' %}</div>
+                <div style='position:absolute; top:5px; left:0px; width:100%; text-align:center; color:red'>{{ 'thesaurus:: reindexation necessaire' | trans }}</div>
             {% else %}
-                <div style='position:absolute; top:5px; left:0px; width:100%; text-align:center; color:green'>{% trans 'thesaurus:: pas de reindexation' %}</div>
+                <div style='position:absolute; top:5px; left:0px; width:100%; text-align:center; color:green'>{{ 'thesaurus:: pas de reindexation' | trans }}</div>
             {% endif %}
             <br/>
-            <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');">
+            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');">
+            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/link-field-step3.html.twig b/templates/web/thesaurus/link-field-step3.html.twig
index a188588f61..dcb1375a7f 100644
--- a/templates/web/thesaurus/link-field-step3.html.twig
+++ b/templates/web/thesaurus/link-field-step3.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: Lier la branche de thesaurus' %}</title>
+        <title>{{ 'thesaurus:: Lier la branche de thesaurus' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
     </head>
     <body  class="dialog">
@@ -32,7 +32,7 @@
                 {% endfor %}
 
                 {% if ctchanged %}
-                    {% trans 'thesaurus:: enregistrement de la liste modifiee des mots candidats.' %}
+                    {{ 'thesaurus:: enregistrement de la liste modifiee des mots candidats.' | trans }}
                     <br/>
                 {% endif %}
 
@@ -44,12 +44,12 @@
                 {% endfor %}
 
                 {% if reindexed %}
-                    {% trans 'thesaurus:: reindexer tous les enregistrements' %}
+                    {{ 'thesaurus:: reindexer tous les enregistrements' | trans }}
                     <br/>
                 {% endif %}
             </div>
             <br/>
-            <input type="button" value="{% trans 'boutton::fermer' %}" onclick="self.close();">
+            <input type="button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/new-synonym-dialog.html.twig b/templates/web/thesaurus/new-synonym-dialog.html.twig
index 7a18595bfb..d7c343244c 100644
--- a/templates/web/thesaurus/new-synonym-dialog.html.twig
+++ b/templates/web/thesaurus/new-synonym-dialog.html.twig
@@ -55,12 +55,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' | trans }} :&nbsp;</td>
                     <td></td>
                     <td valign="bottom">
                         {% for code, language in languages %}
@@ -75,9 +75,9 @@
             </table>
             <br/>
             <div style="position:absolute; left:0px; bottom:0px; width:100%; text-align:center">
-                <input type="button" style="width:80px;" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:80px">
+                <input type="button" style="width:80px;" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:80px">
                 &nbsp;&nbsp;
-                <input type="button" style="width:80px;" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:80px">
+                <input type="button" style="width:80px;" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:80px">
                 <br/>
                 <br/>
             </div>
diff --git a/templates/web/thesaurus/new-term.html.twig b/templates/web/thesaurus/new-term.html.twig
index 02098aa73e..fbef552b51 100644
--- a/templates/web/thesaurus/new-term.html.twig
+++ b/templates/web/thesaurus/new-term.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% if typ == "TS" %}{% trans 'thesaurus:: Nouveau terme specifique' %}{% else %}{% trans 'thesaurus:: Nouveau synonyme' %}{% endif %}</title>
+        <title>{% if typ == "TS" %}{{ 'thesaurus:: Nouveau terme specifique' | trans }}{% else %}{{ 'thesaurus:: Nouveau synonyme' | trans }}{% endif %}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/thesaurus/xmlhttp.js' }) }}"></script>
     </head>
@@ -52,9 +52,9 @@
                     {{ 'thesaurus:: selectionner la provenance a accepter' | trans }}
                 {% endif %}
                 <br/>
-                <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:100px;">
+                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
                 &nbsp;&nbsp;&nbsp;
-                <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:100px;">
+                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
             </form>
         </center>
         {% else %}
@@ -70,7 +70,7 @@
                     {% set prop_label = 'thesaurus:: n\'est pas present dans les candidats' | trans %}
                 {% endif %}
         <br/>
-        <h3>{% trans 'thesaurus:: attention :' %}</h3>
+        <h3>{{ 'thesaurus:: attention :' | trans }}</h3>
         <br/>
         <br/>
         {{ zterm }}
@@ -81,14 +81,14 @@
         <form>
             <center>
                 <div class='x3Dbox' style='margin:15px; height:90px; overflow:auto;'>
-                    <input type="radio" name="reindex" value="0" id="rad0" checked><label for="rad0">{% trans 'thesaurus:: Ajouter le terme dans reindexer' %}</label><br/>
+                    <input type="radio" name="reindex" value="0" id="rad0" checked><label for="rad0">{{ 'thesaurus:: Ajouter le terme dans reindexer' | trans }}</label><br/>
                     <br/>
-                    <input type="radio" name="reindex" value="1" id="rad1"><label for="rad1">{% trans 'thesaurus:: ajouter le terme et reindexer' %}</label><br/>
+                    <input type="radio" name="reindex" value="1" id="rad1"><label for="rad1">{{ 'thesaurus:: ajouter le terme et reindexer' | trans }}</label><br/>
                 </div>
             </center>
-            <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:100px;">
+            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{% trans 'boutton::valider' %}" onclick="clkBut('submit');" style="width:100px;">
+            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
         </form>
         {% endif %}
 </body>
diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig
index 9e2604a036..859e93dfd5 100644
--- a/templates/web/thesaurus/properties.html.twig
+++ b/templates/web/thesaurus/properties.html.twig
@@ -6,7 +6,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'thesaurus:: Proprietes' %}</title>
+        <title>{{ 'thesaurus:: Proprietes' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <style type="text/css">
             a
@@ -45,8 +45,8 @@
             {% endfor %}
         </div>
         <div class="menu" id="syMenu" style="z-index:50">
-            <a href="javascript:void(0)" id="delete_sy">{% trans 'thesaurus::menu: supprimer' %}</a>
-            <a href="javascript:void(0)" id="replace_sy" class="disabled">{% trans 'thesaurus:: remplacer' %}</a>
+            <a href="javascript:void(0)" id="delete_sy">{{ 'thesaurus::menu: supprimer' | trans }}</a>
+            <a href="javascript:void(0)" id="replace_sy" class="disabled">{{ 'thesaurus:: remplacer' | trans }}</a>
         </div>
 
         <div style='text-align:right'>
@@ -75,9 +75,9 @@
                         <tr>
                             <th>&nbsp;</th>
                             <th>&nbsp;</th>
-                            <th>{% trans 'thesaurus:: synonymes' %}</th>
-                            <th>{% trans 'thesaurus:: hits' %}</th>
-                            <th>{% trans 'thesaurus:: ids' %}</th>
+                            <th>{{ 'thesaurus:: synonymes' | trans }}</th>
+                            <th>{{ 'thesaurus:: hits' | trans }}</th>
+                            <th>{{ 'thesaurus:: ids' | trans }}</th>
                             <th></th>
                         </tr>
                     </thead>
@@ -120,7 +120,7 @@
         </div>
     <center>
         <form onsubmit="return(false);">
-            <input style="position:relative; z-index:2" type="button" id="close_button" value="{% trans 'boutton::fermer' %}" onclick="self.close();">
+            <input style="position:relative; z-index:2" type="button" id="close_button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
         </form>
     </center>
     <script type="text/javascript">
diff --git a/templates/web/thesaurus/search.html.twig b/templates/web/thesaurus/search.html.twig
index 6b260da5da..10261691bc 100644
--- a/templates/web/thesaurus/search.html.twig
+++ b/templates/web/thesaurus/search.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{% trans 'Chercher' %}</title>
+        <title>{{ 'Chercher' | trans }}</title>
         <link REL="stylesheet" TYPE="text/css" href="{{ path('minifier', { 'f' : 'skins/thesaurus/thesaurus.css' }) }}" />
         <script type="text/javascript">
             function clkBut(button)
@@ -38,16 +38,16 @@
         <form onsubmit="clkBut('submit');return(false);">
             <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/>
@@ -55,9 +55,9 @@
             <br/>
             <br/>
             <br/>
-            <input type="button" id="cancel_button" value="{% trans 'boutton::annuler' %}" onclick="clkBut('cancel');" style="width:80px;">
+            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:80px;">
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{% trans 'boutton::chercher' %}" onclick="clkBut('submit');" disabled style="width:80px;">
+            <input type="button" id="submit_button" value="{{ 'boutton::chercher' | trans }}" onclick="clkBut('submit');" disabled style="width:80px;">
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index 5cae1ed197..76c4bf4c6a 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{{ app['locale.I18n'] }}">
     <head>
-        <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {% trans 'phraseanet:: thesaurus' %}</title>
+        <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ 'phraseanet:: thesaurus' | trans }}</title>
         <style id="STYLES">
             DIV.glossaire DIV.r1_
             {
@@ -63,7 +63,7 @@
 
                 f = document.forms["fBase"];
 
-                document.getElementById("T0").innerHTML = document.getElementById("T1").innerHTML = "{% trans 'phraseanet::chargement' %}";
+                document.getElementById("T0").innerHTML = document.getElementById("T1").innerHTML = "{{ 'phraseanet::chargement' | trans }}";
 
                 f.target = "IFR0";
                 f.submit();
@@ -135,32 +135,32 @@
             {% endfor %}
         </div>
         <div class="menu" id="kctermMenu" style="z-index:50; width:240px;">
-            <a href="javascript:void(0)" class=""         id="kcterm_properties" style="font-weight:700">{% trans 'thesaurus::menu: proprietes' %}</a>
-            <a href="javascript:void(0)" class=""         id="kcterm_reject">{% trans 'thesaurus::menu: refuser' %}</a>
-            <a href="javascript:void(0)" class="disabled" id="kcterm_accept">{% trans 'thesaurus::menu: accepter' %}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_properties" style="font-weight:700">{{ 'thesaurus::menu: proprietes' | trans }}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_reject">{{ 'thesaurus::menu: refuser' | trans }}</a>
+            <a href="javascript:void(0)" class="disabled" id="kcterm_accept">{{ 'thesaurus::menu: accepter' | trans }}</a>
             <div class="line"></div>
-            <a href="javascript:void(0)" class=""         id="kcterm_delete">{% trans 'thesaurus::menu: supprimer' %}</a>
-            <a href="javascript:void(0)" class=""         id="kcterm_delete0hits">{% trans 'thesaurus::menu: supprimer les candidats a 0 hits' %}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_delete">{{ 'thesaurus::menu: supprimer' | trans }}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_delete0hits">{{ 'thesaurus::menu: supprimer les candidats a 0 hits' | trans }}</a>
             <div class="line"></div>
-            <a href="javascript:void(0)" class=""         id="kcterm_search">{% trans 'thesaurus::menu: chercher' %}</a>
-            <a href="javascript:void(0)" class=""         id="kcterm_export">{% trans 'thesaurus::menu: exporter' %}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_search">{{ 'thesaurus::menu: chercher' | trans }}</a>
+            <a href="javascript:void(0)" class=""         id="kcterm_export">{{ 'thesaurus::menu: exporter' | trans }}</a>
         </div>
 
         <div class="menu" id="kThMenu" style="z-index:50; width:200px;">
-            <a href="javascript:void(0)" class="" id="kth_import">{% trans 'thesaurus::menu: importer' %}</a>
+            <a href="javascript:void(0)" class="" id="kth_import">{{ 'thesaurus::menu: importer' | trans }}</a>
         </div>
 
         <div class="menu" id="ktermMenu" style="z-index:50; width:200px;">
-            <a href="javascript:void(0)" class="" id="kterm_properties" style="font-weight:700">{% trans 'thesaurus::menu: proprietes' %}</a>
-            <a href="javascript:void(0)" class="" id="kterm_newts">{% trans 'thesaurus::menu: Nouveau terme' %}</a>
-            <a href="javascript:void(0)" class="" id="kterm_newsy">{% trans 'thesaurus::menu: Nouveau synonyme' %}</a>
-            <a href="javascript:void(0)" class="" id="kterm_delete">{% trans 'thesaurus::menu: supprimer' %}</a>
+            <a href="javascript:void(0)" class="" id="kterm_properties" style="font-weight:700">{{ 'thesaurus::menu: proprietes' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_newts">{{ 'thesaurus::menu: Nouveau terme' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_newsy">{{ 'thesaurus::menu: Nouveau synonyme' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_delete">{{ 'thesaurus::menu: supprimer' | trans }}</a>
             <div class="line"></div>
-            <a href="javascript:void(0)" class="" id="kterm_search">{% trans 'thesaurus::menu: chercher' %}</a>
-            <a href="javascript:void(0)" class="" id="kterm_export">{% trans 'thesaurus::menu: exporter' %}</a>
-            <a href="javascript:void(0)" class="" id="kterm_topics">{% trans 'thesaurus::menu: export topics' %}</a>
+            <a href="javascript:void(0)" class="" id="kterm_search">{{ 'thesaurus::menu: chercher' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_export">{{ 'thesaurus::menu: exporter' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_topics">{{ 'thesaurus::menu: export topics' | trans }}</a>
             <div class="line"></div>
-            <a href="javascript:void(0)" class="" id="kterm_link">{% trans 'thesaurus::menu: lier au champ' %}</a>
+            <a href="javascript:void(0)" class="" id="kterm_link">{{ 'thesaurus::menu: lier au champ' | trans }}</a>
         </div>
 
         <form name="fBase" action="{{ path('thesaurus_loadth') }}" method="post" target="?">
@@ -185,7 +185,7 @@
             <div id="id_thbox_bck" class="thbox" style="position:absolute; top:28px; left:8px; right:8px; bottom:8px; background-color:#f4f4f4; xoverflow:hidden">
 
                 <div class="onglet" style="background-color:#f0f0f0; border-bottom:1px solid #f4f4f4">
-                    <span id="baseName">{% trans 'phraseanet:: thesaurus' %}</span>
+                    <span id="baseName">{{ 'phraseanet:: thesaurus' | trans }}</span>
                     <a href="javascript:void();" onclick="fixTh();return(false);" style="visibility:hidden;">X</a>
                 </div>
 
@@ -193,10 +193,10 @@
                 <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">{% trans 'thesaurus:: onglet stock' %} <a href="javascript:void();" onclick="test('T0');return(false);" style="visibility:hidden;">X</a>
+                        <div class="onglet">{{ 'thesaurus:: onglet stock' | trans }} <a href="javascript:void();" 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">{% trans 'thesaurus:: afficher les termes refuses' %}</span>
+                            <input type="checkbox" name="ckShowRejected" onClick="return(chgCkShowRejected());" /><span style="white-space:nowrap; overflow:hidden">{{ 'thesaurus:: afficher les termes refuses' | trans }}</span>
                         </div>
                         <div id="TabT0k" style="position:absolute; top:20px; bottom:0px; left:0px; right:0px; overflow:scroll; border:0px #000000 none">
                             <div id="T0" style="position:absolute; top:0px; left:0px;">
@@ -207,7 +207,7 @@
 
                 <div id="TabT1" style="position:absolute; top:28px; right:0px; bottom:0px; width:60%;">
                     <div class="thbox"  style="position:absolute; top:0px; bottom:8px; left:3px; right:6px;">
-                        <div class="onglet"><span id='TabT1Title' style="cursor:pointer">{% trans 'thesaurus:: onglet thesaurus' %}</span>
+                        <div class="onglet"><span id='TabT1Title' style="cursor:pointer">{{ 'thesaurus:: onglet thesaurus' | trans }}</span>
                             &nbsp;
                             <a href="javascript:void();" onclick="test('T1');return(false);" style="visibility:hidden;">X</a>
                         </div>
@@ -403,9 +403,9 @@
                             allhits = ret.getElementsByTagName("allhits").item(0).firstChild.nodeValue;
 
                             if(allhits==0)
-                                msg = "{% trans 'thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation)' %}";
+                                msg = "{{ 'thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation)' | trans }}";
                             else
-                                msg = "{% trans 'thesaurus:: Des reponses sont retournees par cette branche. &#10;Supprimer quand meme ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation)' %}";
+                                msg = "{{ 'thesaurus:: Des reponses sont retournees par cette branche. &#10;Supprimer quand meme ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation)' | trans }}";
 
                             if(confirm(msg))
                             {