diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_en.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_en.odt index 0db3ef60b..b4410ff1c 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_en.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_en.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_es.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_es.odt index 0db3ef60b..5108eb112 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_es.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_es.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_fr.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_fr.odt index 0db3ef60b..72927d992 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_fr.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_fr.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hi.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hi.odt index 0db3ef60b..72927d992 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hi.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hi.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hu.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hu.odt index 0db3ef60b..5c6a960cf 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hu.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_hu.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_it.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_it.odt index 0db3ef60b..1d16dcb07 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_it.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_it.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_nl.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_nl.odt index 0db3ef60b..2726dd49f 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_nl.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_nl.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_no_nb.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_no_nb.odt index 0db3ef60b..0eea4ae5d 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_no_nb.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_no_nb.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_br.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_br.odt index 0db3ef60b..d9ccc7c27 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_br.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_br.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_pt.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_pt.odt index 0db3ef60b..be257345c 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_pt.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_pt_pt.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_en.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_en.odt index 4956ebbce..3eff74262 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_en.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_en.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_es.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_es.odt index 4956ebbce..d45b3ca67 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_es.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_es.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_fr.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_fr.odt index 4956ebbce..8ecb5c582 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_fr.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_fr.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hi.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hi.odt index 4956ebbce..8ecb5c582 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hi.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hi.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hu.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hu.odt index 4956ebbce..8ecb5c582 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hu.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_hu.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_it.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_it.odt index 4956ebbce..8ecb5c582 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_it.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_it.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_nl.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_nl.odt index 4956ebbce..ea5fe6f03 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_nl.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_nl.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_no_nb.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_no_nb.odt index 4956ebbce..ea5fe6f03 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_no_nb.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_no_nb.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_br.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_br.odt index 4956ebbce..ea5fe6f03 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_br.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_br.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_pt.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_pt.odt index 4956ebbce..4e32fd952 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_pt.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_pt_pt.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_ru.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_ru.odt index 4956ebbce..172b40288 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_ru.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_ru.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_uk.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_uk.odt index 4956ebbce..172b40288 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_uk.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_qr_uk.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_ru.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_ru.odt index 0db3ef60b..096208f86 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_ru.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_ru.odt differ diff --git a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_uk.odt b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_uk.odt index 0db3ef60b..a79a87d45 100644 Binary files a/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_uk.odt and b/resources/templates/owasp_cornucopia_webapp_ver_guide_bridge_uk.odt differ diff --git a/scripts/convert.py b/scripts/convert.py index 17c4f6c74..77e3e4989 100644 --- a/scripts/convert.py +++ b/scripts/convert.py @@ -1290,6 +1290,22 @@ def _find_xml_elements(tree: Any) -> List[ElTree.Element]: return cast(List[ElTree.Element], elements) +def _replace_element_text(el: ElTree.Element, replacement_values: List[Tuple[str, str]], modified: bool) -> bool: + """Replace text and tail text in an XML element.""" + if el.text: + new_text = get_replacement_value_from_dict(el.text, replacement_values) + if new_text != el.text: + el.text = new_text + modified = True + for child in el: + if child.tail: + new_tail = get_replacement_value_from_dict(child.tail, replacement_values) + if new_tail != child.tail: + child.tail = new_tail + modified = True + return modified + + def replace_text_in_xml_file(filename: str, replacement_values: List[Tuple[str, str]]) -> None: """Replace text in XML file.""" logging.debug(f" --- starting xml_replace for {filename}") @@ -1308,11 +1324,7 @@ def replace_text_in_xml_file(filename: str, replacement_values: List[Tuple[str, modified = False for el in elements_to_check: - if el.text: - new_text = get_replacement_value_from_dict(el.text, replacement_values) - if new_text != el.text: - el.text = new_text - modified = True + modified = _replace_element_text(el, replacement_values, modified) if modified: try: diff --git a/source/webapp-cards-3.0-ru.yaml b/source/webapp-cards-3.0-ru.yaml index c3ce5cbab..1423521f4 100644 --- a/source/webapp-cards-3.0-ru.yaml +++ b/source/webapp-cards-3.0-ru.yaml @@ -1368,4 +1368,4 @@ paragraphs: text: "Видео с презентации, OWASP® EU Tour 2013 London, 3 июня 2013" - id: "T03950" - text: "Смотри веб-сайт проекта для получения дополнительной информации и материалов презентаций." + text: "Смотри веб-сайт проекта для получения дополнительной информации и материалов."