[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1259-g109084be6

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  109084be602f8e045ec3511e01052f81257b9a92 (commit)
      from  3bbaa720c547c96a4fb2f8e4b08f6f18eb00a9cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 109084be602f8e045ec3511e01052f81257b9a92
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Jul 15 00:38:12 2023 +0200

    Skip translation of some xml tags
    
    For now we skip these tags:
      - programlisting
      - screen
      - funcsynopsis
    
    Closes #5440

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a87f56576..55519f282 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -251,22 +251,21 @@ ifeq ($(XML2POT),)
 $(XML_INPUTS_POT): requirements_not_met_xml2pot
 else
 $(XML_INPUTS_POT): $(srcdir)/po/templates/%.xml.pot: %.xml
+	@$(XML2POT) $< > $@.tmp;
+	@$(abs_srcdir)/po/strip_untranslatable.sh $@.tmp;
 	@if test -f $@; then \
-	  $(XML2POT) $< > $@.tmp; \
     changed=`diff $@.tmp $@ \
 			| grep -v '^[<>] "POT-Creation-Date:' \
 			| grep -v '^[<>] "Report-Msgid-Bugs-To:' \
 			| wc -l`; \
     if expr $${changed} \> 3 >/dev/null; then \
       echo "$@ updated"; \
-      mv $@.tmp $@; \
     else \
       echo "$@ unchanged"; \
       rm -f $@.tmp; \
     fi; \
-  else \
-	  $(XML2POT) $< > $@; \
   fi;
+	@if test -e $@.tmp; then mv $@.tmp $@; fi
 endif
 
 # Update translation templates
diff --git a/doc/po/strip_untranslatable.sh b/doc/po/strip_untranslatable.sh
new file mode 100755
index 000000000..a79ddf35c
--- /dev/null
+++ b/doc/po/strip_untranslatable.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This would be best done with ITS but it doesn't
+# work very effectively at the moment
+# See https://www.w3.org/TR/xml-i18n-bp/#relating-docbook-plus-its
+# https://trac.osgeo.org/postgis/ticket/5074
+
+
+sed -e '/^#\. Tag: programlisting$/,/^$/d' \
+    -e '/^#\. Tag: programlisting$/,/^$/d' \
+    -e '/^#\. Tag: funcsynopsis$/,/^$/d' \
+    -i $1
+

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.in                |  7 +++----
 doc/po/strip_untranslatable.sh | 13 +++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100755 doc/po/strip_untranslatable.sh


hooks/post-receive
-- 
PostGIS