[i18n] in description.xml use "lang" attribute instead of "xml:lang"

Required reordering of scripts.

Author: gkarsay

create_oxt.sh

@@ -19,9 +19,6 @@ zip -r "$OXT" \
 	toolbar \
 	--exclude /*meson.build /*.in /*bundled_manifest.xml
 
-# LibreOffice doesn't understand xml:lang attribute when installed as otx
-sed -i'' 's/xml:lang/lang/' $BUILD_ROOT/extension/description.xml
-
 # Add generated files from build root
 cd "$BUILD_ROOT"/extension &&
 zip -r "$OXT" \

extension/i18n_description.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 # Ridiculous hack to automatically translate OpenOffice's <extension-description>
-# input:  <sourcedir>/extension/description_translation.xml
-#         <sourcedir>/po/<lang>.po
-#         <builddir>/extension/description.xml.in.in
-# output: <builddir>/extension/description.xml.in
-#         <builddir>/extension/description/desc_<lang>.txt
 
-SOURCE_DIR="${MESON_SOURCE_ROOT}"/extension
-BUILD_DIR="${MESON_BUILD_ROOT}"/extension
+
+MESON_SOURCE_ROOT="$1"
+MESON_BUILD_ROOT="$2"
+
+SOURCE_DIR="$MESON_SOURCE_ROOT"/extension
+BUILD_DIR="$MESON_BUILD_ROOT"/extension
 
 # First get the english text
 
@@ -24,13 +23,16 @@ do
 	then
 		# .po files have exactly one translation for source file "translation_source.xml"
 		# Get that translation and check if not empty.
-		string=`grep -A 2 'extension/description_translation.xml' "${MESON_SOURCE_ROOT}"/po/$lang.po | sed -n 's/msgstr "\(.*\)"/\1/p'`
+		string=`grep -A 2 'extension/description_translation.xml' "$MESON_SOURCE_ROOT"/po/$lang.po | sed -n 's/msgstr "\(.*\)"/\1/p'`
 		if [ "$string" != "" ]
 		then
 			echo "$string" > "$BUILD_DIR"/description/desc_$lang.txt
 			sed "/.*\/extension-description/i <src xlink:href=\"description/desc_$lang.txt\" lang=\"$lang\" />" \
-				"$BUILD_DIR"/description.xml.in.in \
-				> "$BUILD_DIR"/description.xml.in
+				"$BUILD_DIR"/description.xml.in \
+				> "$BUILD_DIR"/description.xml
 		fi
 	fi
-done < "${MESON_SOURCE_ROOT}"/po/LINGUAS
+done < "$MESON_SOURCE_ROOT"/po/LINGUAS
+
+# LibreOffice description.xml doesn't understand xml:lang attribute
+sed -i'' 's/xml:lang/lang/' "$BUILD_DIR"/description.xml

extension/meson.build

@@ -3,27 +3,35 @@ script_dir = join_paths(base_lo_dir, 'share', 'Scripts', 'python', 'parlatype')
 
 # description.xml is generated in 3 steps:
 # 1) Configure the version
-# 2) Generate <extension-description> links and text files
+# 2) Merge translations for <display-name>
+# 3) Generate <extension-description> links and text files
 #    in description/ for en and all translated languages
 #    using description_translation.xml and a flaky script
-# 3) Merge translations for <display-name>
 
 desc = configuration_data()
 desc.set('VERSION', meson.project_version())
-configure_file(
+description_in_in = configure_file(
 	input: 'description.xml.in.in.in',
 	output: 'description.xml.in.in',
 	configuration: desc
 )
 
-run_command ('i18n_description.sh')
-
-description = i18n.merge_file(
-	input: join_paths(meson.current_build_dir(), 'description.xml.in'),
-	output: 'description.xml',
+description_in = i18n.merge_file(
+	input: description_in_in,
+	output: 'description.xml.in',
 	type: 'xml',
 	po_dir: '../po',
 	data_dirs: [ '../po' ],
+	install: false,
+)
+
+i18n_script = find_program('i18n_description.sh', required: true)
+
+description = custom_target(
+	'description',
+	input: description_in,
+	output: 'description.xml',
+	command: [ i18n_script, meson.source_root(), meson.build_root() ],
 	install: bundled,
 	install_dir: extension_dir,
 )