From 13096c44a1c91032acf3b733f2ba45a269887692 Mon Sep 17 00:00:00 2001
From: Gabriel Monnerat <gabriel@tiolive.com>
Date: Thu, 24 Mar 2011 14:05:29 +0000
Subject: [PATCH] use ZPT engine instead of script Base_translateString

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44559 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../EmailThread_formView.xml                  | 20 +++++------
 .../WebSection_loginDialog.xml                | 34 +++++++++----------
 .../WebSection_newEvent.xml                   | 34 +++++++++----------
 .../WebSection_viewCalendarWidget.xml         | 16 ++++-----
 .../WebSection_viewDocumentActionWidget.xml   |  5 ++-
 .../WebSection_viewFavoriteWidget.xml         | 13 ++++---
 .../WebSection_viewMenuWidget.xml             | 12 +++----
 .../WebSection_viewToolbar.xml                | 16 ++++-----
 .../WebSection_viewUserLoginWidget.xml        | 19 ++++-------
 .../WebSection_viewUserNavigationWidget.xml   |  9 ++---
 bt5/erp5_web_ung_theme/bt/revision            |  2 +-
 11 files changed, 80 insertions(+), 100 deletions(-)

diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EmailThread_formView.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EmailThread_formView.xml
index c9e9026848..99cf78e139 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EmailThread_formView.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EmailThread_formView.xml
@@ -37,15 +37,15 @@
             <value> <unicode encoding="cdata"><![CDATA[
 
 <div class="compose-mail-page">\n
-<button title="Send" type="submit" id="send-mail"> Send </button>\n
-<button title="Save" type="submit" id="save-mail"> Save </button>\n
-<button title="Discard" type="submit" id="discard-mail"> Discard </button>\n
+<button title="Send" type="submit" id="send-mail" i18n:translate="" i18n:domain="ui"> Send </button>\n
+<button title="Save" type="submit" id="save-mail" i18n:translate="" i18n:domain="ui"> Save </button>\n
+<button title="Discard" type="submit" id="discard-mail" i18n:translate="" i18n:domain="ui"> Discard </button>\n
 <div class="compose-mail">\n
 <form>\n
 <table id="form-table">\n
    <tr>\n
      <td valign="top">\n
-          <label for="to">To: </label>\n
+          <label for="to" i18n:translate="" i18n:domain="ui">To:</label>\n
         </td>\n
         <td valign="top">\n
           <textarea rows="2" type="text" cols="100" id="to" name="to"/>\n
@@ -55,8 +55,8 @@
         <td valign="top">\n
         </td>\n
         <td valign="top">\n
-          <span id="add-cc-field"> Add Cc </span>\n
-          <span id="add-bcc-field"> Add Bcc </span>\n
+          <span id="add-cc-field" i18n:translate="" i18n:domain="ui"> Add Cc </span>\n
+          <span id="add-bcc-field" i18n:translate="" i18n:domain="ui"> Add Bcc </span>\n
         </td>\n
      </tr>\n
      <tr id="cc">\n
@@ -77,7 +77,7 @@
      </tr>\n
      <tr>\n
         <td valign="top">\n
-          <label for="subject">Subject: </label>\n
+          <label for="subject" i18n:translate="" i18n:domain="ui">Subject </label>:\n
         </td>\n
         <td valign="top">\n
           <input type="text" size="80" name="subject" id="subject"/>\n
@@ -89,9 +89,9 @@
 <form>\n
 </div>\n
 <br/>\n
-<button title="Send" type="submit" id="send-mail"> Send </button>\n
-<button title="Save" type="submit" id="save-mail"> Save </button>\n
-<button title="Discard" type="submit" id="discard-mail"> Discard </button>\n
+<button title="Send" type="submit" id="send-mail" i18n:translate="" i18n:domain="ui"> Send </button>\n
+<button title="Save" type="submit" id="save-mail" i18n:translate="" i18n:domain="ui"> Save </button>\n
+<button title="Discard" type="submit" id="discard-mail" i18n:translate="" i18n:domain="ui"> Discard </button>\n
 </div>
 
 ]]></unicode> </value>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_loginDialog.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_loginDialog.xml
