renderjs: update translation data in post-upgrade

Firstly, rework a bit the action to create translation data, the action no longer allow choosing the translation data script to update, but uses the one referenced in the translation gadget html. In post upgrade, compare the actual content of the translation data script with the expected content, calculated from web site languages, data-i18n attributes from referenced pages and Localizer messages. This makes the requirement that web sites with different configurations for translations need to use different translation gadget stronger, when it's not met post upgrade will always report consistency issues. To address this, modify existing web sites so that they all use different translation gadgets - or at least don't use translation gadget explicitly. This was made by: - all web sites by default do not have a translation gadget - smart_assistant use a dedicated translation gadget, to confirm that using a different translation gadget is possible with an officejs web site, where the translation gadget is defined in the "app" web section. - officejs_support_request_ui uses a dedicated translation gadget, because we need this for a customer project and for ourselves. - other web sites do not support translation by default, but enabling would be easy: - set the allowed languages on web site - create an empty web script ( `{website}_translation_data.js` ) - create a translation gadget web page ( `{website}_translation.html` ) using same content as `gadget_translation.html`, except that the translation data script should be the one created above ( `{website}_translation_data.js` ) - configure the web site to use translation gadget in layout properties. In the case of an OfficeJS web site, this should not be set on the web site but on the main web section - use "Update Translation Data" action on web site or run post-upgrade step of upgrader. This revealed problems (page does not load with javascript error) when using different translation gadgets, that were addressed by not pre-loading the default translation gadget. See merge request nexedi/erp5!1151

