erp5_web_js_style: publish the page current language

b632fc1d · Romain Courteaud · 78cf1c94 · b632fc1d · b632fc1d · b632fc1d
Commit b632fc1d authored Oct 25, 2021 by Romain Courteaud
8 changed files
--- a/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/dialog_main.zpt
+++ b/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/dialog_main.zpt
@@ -25,7 +25,7 @@
      current_language python: web_site.getPortalObject().Localizer.get_selected_language();
      global_definitions_macros here/global_definitions/macros;">
      <tal:block metal:use-macro="global_definitions_macros/header_definitions" />
-<html>
+<html tal:attributes="lang current_language">
  <head>
  <base tal:attributes="href python: '%s/' % web_section.absolute_url()" />
  <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1" />

--- a/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/jsstyle.js.js
+++ b/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/jsstyle.js.js
@@ -145,7 +145,7 @@
    return result;
  }

-  function parsePageContent(body_element, base_uri) {
+  function parsePageContent(body_element, language, base_uri) {
    var i,
      element,
      element_list,
@@ -174,6 +174,7 @@
    return {
      original_content: body_element.innerHTML,
      html_content: body_element.querySelector('main').innerHTML,
+      language: language,
      language_list: parseLanguageElement(
        body_element.querySelector('nav#language')
      ),
@@ -215,7 +216,9 @@
          // consider this must be reloaded
          throw new Error('Trigger an error to force reload');
        }
-        parsed_content = parsePageContent(dom_parser.body, dom_parser.baseURI);
+        parsed_content = parsePageContent(dom_parser.body,
+                                          dom_parser.documentElement.lang,
+                                          dom_parser.baseURI);
        gadget.parsed_content = parsed_content;
        parsed_content.page_title = dom_parser.title;
        return result_dict.style_gadget.render(parsed_content.html_content,
@@ -312,7 +315,8 @@
        return rJS.declareCSS(style_css_url, document.head);
      }

-      parsed_content = parsePageContent(gadget.element);
+      parsed_content = parsePageContent(gadget.element,
+                                        document.documentElement.lang);
      gadget.parsed_content = parsed_content;
      parsed_content.page_title = document.title;
      gadget.style_gadget_url =

--- a/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/view_main.zpt
+++ b/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/view_main.zpt
@@ -24,7 +24,7 @@
      current_language python: web_site.getPortalObject().Localizer.get_selected_language();
      global_definitions_macros here/global_definitions/macros;">
      <tal:block metal:use-macro="global_definitions_macros/header_definitions" />
-<html>
+<html tal:attributes="lang current_language">
  <head>
  <base tal:attributes="href python: '%s/' % web_section.absolute_url()" />
  <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1" />

--- a/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguage.zpt
+++ b/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguage.zpt
@@ -45,6 +45,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>
@@ -83,6 +88,11 @@
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'fr')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
@@ -121,6 +131,11 @@
  <td>//main//p[text()="主页内容"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'zh')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="主页内容"]</td>
@@ -159,6 +174,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>

--- a/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguageWithLanguageBaseUrl.zpt
+++ b/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguageWithLanguageBaseUrl.zpt
@@ -45,6 +45,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>
@@ -83,6 +88,11 @@
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'fr')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
@@ -121,6 +131,11 @@
  <td>//main//p[text()="主页内容"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'zh')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="主页内容"]</td>
@@ -159,6 +174,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>

--- a/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguageWithWebSiteBaseUrl.zpt
+++ b/bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleWebSiteChangeLanguageWithWebSiteBaseUrl.zpt
@@ -45,6 +45,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>
@@ -78,6 +83,11 @@
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'fr')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="Contenu de la page d'accueil"]</td>
@@ -111,6 +121,11 @@
  <td>//main//p[text()="主页内容"]</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'zh')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()="主页内容"]</td>
@@ -144,6 +159,11 @@
  <td>//main//p[text()='Frontpage content']</td>
  <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id='current_language'][contains(text(), 'en')]</td>
+  <td></td>
+</tr>
 <tr>
  <td>assertElementPresent</td>
  <td>//main//p[text()='Frontpage content']</td>

--- a/bt5/erp5_web_js_style_test/SkinTemplateItem/portal_skins/erp5_web_js_style_test/jsstyle_demo.html.html
+++ b/bt5/erp5_web_js_style_test/SkinTemplateItem/portal_skins/erp5_web_js_style_test/jsstyle_demo.html.html
@@ -11,6 +11,7 @@
    <p id="gadget_style_url"></p>
    <p id="render_count"></p>
    <p id="portal_status_message"></p>
+    <p id="current_language"></p>
    <nav id="language"></nav>
    <nav id="sitemap"></nav>
    <aside id="document_list"></aside>

--- a/bt5/erp5_web_js_style_test/SkinTemplateItem/portal_skins/erp5_web_js_style_test/jsstyle_demo.js.js
+++ b/bt5/erp5_web_js_style_test/SkinTemplateItem/portal_skins/erp5_web_js_style_test/jsstyle_demo.js.js
@@ -36,6 +36,7 @@
    .declareMethod("render", function (html_content, parsed_content) {
      var state = {
        document_list: JSON.stringify(parsed_content.document_list || []),
+        current_language: parsed_content.language || "",
        language_list: JSON.stringify(parsed_content.language_list || []),
        sitemap: JSON.stringify(parsed_content.sitemap || {}),
        page_title: parsed_content.page_title || "",
@@ -87,6 +88,11 @@
          text: 'render count: ' + gadget.state.render_count
        });
      }
+      if (modification_dict.hasOwnProperty('current_language')) {
+        domsugar(gadget.element.querySelector('p#current_language'), {
+          text: gadget.state.current_language
+        });
+      }
      if (modification_dict.hasOwnProperty('language_list')) {
        language_list = JSON.parse(gadget.state.language_list);
        child_list = [];