index f1f8e02c77..217b77a666 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_loginDialog.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_loginDialog.xml
@@ -36,15 +36,14 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_language python:here.Localizer.get_selected_language();">\n
-<h2 tal:content="python:here.Base_translateString(\'Welcome to UNG Web Office\', lang=default_language)">Page Title</h2>\n
+<h2 i18n:translate="" i18n:domain="ui">Welcome to UNG Web Office</h2>\n
 <div id="main-content">\n
  <table border="0" width="100%" cellpadding="0" cellspacing="0">\n
    <tbody>\n
      <tr>\n
        <td valign="top">\n
          <div id="advertisement">\n
-           <b>Sign in to edit documents, spreadsheets and drawing and share this document with another users</b>\n
+           <b i18n:translate="" i18n:domain="ui">Sign in to edit documents, spreadsheets and drawing and share this document with another users</b>\n
          </div>\n
        </td>\n
        <td>\n
@@ -55,13 +54,13 @@
                  <table>\n
                    <tr>\n
                      <td align="center" colspan="2">\n
-                       <font size="-1" tal:content="python:here.Base_translateString(\'Login in\', lang=default_language)">Login in</font>\n
+                       <font size="-1" i18n:translate="" i18n:domain="ui">Login in</font>\n
                      </td>\n
                    </tr>\n
                    <tr></tr>\n
                    <tr>\n
                      <td align="center">\n
-                       <label for="name" tal:content="python:here.Base_translateString(\'Name\', lang=default_language)">Name</label>\n
+                       <label for="name" i18n:translate="" i18n:domain="ui">Name</label>\n
                      </td>\n
                      <td align="center">\n
                        <input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'" />\n
@@ -69,7 +68,7 @@
                    </tr>\n
                    <tr>\n
                      <td align="center">\n
-                       <label for="password" tal:content="python:here.Base_translateString(\'Password\', lang=default_language)">Password</label>\n
+                       <label for="password" i18n:translate="" i18n:domain="ui">Password</label>\n
                      </td>\n
                      <td><input type="password" name="__ac_password" id="password" /></td>\n
                    </tr>\n
@@ -77,7 +76,7 @@
                      <input type="submit" \n
                             name="logged_in:method"\n
                             class="submit" \n
-                            tal:attributes="value python:here.Base_translateString(\'Name\', lang=default_language)">\n
+                            value="Name" i18n:translate="" i18n:domain="ui">\n
                    </td>\n
                  </table>\n
                </td>\n
@@ -97,34 +96,34 @@
                    <table width="100%">\n
                      <tr>\n
                        <td align="center" colspan="2">\n
-                         <b tal:content="python:here.Base_translateString(\'Create an account\', lang=default_language)">Create an account</b>\n
+                         <b i18n:translate="" i18n:domain="ui">Create an account</b>\n
                        </td>\n
                      </tr>\n
                      <tr><td id="form-message" align="center" colspan="2"></td></tr>\n
                      <tr>\n
-                       <td tal:content="python:here.Base_translateString(\'First Name\', lang=default_language)">First Name</td>\n
+                       <td i18n:translate="" i18n:domain="ui">First Name</td>\n
                        <td><input type="text" name="firstname"/></td>\n
                      </tr>\n
                      <tr>\n
-                        <td tal:content="python:here.Base_translateString(\'Last Name\', lang=default_language)">Last Name</td>\n
+                        <td i18n:translate="" i18n:domain="ui">Last Name</td>\n
                         <td><input type="text" name="lastname"/></td>\n
                      </tr>\n
                      <tr><td>Email</td><td><input type="text" name="email"/></td></tr>\n
                      <tr>\n