renderjs: update translation data in post-upgrade
Firstly, rework a bit the action to create translation data, the action no longer allow choosing the translation data script to update, but uses the one referenced in the translation gadget html. In post upgrade, compare the actual content of the translation data script with the expected content, calculated from web site languages, data-i18n attributes from referenced pages and Localizer messages. This makes the requirement that web sites with different configurations for translations need to use different translation gadget stronger, when it's not met post upgrade will always report consistency issues. To address this, modify existing web sites so that they all use different translation gadgets - or at least don't use translation gadget explicitly. This was made by: - all web sites by default do not have a translation gadget - smart_assistant use a dedicated translation gadget, to confirm that using a different translation gadget is possible with an officejs web site, where the translation gadget is defined in the "app" web section. - officejs_support_request_ui uses a dedicated translation gadget, because we need this for a customer project and for ourselves. - other web sites do not support translation by default, but enabling would be easy: - set the allowed languages on web site - create an empty web script ( `{website}_translation_data.js` ) - create a translation gadget web page ( `{website}_translation.html` ) using same content as `gadget_translation.html`, except that the translation data script should be the one created above ( `{website}_translation_data.js` ) - configure the web site to use translation gadget in layout properties. In the case of an OfficeJS web site, this should not be set on the web site but on the main web section - use "Update Translation Data" action on web site or run post-upgrade step of upgrader. This revealed problems (page does not load with javascript error) when using different translation gadgets, that were addressed by not pre-loading the default translation gadget. See merge request nexedi/erp5!1151
a39b74c2 · Jérome Perrin · 1833f952 · da32220c · a39b74c2 · a39b74c2
Commit a39b74c2 authored Jun 30, 2020 by Jérome Perrin
55 changed files
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.js
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.js
@@ -6,7 +6,6 @@
  var warmup_gadget_done = false,
    warmup_list = [
      'gadget_erp5_label_field.html',
-      'gadget_translation.html',
      'gadget_erp5_header.html',
      'gadget_erp5_ojs_panel.html',
      'gadget_html5_input.html',

--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_router_js.xml
@@ -258,8 +258,8 @@
                          </tuple>
                          <state>
                            <tuple>
-                              <float>1575297418.87</float>
-                              <string>UTC</string>
+                              <float>1592203174.96</float>
+                              <string>GMT+2</string>
                            </tuple>
                          </state>
                        </object>

--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_data_js.js
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_data_js.js
+/**
+ * This translation data is generated automatically and updated with upgrader in post-upgarde.
+ * Do not edit manually, but use "Update Translation Data" action on web site to update from
+ * Localizer and from data-i18n tags on web pages.
+ */
+/*globals window*/
+/*jslint indent: 2, nomen: true */
+
+(function (window) {
+  "use strict";
+  // @ts-ignore
+  window.translation_data = {
+    "en": {
+    }
+  };
+}(window));
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_data_js.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_data_js.xml
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_html.html
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_html.html
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>OfficeJS Smart Assistant Translation Gadget</title>
+    <link rel="http://www.renderjs.org/rel/interface" href="interface_translation.html">
+
+    <!-- renderjs -->
+    <script src="rsvp.js" type="text/javascript"></script>
+    <script src="renderjs.js" type="text/javascript"></script>
+
+    <!-- custom script -->
+    <script src="gadget_officejs_smart_assistant_translation_data.js" type="text/javascript"></script>
+    <script src="gadget_translation.js" type="text/javascript"></script>
+
+    </head>
+  <body>
+  </body>
+</html>
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_html.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_translation_html.xml
--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_bookmark_manager.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_bookmark_manager.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -469,10 +459,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_codemirror.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_codemirror.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -493,10 +483,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_codemirror/app.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_codemirror/app.xml
@@ -209,16 +209,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -425,10 +415,6 @@ WebSection_getCodemirrorEditorPrecacheManifestList</string> </value>
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_webapp_manifest_url</string> </key>
            <value> <string>gadget_officejs_json_manifest_javascript_editor.json</string> </value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_cribjs.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_cribjs.xml
@@ -249,26 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_manifest_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -447,10 +427,6 @@
            <key> <string>configuration_latest_version</string> </key>
            <value> <string>development</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_manifest_url</string> </key>
-            <value> <string>gadget_officejs.appcache</string> </value>
-        </item>
        <item>
            <key> <string>configuration_panel_gadget_url</string> </key>
            <value> <string>gadget_officejs_application_panel.html</string> </value>
@@ -469,10 +445,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_cribjs/development.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_cribjs/development.xml
@@ -209,16 +209,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -309,10 +299,6 @@
            <key> <string>configuration_router_gadget_url</string> </key>
            <value> <string>gadget_officejs_crib_router.html</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_x_frame_options</string> </key>
            <value> <string>SAMEORIGIN</string> </value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_drive_app.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_drive_app.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -469,10 +459,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_media_player.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_media_player.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -469,10 +459,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_notebook.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_notebook.xml
@@ -249,26 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_manifest_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -457,10 +437,6 @@
            <key> <string>configuration_latest_version</string> </key>
            <value> <string>app</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_manifest_url</string> </key>
-            <value> <string>gadget_officejs.appcache</string> </value>
-        </item>
        <item>
            <key> <string>configuration_panel_gadget_url</string> </key>
            <value> <string>gadget_officejs_application_panel.html</string> </value>
@@ -479,10 +455,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_pdf_viewer.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_pdf_viewer.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -479,10 +469,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_smart_assistant.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_smart_assistant.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -475,10 +465,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_smart_assistant/app.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_smart_assistant/app.xml
@@ -391,9 +391,7 @@ WebSection_getSmartAssistantPrecacheManifestList</string> </value>
        </item>
        <item>
            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>gadget_officejs_smart_assistant_translation.html</string> </value>
        </item>
        <item>
            <key> <string>configuration_webapp_manifest</string> </key>
@@ -664,8 +662,8 @@ WebSection_getSmartAssistantPrecacheManifestList</string> </value>
                          </tuple>
                          <state>
                            <tuple>
-                              <float>1587729410.45</float>
-                              <string>UTC</string>
+                              <float>1592182961.5</float>
+                              <string>GMT+2</string>
                            </tuple>
                          </state>
                        </object>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_svg_editor.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_svg_editor.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -479,10 +469,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -479,10 +469,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_wallsearch.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_wallsearch.xml
@@ -249,26 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_manifest_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -457,10 +437,6 @@
            <key> <string>configuration_latest_version</string> </key>
            <value> <string>app</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_manifest_url</string> </key>
-            <value> <string>gadget_officejs.appcache</string> </value>
-        </item>
        <item>
            <key> <string>configuration_panel_gadget_url</string> </key>
            <value> <string>gadget_officejs_application_panel.html</string> </value>
@@ -479,10 +455,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_smart_assistant/WebSection_getSmartAssistantPrecacheManifestList.py
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_smart_assistant/WebSection_getSmartAssistantPrecacheManifestList.py
@@ -20,9 +20,9 @@ url_list = [
  "gadget_jio.js",
  "gadget_translate.html",
  "gadget_translate.js",
-  "gadget_translation.html",
+  "gadget_officejs_smart_assistant_translation.html",
  "gadget_translation.js",
-  "gadget_translation_data.js",
+  "gadget_officejs_smart_assistant_translation_data.js",
  "gadget_erp5_editor_panel.html",
  "gadget_erp5_editor_panel.js",
  "gadget_erp5_ojs_panel.html",

--- a/bt5/erp5_officejs/bt/template_path_list
+++ b/bt5/erp5_officejs/bt/template_path_list
@@ -49,4 +49,4 @@ web_site_module/officejs_text_editor/**
 web_site_module/officejs_todomvc
 web_site_module/officejs_wallsearch
 web_site_module/officejs_wallsearch/**
-web_site_module/officejs_whiteboard
+web_site_module/officejs_whiteboard
\ No newline at end of file
--- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_site_module/afs.xml
+++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_site_module/afs.xml
@@ -199,16 +199,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -403,10 +393,6 @@
            <key> <string>configuration_service_worker_url</string> </key>
            <value> <string>gadget_erp5_serviceworker.js</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value> <string>object_view</string> </value>

--- a/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_site_module/application-list/publisher.xml
+++ b/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_site_module/application-list/publisher.xml
@@ -204,16 +204,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -310,10 +300,6 @@
            <key> <string>configuration_panel_gadget_url</string> </key>
            <value> <string>gadget_ojs_appstore_panel.html</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value> <string>object_view</string> </value>

--- a/bt5/erp5_officejs_jquery_app/PathTemplateItem/web_site_module/officejs_image_editor.xml
+++ b/bt5/erp5_officejs_jquery_app/PathTemplateItem/web_site_module/officejs_image_editor.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -479,10 +469,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs_jquery_app/PathTemplateItem/web_site_module/officejs_web_table_editor.xml
+++ b/bt5/erp5_officejs_jquery_app/PathTemplateItem/web_site_module/officejs_web_table_editor.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -479,10 +469,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_presentation.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_presentation.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -465,10 +455,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -465,10 +455,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_text.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_text.xml
@@ -249,16 +249,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -465,10 +455,6 @@
              <none/>
            </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value>

--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_data_js.js
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_data_js.js
+/**
+ * This translation data is generated automatically and updated with upgrader in post-upgarde.
+ * Do not edit manually, but use "Update Translation Data" action on web site to update from
+ * Localizer and from data-i18n tags on web pages.
+ */
+/*globals window*/
+/*jslint indent: 2, nomen: true */
+
+(function (window) {
+  "use strict";
+  // @ts-ignore
+  window.translation_data = {
+    "en": {
+    }
+  };
+}(window));
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_data_js.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_data_js.xml
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_html.html
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_html.html
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>Support Request Translation Gadget</title>
+    <link rel="http://www.renderjs.org/rel/interface" href="interface_translation.html">
+
+    <!-- renderjs -->
+    <script src="rsvp.js" type="text/javascript"></script>
+    <script src="renderjs.js" type="text/javascript"></script>
+
+    <!-- custom script -->
+    <script src="gadget_supportrequest_translation_data.js" type="text/javascript"></script>
+    <script src="gadget_translation.js" type="text/javascript"></script>
+
+    </head>
+  <body>
+  </body>
+</html>
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_html.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_translation_html.xml
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml
@@ -405,7 +405,7 @@ WebSection_getOfficeJSSupportRequestPrecacheManifestList</string> </value>
        </item>
        <item>
            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
+            <value> <string>gadget_supportrequest_translation.html</string> </value>
        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>

--- a/bt5/erp5_web_jabber_client/PathTemplateItem/web_page_module/jabber_gadget_jabberclient_appcache.xml
+++ b/bt5/erp5_web_jabber_client/PathTemplateItem/web_page_module/jabber_gadget_jabberclient_appcache.xml
@@ -126,9 +126,6 @@ handlebars.js\n
 jiodev.js\n
 renderjs.js\n
 rsvp.js\n
-gadget_translation.html\n
-gadget_translation.js\n
-gadget_translation_data.js\n
 gadget_erp5_router.html\n
 gadget_erp5_router.js\n
 gadget_erp5_notification.html\n

--- a/bt5/erp5_web_jabber_client/PathTemplateItem/web_site_module/jabber_client.xml
+++ b/bt5/erp5_web_jabber_client/PathTemplateItem/web_site_module/jabber_client.xml
@@ -169,16 +169,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -371,10 +361,6 @@
            <key> <string>configuration_stylesheet_url</string> </key>
            <value> <string>gadget_jabberclient.css</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_webapp_manifest_url</string> </key>
            <value>

--- a/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml
+++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml
@@ -213,16 +213,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -345,10 +335,6 @@
            <key> <string>configuration_router_gadget_url</string> </key>
            <value> <string>gadget_officejs_monitoring_router.html</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_x_frame_options</string> </key>
            <value> <string>ALLOW-FROM-ALL</string> </value>

--- a/bt5/erp5_web_project_ui/PathTemplateItem/web_site_module/project_management.xml
+++ b/bt5/erp5_web_project_ui/PathTemplateItem/web_site_module/project_management.xml
@@ -199,16 +199,6 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>configuration_translation_gadget_url</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
                <dictionary>
                  <item>
                      <key> <string>id</string> </key>
@@ -390,10 +380,6 @@ WebSection_getWebProjectPrecacheManifestList</string> </value>
            <key> <string>configuration_service_worker_url</string> </key>
            <value> <string>gadget_erp5_serviceworker.js</string> </value>
        </item>
-        <item>
-            <key> <string>configuration_translation_gadget_url</string> </key>
-            <value> <string>gadget_translation.html</string> </value>
-        </item>
        <item>
            <key> <string>configuration_view_action_category</string> </key>
            <value> <string>object_view</string> </value>

--- a/bt5/erp5_web_renderjs_ui/ActionTemplateItem/portal_types/Web%20Site/create_translation_data.xml
+++ b/bt5/erp5_web_renderjs_ui/ActionTemplateItem/portal_types/Web%20Site/create_translation_data.xml
@@ -60,7 +60,7 @@
        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>Create Translation Data</string> </value>
+            <value> <string>Update Translation Data</string> </value>
        </item>
        <item>
            <key> <string>visible</string> </key>
@@ -77,7 +77,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/WebSite_createTranslationData</string> </value>
+            <value> <string>string:${object_url}/WebSite_viewUpdateTranslationDataDialog</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
@@ -17,8 +17,6 @@ and handling data send&receive.
      'gadget_erp5_form.html',
      'gadget_erp5_field_float.html',
      'gadget_erp5_field_listbox.html',
-      // Used in panel
-      'gadget_translation.html',
      'gadget_erp5_panel.html',
      'gadget_erp5_header.html',
      'gadget_erp5_searchfield.html',

--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_translation_data_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_translation_data_js.js
+/**
+ * This translation data is generated automatically and updated with upgrader in post-upgarde.
+ * Do not edit manually, but use "Update Translation Data" action on web site to update from
+ * Localizer and from data-i18n tags on web pages.
+ */
 /*globals window*/
-/*jslint indent: 2, nomen: true, maxlen: 80*/
+/*jslint indent: 2, nomen: true */
+
 (function (window) {
  "use strict";
-
+  // @ts-ignore
  window.translation_data = {
-    en: {
+    "en": {
    }
  };
-
-}(window));
\ No newline at end of file
+}(window));
--- a/bt5/erp5_web_renderjs_ui/PropertySheetTemplateItem/portal_property_sheets/WebSiteRenderJSUpgradeConstraint/translation_signature_constraint.xml
+++ b/bt5/erp5_web_renderjs_ui/PropertySheetTemplateItem/portal_property_sheets/WebSiteRenderJSUpgradeConstraint/translation_signature_constraint.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Script Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>constraint_type/post_upgrade</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>translation_signature_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Script Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>script_id</string> </key>
+            <value> <string>WebSite_checkTranslationConsistency</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_checkTranslationConsistency.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_checkTranslationConsistency.py
+"""Check that RenderJS translation gadget data is up to date.
+
+This compare the current content of the translation gadget data against what
+the content would be if "Update Translation Data" were used. If the scripts
+are different, update the translation data to fix.
+"""
+from collections import defaultdict
+
+if not context.getAvailableLanguageList():
+  return []
+
+if context.getSkinSelectionName() != 'RJS':
+  return []
+
+# find the .js containing translation data
+gadget_translation_data_js = context.WebSite_getTranslationDataWebScriptValue()
+if gadget_translation_data_js is None:
+  return []
+
+error_list = []
+if context.WebSite_getTranslationDataTextContent(
+) != gadget_translation_data_js.getTextContent():
+  error_list.append("Translation data script content is not up to date")
+
+  if fixit:
+    # try to detect the case of two incompatible web sites configured for the same translation gadget.
+    # Use a mapping of set of web site ids keyed by translation data script reference and check
+    # if we update the same translation data script more than once in the same REQUEST.
+    # Using REQUEST is not really good, since upgrader uses grouped activities and we can just check
+    # web sites processed in the same activity group, but that's easy and hopefully better than nothing.
+    already_updated_websites = container.REQUEST.get(
+        script.getId(), defaultdict(set))
+    container.REQUEST.set(script.getId(), already_updated_websites)
+    gadget_translation_data_js_reference = gadget_translation_data_js.getReference()
+    already_updated_websites[gadget_translation_data_js_reference].add(context.getId())
+    if len(already_updated_websites[gadget_translation_data_js_reference]) > 1:
+      raise RuntimeError(
+          "Translation script %s is used by more than one web site with different configurations (%s)"
+          % (
+              gadget_translation_data_js_reference,
+              ", ".join(already_updated_websites[gadget_translation_data_js_reference]),
+          ))
+
+    context.WebSite_updateTranslationData()
+    # since we might have modified some cached files, check again the modification date
+    # consistency.
+    error_list.extend(
+        context.WebSite_checkCacheModificationDateConsistency(fixit=True))
+
+return error_list
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/Base_createTranslateData.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/Base_createTranslateData.xml
@@ -50,11 +50,11 @@
        </item>
        <item>
            <key> <string>_params</string> </key>
-            <value> <string> translation_data_file, batch_mode=0</string> </value>
+            <value> <string>fixit=False</string> </value>
        </item>
        <item>
            <key> <string>id</string> </key>
-            <value> <string>Base_createTranslateData</string> </value>
+            <value> <string>WebSite_checkTranslationConsistency</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_createTranslationData/your_translation_data_file.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_createTranslationData/your_translation_data_file.xml
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list>
-                <string>first_item</string>
-                <string>items</string>
-                <string>title</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_translation_data_file</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>my_list_field</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Translation Data File</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: [ (x,x) for x in here.Base_getTranslationSourceFileList()]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/Base_createTranslateData.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/Base_createTranslateData.py
+"""Returns the `text_content` that should be set on the translation data script for this RJS website.
+"""
 import re
 import json

 portal = context.getPortalObject()
-
 Base_translateString = context.Base_translateString
-#(data-i18n)=["']{{((?:.(?!["']?(?:\S+)=|[>"']))+.)}}["']
-attribute_filter_re = re.compile(r"""(data-i18n)=["']?((?:.(?!["']?\s+(?:\S+)=|[>"']))+.)["']?""")
-
-translate_word = []

+# Collect all translatable messages from web pages referenced by this web sites.
+# The convention is to use data-i18n tags in HTML, like:
+#   <span data-18n="The message">The message</span>
+# or in comments, like this:
+#   <!-- data-i18n="The message" -->
+attribute_filter_re = re.compile(r"""(data-i18n)=["']?((?:.(?!["']?\s+(?:\S+)=|[>"']))+.)["']?""")
+translatable_message_set = set([])
 for web_page in portal.web_page_module.searchFolder(portal_type='Web Page',
                                                    reference=context.Base_getTranslationSourceFileList(only_html=1)):
  data = attribute_filter_re.findall(web_page.getTextContent())
@@ -16,38 +20,31 @@ for web_page in portal.web_page_module.searchFolder(portal_type='Web Page',
    a = re.sub(r'[{|}]', "", attribute[1])
    a = re.sub(r'\[.*?\]', "", a)
    if a:
-      translate_word.append(a)
-
-translate_word =  list(set(translate_word))
-
-
-language_list = context.getAvailableLanguageSet()
-
-content = """
-/*globals window*/\n
-/*jslint indent: 2, nomen: true, maxlen: 80*/\n
-(function (window) {\n
-  "use strict";\n
-"""
+      translatable_message_set.add(a)

 tmp = {}
-
-for language in language_list:
+for language in context.getAvailableLanguageSet():
  tmp[language] = {}
-  for word in translate_word:
+  for word in translatable_message_set:
    tmp[language][word] = Base_translateString(word, lang = language)

-
-
-content += "  window.translation_data = " + json.dumps(tmp, indent=3, ensure_ascii=False, separators=(',', ': '))
-content += ";\n}(window));"
-#return json.dumps(tmp, indent=3, ensure_ascii=False, separators=(',', ': '))
-translation_data_file=context.web_page_module.searchFolder(portal_type='Web Script',reference=translation_data_file)[0]
-translation_data_file.edit(text_content = content)
-
-# Edit web section modification date
-context.edit()
-
-if batch_mode:
-  return 'done'
-return context.Base_redirect('view', keep_items=dict(portal_status_message=Base_translateString("Translation Data Create")))
+return """/**
+ * This translation data is generated automatically and updated with upgrader in post-upgarde.
+ * Do not edit manually, but use "Update Translation Data" action on web site to update from
+ * Localizer and from data-i18n tags on web pages.
+ */
+/*globals window*/
+/*jslint indent: 2, nomen: true */
+
+(function (window) {
+  "use strict";
+  // @ts-ignore
+  window.translation_data = %s;
+}(window));
+""" % ("\n  ".join(
+        json.dumps(
+            tmp,
+            sort_keys=True,
+            indent=2,
+            ensure_ascii=False,
+            separators=(',', ': ')).splitlines()))
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataTextContent.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataTextContent.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getTranslationDataTextContent</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataWebScriptValue.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataWebScriptValue.py
+# type: () -> Optional[erp5.portal_type.WebScript]
+"""Returns the web script used to contain the translation data for this RJS web site.
+"""
+
+# OfficeJS is a bit more complex, the translation gadget is defined on the
+# `app` web section, which is defined in "configuration_latest_version"
+officejs_latest_version = context.getLayoutProperty(
+    "configuration_latest_version")
+if officejs_latest_version:
+  if officejs_latest_version.endswith('/'):
+    officejs_latest_version = officejs_latest_version[:-1]
+  context = context.restrictedTraverse(officejs_latest_version, None)
+  if context is None:
+    return None
+  # now `context` is the app web section and the logic is same as with a normal
+  # ERP5JS web site.
+
+translation_gadget_url = context.getLayoutProperty(
+    "configuration_translation_gadget_url")
+if not translation_gadget_url:
+  return None
+translation_gadget = context.getDocumentValue(translation_gadget_url)
+if not translation_gadget:
+  return None
+
+# find the .js containing translation data
+for successor in translation_gadget.getImplicitSuccessorValueList():
+  successor = successor.getObject()
+  if successor.getReference() and successor.getReference().endswith(
+      'translation_data.js'):
+    return successor
+
+return None
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataWebScriptValue.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_getTranslationDataWebScriptValue.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getTranslationDataWebScriptValue</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_updateTranslationData.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_updateTranslationData.py
+from Products.ERP5Type.Message import translateString
+portal = context.getPortalObject()
+
+gadget_translation_data_js = context.WebSite_getTranslationDataWebScriptValue()
+if gadget_translation_data_js is None:
+  return context.Base_redirect(
+      form_id,
+      keep_items=dict(
+          portal_status_message=translateString("No translation data script.")))
+
+gadget_translation_data_js.setTextContent(
+    context.WebSite_getTranslationDataTextContent())
+portal.portal_workflow.doActionFor(
+    gadget_translation_data_js,
+    'edit_action',
+    comment=translateString(
+        "Translation data updated from web site ${web_site_id}.",
+        mapping={'web_site_id': context.getId()}))
+
+# Edit web section modification date
+portal.portal_workflow.doActionFor(
+    context,
+    'edit_action',
+    comment=translateString("Translation data updated.",))
+
+if REQUEST is not None:
+  return context.Base_redirect(
+      form_id,
+      keep_items=dict(
+          portal_status_message=translateString("Translation data updated.")))
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_updateTranslationData.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_updateTranslationData.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>form_id=\'\', REQUEST=None</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_updateTranslationData</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_createTranslationData.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_createTranslationData.xml
@@ -14,7 +14,11 @@
        </item>
        <item>
            <key> <string>action</string> </key>
-            <value> <string>Base_createTranslateData</string> </value>
+            <value> <string>WebSite_updateTranslationData</string> </value>
+        </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
        </item>
        <item>
            <key> <string>description</string> </key>
@@ -72,7 +76,7 @@
                    <key> <string>left</string> </key>
                    <value>
                      <list>
-                        <string>your_translation_data_file</string>
+                        <string>your_translation_data_reference</string>
                      </list>
                    </value>
                </item>
@@ -87,7 +91,7 @@
        </item>
        <item>
            <key> <string>id</string> </key>
-            <value> <string>WebSite_createTranslationData</string> </value>
+            <value> <string>WebSite_viewUpdateTranslationDataDialog</string> </value>
        </item>
        <item>
            <key> <string>method</string> </key>
@@ -95,7 +99,7 @@
        </item>
        <item>
            <key> <string>name</string> </key>
-            <value> <string>WebSite_createTranslationData</string> </value>
+            <value> <string>WebSite_viewUpdateTranslationDataDialog</string> </value>
        </item>
        <item>
            <key> <string>pt</string> </key>
@@ -111,7 +115,7 @@
        </item>
        <item>
            <key> <string>title</string> </key>
-            <value> <string>Create Translation Data</string> </value>
+            <value> <string>Update Translation Data</string> </value>
        </item>
        <item>
            <key> <string>unicode_mode</string> </key>

--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_viewUpdateTranslationDataDialog/your_translation_data_reference.xml
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_viewUpdateTranslationDataDialog/your_translation_data_reference.xml
--- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
+++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
@@ -86,6 +86,6 @@ for tmp in param_dict:
  context.Base_addUITestTranslation(message = tmp['message'], translation = tmp['translation'], language = tmp['language'])

 context.web_site_module.renderjs_runner.setAvailableLanguageSet(['en', 'fr', 'wo'])
-context.web_site_module.renderjs_runner.Base_createTranslateData(translation_data_file='gadget_translation_data.js',batch_mode=1)
+context.web_site_module.renderjs_runner.WebSite_updateTranslationData()
 context.ERP5Site_updateTranslationTable()
 return 'done'
--- a/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
+++ b/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
@@ -119,3 +119,63 @@ class TestRenderJSUpgrade(ERP5TypeTestCase):
        [
          'Error: Web Site %s references a non existant appcache %s' % (self.web_site.getRelativeUrl(), non_existant_appcache)
        ], [str(m.getMessage()) for m in self.web_site.checkConsistency()])
+
+  def test_upgrade_site_translation(self):
+    test_upgrade_site_translation_data_js = self.portal.web_page_module.newContent(
+        portal_type='Web Script',
+        reference='test_upgrade_site_translation_data.js',
+        text_content='// will be filled',
+    )
+    test_upgrade_site_translation_data_js.publish()
+    test_upgrade_site_translation_data_js_modification_date = test_upgrade_site_translation_data_js.getModificationDate()
+
+    test_upgrade_site_translation_data_html = self.portal.web_page_module.newContent(
+        portal_type='Web Page',
+        reference='test_upgrade_site_translation.html',
+        content_type='text/html',
+        text_content=textwrap.dedent('''
+            <!DOCTYPE html>
+              <html>
+                <head>
+                  <meta charset="utf-8" />
+                  <meta name="viewport" content="width=device-width" />
+                  <title>Translation Gadget</title>
+                  <link rel="http://www.renderjs.org/rel/interface" href="interface_translation.html">
+
+                  <!-- renderjs -->
+                  <script src="rsvp.js" type="text/javascript"></script>
+                  <script src="renderjs.js" type="text/javascript"></script>
+
+                  <!-- custom script -->
+                  <script src="test_upgrade_site_translation_data.js" type="text/javascript"></script>
+                  <script src="gadget_translation.js" type="text/javascript"></script>
+
+                  </head>
+                <body>
+                </body>
+              </html>
+              '''),
+      )
+    test_upgrade_site_translation_data_html.publish()
+
+    self.web_site.setProperty(
+        'configuration_translation_gadget_url',
+        'test_upgrade_site_translation.html',
+    )
+    self.web_site.setAvailableLanguageList(['en', 'fa'])
+    self.tic()
+    self.assertEqual(
+        ['Translation data script content is not up to date'],
+        [str(m.getMessage()) for m in self.web_site.checkConsistency()])
+    self.web_site.fixConsistency()
+    self.tic()
+
+    self.assertEqual(
+        [],
+        [str(m.getMessage()) for m in self.web_site.checkConsistency()])
+    self.assertIn(
+        "window.translation_data = ",
+        test_upgrade_site_translation_data_js.getTextContent())
+    self.assertGreater(
+        test_upgrade_site_translation_data_js.getModificationDate(),
+        test_upgrade_site_translation_data_js_modification_date)