-                        <td tal:content="python:here.Base_translateString(\'Login Name\', lang=default_language)">Login name</td>\n
+                        <td i18n:translate="" i18n:domain="ui">Login name</td>\n
                         <td><input type="text" name="login_name"/></td>\n
                      </tr>\n
                      <tr>\n
-                       <td tal:content="python:here.Base_translateString(\'Password\', lang=default_language)">Password</td>\n
+                       <td i18n:translate="" i18n:domain="ui">Password</td>\n
                        <td><input type="password" name="password"/></td>\n
                      </tr>\n
                      <tr>\n
-                       <td tal:content="python:here.Base_translateString(\'Confirm Password\', lang=default_language)">Confirm Password</td>\n
+                       <td i18n:translate="" i18n:domain="ui">Confirm Password</td>\n
                        <td><input type="password" name="confirm"/></td>\n
                      </tr>\n
                      <td align="center" colspan="2">\n
                        <input type="submit" name="logged_in:method" \n
-                              class="submit" tal:attributes="value python:here.Base_translateString(\'Create Account\', lang=default_language)">\n
+                              class="submit" value="Create Account" i18n:translate="" i18n:domain="ui">\n
                      </td>\n
                      <tr><td id="back-login" align="left" colspan="2"><< Back </td></tr>\n
                    </table>\n
@@ -152,7 +151,7 @@
                      <td id="new-account-form" \n
                          align="center" \n
                          colspan="2" \n
-                         tal:content="python:here.Base_translateString(\'Create an account now\', lang=default_language)">Create an account now</td>\n
+                         i18n:translate="" i18n:domain="ui">Create an account now</td>\n
                    </tr>\n
                  </table>\n
                </td>\n
@@ -167,9 +166,8 @@
 <div class="footer">\n
   <a target="_blank" href="http://www.freecloudalliance.org/">Free Cloud Alliance</a>\n
   -\n
-  <a href="#" tal:content="python:here.Base_translateString(\'Help\', lang=default_language)">Help</a>\n
-</div>\n
-</tal:block>
+  <a href="#" i18n:translate="" i18n:domain="ui">Help</a>\n
+</div>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml
index 731fad6954..e9cd0270ef 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml
@@ -36,26 +36,25 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n
 <form id="create_new_event">\n
-  <label tal:content="python:here.Base_translateString(\'Event Type\', lang=default_language)">Event Type</label>\n
+  <label i18n:translate="" i18n:domain="ui">Event Type</label>\n
   <select name="portal_type">\n
-    <option tal:content="python:here.Base_translateString(\'Acknowledgement\', lang=default_language)">Acknowledgement</option>\n
-    <option tal:content="python:here.Base_translateString(\'Fax Message\', lang=default_language)">Fax Message</option>\n
-    <option tal:content="python:here.Base_translateString(\'Letter\', lang=default_language)">Letter</option>\n
-    <option tal:content="python:here.Base_translateString(\'Mail Message\', lang=default_language)">Mail Message</option>\n
-    <option tal:content="python:here.Base_translateString(\'Note\', lang=default_language)">Note</option>\n
-    <option tal:content="python:here.Base_translateString(\'Phone Call\', lang=default_language)">Phone Call</option>\n
-    <option tal:content="python:here.Base_translateString(\'Short Message\', lang=default_language)">Short Message</option>\n
-    <option tal:content="python:here.Base_translateString(\'Site Message\', lang=default_language)">Site Message</option>\n
-    <option tal:content="python:here.Base_translateString(\'Visit\', lang=default_language)">Visit</option>\n
-    <option tal:content="python:here.Base_translateString(\'Web Message\', lang=default_language)">Web Message</option>\n
+    <option i18n:translate="" i18n:domain="ui">Acknowledgement</option>\n
+    <option i18n:translate="" i18n:domain="ui">Fax Message</option>\n
+    <option i18n:translate="" i18n:domain="ui">Letter</option>\n
+    <option i18n:translate="" i18n:domain="ui">Mail Message</option>\n
+    <option i18n:translate="" i18n:domain="ui">Note</option>\n
+    <option i18n:translate="" i18n:domain="ui">Phone Call</option>\n
+    <option i18n:translate="" i18n:domain="ui">Short Message</option>\n
+    <option i18n:translate="" i18n:domain="ui">Site Message</option>\n
+    <option i18n:translate="" i18n:domain="ui">Visit</option>\n
+    <option i18n:translate="" i18n:domain="ui">Web Message</option>\n
   </select>\n
   <p>\n
-  <label tal:content="python:here.Base_translateString(\'Title\', lang=default_language)">Title </label>:\n
+  <label i18n:translate="" i18n:domain="ui">Title </label>:\n
   <input name="title" value="" type="text" size="30">\n
   <p>\n
-  <label tal:content="python:here.Base_translateString(\'Start Date\', lang=default_language)">Start Date </label>:\n
+  <label i18n:translate="" i18n:domain="ui">Start Date </label>:\n
   <input class="start_date_field" name="start_date_month" value="" maxlength="2" type="text" size="2">/\n
   <input class="start_date_field" name="start_date_day" value="" maxlength="2" type="text" size="2">/\n
   <input class="start_date_field" name="start_date_year" value="2011" maxlength="4" type="text" size="4">\n
@@ -63,7 +62,7 @@
   <input class="start_date_field" name="start_date_hour" value="" maxlength="2" type="text" size="2">:\n
   <input class="start_date_field" name="start_date_minute" value="" maxlength="2" type="text" size="2">\n
   <p>\n
-  <label tal:content="python:here.Base_translateString(\'Stop Date\', lang=default_language)">Stop Date </label>:\n
+  <label i18n:translate="" i18n:domain="ui">Stop Date </label>:\n
   <input class="stop_date_field" name="stop_date_month" value="" maxlength="2" type="text" size="2">/\n
   <input class="stop_date_field" name="stop_date_day" value="" maxlength="2" type="text" size="2">/\n
   <input class="stop_date_field" name="stop_date_year" value="2011" maxlength="4" type="text" size="4">\n
@@ -71,10 +70,9 @@
   <input class="stop_date_field" name="stop_date_hour" value="" maxlength="2" type="text" size="2">:\n
   <input class="stop_date_field" name="stop_date_minute" value="" maxlength="2" type="text" size="2">\n
   <p>\n
-  <label tal:content="python:here.Base_translateString(\'Text\', lang=default_language)">Text </label>:\n
+  <label i18n:translate="" i18n:domain="ui">Text </label>:\n
   <textarea name="event_text_content" rows="2" cols="30"></textarea>\n
-</form>\n
-</tal:block>
+</form>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml
index 4f124e9b23..514a981d26 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml
@@ -51,21 +51,20 @@
   <script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/wdCalendar_lang_US.js" type="text/javascript"></script>\n
   <script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/jquery.calendar.js" type="text/javascript"></script>\n
   <script src="ung_js/ung_calendar.js" type="text/javascript"></script>\n
-  <tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n
   <div>\n
     <div id="calhead" style="padding-left:1px;padding-right:1px;">\n
       <div class="cHead">\n
-        <div id="loadingpannel" class="ptogtitle loadicon" style="display: none;">\n
+        <div id="loadingpannel" class="ptogtitle loadicon" style="display: none;" i18n:translate="" i18n:domain="ui">\n
           Loading data...\n
         </div>\n
-        <div id="errorpannel" class="ptogtitle loaderror" style="display: none;">\n
+        <div id="errorpannel" class="ptogtitle loaderror" style="display: none;" i18n:translate="" i18n:domain="ui">\n
           Sorry, could not load your data, please try again later\n
         </div>\n
       </div>\n
       <div id="caltoolbar" class="ctoolbar">\n
         <div id="showtodaybtn" class="fbutton">\n
           <div>\n
-            <span title=\'Click to back to today\' class="showtoday" tal:content="python:here.Base_translateString(\'Today\', lang=default_language)">\n
+            <span title=\'Click to back to today\' class="showtoday" i18n:translate="" i18n:domain="ui">\n
               Today\n
             </span>\n
           </div>\n
@@ -81,28 +80,28 @@
         </div>\n
         <div id="showdaybtn" class="fbutton">\n
           <div>\n
-            <span title=\'Day\' class="showdayview" tal:content="python:here.Base_translateString(\'Day\', lang=default_language)">\n
+            <span title=\'Day\' class="showdayview" i18n:translate="" i18n:domain="ui">\n
               Day\n
             </span>\n
           </div>\n
         </div>\n
         <div id="showweekbtn" class="fbutton fcurrent">\n
           <div>\n
-            <span title=\'Week\' class="showweekview" tal:content="python:here.Base_translateString(\'Week\', lang=default_language)">\n
+            <span title=\'Week\' class="showweekview" i18n:translate="" i18n:domain="ui">\n
               Week\n
             </span>\n
           </div>\n
         </div>\n
         <div id="showmonthbtn" class="fbutton">\n
           <div>\n
-            <span title=\'Month\' class="showmonthview" tal:content="python:here.Base_translateString(\'Month\', lang=default_language)">\n
+            <span title=\'Month\' class="showmonthview" i18n:translate="" i18n:domain="ui">\n
               Month\n
             </span>\n
           </div>\n
         </div>\n
         <div id="showreflashbtn" class="fbutton">\n
           <div>\n
-            <span title=\'Refresh view\' class="showdayflash" tal:content="python:here.Base_translateString(\'Refresh\', lang=default_language)">\n
+            <span title=\'Refresh view\' class="showdayflash" i18n:translate="" i18n:domain="ui">\n
               Refresh\n
             </span>\n
           </div>\n
@@ -121,7 +120,6 @@
       </div>\n
       <div id="new_event_dialog"/>\n
   </div>\n
-  </tal:block>\n
 </html>
 
 ]]></unicode> </value>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml
index 66d6e6b8e7..b50d0bf148 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml
@@ -37,8 +37,7 @@
             <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:define="actions  python:here.Base_filterDuplicateActions(here.portal_actions.listFilteredActionsFor(here));\n
-                       dummy    python:request.set(\'actions\', actions);\n
-                       default_language python:here.Localizer.get_selected_language()">\n
+                       dummy    python:request.set(\'actions\', actions);">\n
   <a tal:condition="python: context.getModificationDate() is not None">\n
     <a tal:content="python: \'Updated %s by\' % context.getModificationDate().ISO()"/>\n
   </a>\n
@@ -46,7 +45,7 @@
   <button onclick="javascript:clickSaveButton(\'Base_edit\')"\n
           name="Base_edit:method" \n
           class="save" type="submit"\n
-          tal:content="python:here.Base_translateString(\'Save\', lang=default_language)">Save</button>\n
+          i18n:translate="" i18n:domain="ui">Save</button>\n
   <div class="action_menu">\n
     <tal:block tal:define="portal_path here/absolute_url;\n
                            url_suffix python: \'/ERP5Site_createNewWebDocument?select_action=\'">\n
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml
index 719b00dd4a..a033b5d174 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml
@@ -41,18 +41,17 @@
                          portal_path python:website.absolute_url();\n
                          current_url here/absolute_url;\n
                          has_editor python: current_url != portal_path;\n
-                         domain_url python: context.REQUEST.form.get(\'domain_url\') or \'ung_domain/all_document_list\';\n
-                         default_language python:here.Localizer.get_selected_language()">\n
+                         domain_url python: context.REQUEST.form.get(\'domain_url\') or \'ung_domain/all_document_list\';">\n
     <a class="domain_selected"></a>\n
     <tal:block tal:condition="python: not has_editor">\n
-      <a tal:attributes="href python: request.get(\'URL\') + \'?domain_url=%s&\' % domain_url + \n
-                                                          \'form_id=erp5_web_ung_layout&\' + \n
-                                                          \'list_selection_name=ung_document_list_selection&\' + \n
-                                                          \'domain_depth:int=0&reset:int=1\'">Refresh</a>\n
+      <a i18n:translate="" i18n:domain="ui" tal:attributes="href python: request.get(\'URL\') + \'?domain_url=%s&\' % domain_url + \n
+                                                           \'form_id=erp5_web_ung_layout&\' + \n
+                                                           \'list_selection_name=ung_document_list_selection&\' + \n
+                                                           \'domain_depth:int=0&reset:int=1\'">Refresh</a>\n
     </tal:block>\n
     <tal:block tal:condition="python: has_editor">\n
       <a tal:attributes="href python: request.get(\'URL\') + \'?editable_mode:int=1\'"\n
-         tal:content="python:here.Base_translateString(\'Refresh\', lang=default_language)">Refresh</a>\n
+         i18n:translate="" i18n:domain="ui">Refresh</a>\n
     </tal:block>\n
   </tal:block>\n
 </div>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml
index eda67a8a25..fa40b25ef8 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml
@@ -36,7 +36,6 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n
 <div class="gadget-column">\n
   <div class="gadget-action">\n
    <div class="menu_create_object">\n
@@ -66,8 +65,8 @@
     </li> \n
         </tal:block>\n
   </div>\n
-  <input type="submit" id="upload" name="Upload" tal:attributes="value python:here.Base_translateString(\'Upload\', lang=default_language)"/>\n
-    <div id="upload_document" tal:attributes="title python:here.Base_translateString(\'Upload Document\', lang=default_language)">\n
+  <input type="submit" id="upload" name="Upload" value="Upload" i18n:translate="" i18n:domain="ui"/>\n
+    <div id="upload_document" title="Upload Document" i18n:translate="" i18n:domain="ui">\n
       <form action="WebSection_uploadDocument" method="post" enctype="multipart/form-data">\n
         <fieldset id="file_box">\n
           <input type="file" size="30" name="file">\n
@@ -77,14 +76,14 @@
             <option value="Web Table">Web Table</option>\n
           </select>\n
           <br />\n
-          <input type="submit" id="submit_document" tal:attributes="value python:here.Base_translateString(\'Submit\', lang=default_language)">\n
+          <input type="submit" id="submit_document" value="Submit" i18n:translate="" i18n:domain="ui">\n
         </fieldset>\n
       </form> \n
     </div>\n
   <div class="file-selection">\n
    <div class="file-quick-search"></div>\n
   </div>\n
-  <div class="gadget-listbox" id="gadget-listbox" tal:attributes="title python:here.Base_translateString(\'Add Gadgets\', lang=default_language)">\n
+  <div class="gadget-listbox" id="gadget-listbox" name="Add Gadgets" i18n:translate="" i18n:domain="ui">\n
     <table id="gadget-table"></table>\n
   </div>\n
   <div class="front_pad">\n
@@ -96,8 +95,7 @@
                                                                            columns=1)"\n
              class="draggable_wrapper"/>\n
   </div>\n
-</div>\n
-</tal:block>
+</div>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml
index cc95bee925..4b83f8ec73 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml
@@ -36,15 +36,13 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n
-  <div class="toolbar">\n
-    <button name="WebSection_deleteObjectList:method" \n
-            type="submit" class="delete"\n
-            tal:content="python:here.Base_translateString(\'Delete\', lang=default_language)">Delete</button>\n
-    <button name="#" type="submit" class="change_state"\n
-            tal:content="python:here.Base_translateString(\'Change State\', lang=default_language)">Change State</button>\n
-  </div>\n
-</tal:block>
+<div class="toolbar">\n
+  <button name="WebSection_deleteObjectList:method" \n
+          type="submit" class="delete"\n
+          i18n:translate="" i18n:domain="ui">Delete</button>\n
+  <button name="#" type="submit" class="change_state"\n
+          i18n:translate="" i18n:domain="ui">Change State</button>\n
+</div>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml
index 722d738884..86464d3176 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml
@@ -38,24 +38,19 @@
 
 <tal:block tal:define="website here/getWebSiteValue;\n
                        enctype string:multipart/form-data;\n
-                       portal_path python:website.absolute_url();\n
-                       default_language python:here.Localizer.get_selected_language()">\n
- <a id="right_message" tal:content="python:here.Base_translateString(\'Not Implemented yet\', lang=default_language)">Not Implemented yet</a>\n
- <div id="preference_dialog" tal:attributes="title python:here.Base_translateString(\'UNG Preferences\', lang=default_language)"></div> \n
+                       portal_path python:website.absolute_url();">\n
+ <a id="right_message" i18n:translate="" i18n:domain="ui">Not Implemented yet</a>\n
+ <div id="preference_dialog" title="UNG Preferences" i18n:translate="" i18n:domain="ui"></div> \n
  <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
-   <a id="login" href="#"\n
-      tal:content="python:here.Base_translateString(\'Sign in\', lang=default_language)">Sign in</a>\n
+   <a id="login" href="#" i18n:translate="" i18n:domain="ui">Sign in</a>\n
  </tal:block>\n
  <tal:block tal:condition="python:not here.portal_membership.isAnonymousUser()">\n
    <a tal:content="here/portal_membership/getAuthenticatedMember"/>\n
  </tal:block>\n
  <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
-   | <a id="settings" href="#"\n
-        tal:content="python:here.Base_translateString(\'Settings\', lang=default_language)">Settings</a> \n
-   | <a id="help" href="#"\n
-        tal:content="python:here.Base_translateString(\'Help\', lang=default_language)">Help</a> \n
-   | <a tal:attributes="href string:${portal_path}/WebSite_logout"\n
-        tal:content="python:here.Base_translateString(\'Sign out\', lang=default_language)">Sign out</a>\n
+   | <a id="settings" href="#" i18n:translate="" i18n:domain="ui">Settings</a> \n
+   | <a id="help" href="#" i18n:translate="" i18n:domain="ui">Help</a> \n
+   | <a tal:attributes="href string:${portal_path}/WebSite_logout" i18n:translate="" i18n:domain="ui">Sign out</a>\n
  </tal:block>\n
 </tal:block>
 
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserNavigationWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserNavigationWidget.xml
index 0844b0110b..185571af3a 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserNavigationWidget.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserNavigationWidget.xml
@@ -36,13 +36,10 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="portal_path python: here.getWebSiteValue().absolute_url();\n
-                       default_language python:here.Localizer.get_selected_language()">\n
+<tal:block tal:define="portal_path python: here.getWebSiteValue().absolute_url();">\n
  <a class="email" tal:attributes="href string:${portal_path}/mail">Email</a>\n
- <a class="document" tal:attributes="href string:${portal_path}"\n
-                     tal:content="python:here.Base_translateString(\'Documents\', lang=default_language)">Documents</a>\n
- <a class="calendar" tal:attributes="href string:${portal_path}/calendar"\n
-                     tal:content="python:here.Base_translateString(\'Calendar\', lang=default_language)">Calendar</a>\n
+ <a class="document" tal:attributes="href string:${portal_path}" i18n:translate="" i18n:domain="ui">Documents</a>\n
+ <a class="calendar" tal:attributes="href string:${portal_path}/calendar" i18n:translate="" i18n:domain="ui">Calendar</a>\n
 </tal:block>
 
 ]]></unicode> </value>
diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision
index 194ba8cc75..9d239ff807 100644
--- a/bt5/erp5_web_ung_theme/bt/revision
+++ b/bt5/erp5_web_ung_theme/bt/revision
@@ -1 +1 @@
-320
\ No newline at end of file
+321
\ No newline at end of file
-- 
2.30.9