From 64b56664de8fd8af64225b67cd272e759e12d8d2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 25 Jan 2020 17:13:49 +0100
Subject: [PATCH] CI: use explicit encoding in XML tidy

---
 ci/txcheck.sh | 2 +-
 ci/txpush.sh  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ci/txcheck.sh b/ci/txcheck.sh
index 6c5d86c77..7f85be970 100644
--- a/ci/txcheck.sh
+++ b/ci/txcheck.sh
@@ -79,7 +79,7 @@ tx_sum()
 	# Clean up the TS (XML) files (like txpush would)
 	TS_FILE="$WORKTREE_NAME/lang/calamares_en.ts"
 	if test -n "$XMLLINT" ; then
-		$XMLLINT --format -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE"
+		$XMLLINT --format --encode utf-8 -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE"
 	fi
 	sed -i'' -e '/<location filename/d' $TS_FILE
 
diff --git a/ci/txpush.sh b/ci/txpush.sh
index 7d2c1ffaa..6f3c8db17 100755
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@@ -82,10 +82,8 @@ $LUPDATE -no-obsolete $_srcdirs -ts lang/calamares_en.ts
 # $LUPDATE -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts
 
 if test -n "$XMLLINT" ; then
-  for f in lang/calamares_en.ts
-  do
-    $XMLLINT --format -o "$f".new "$f" && mv "$f".new "$f"
-  done
+  TS_FILE="lang/calamares_en.ts"
+  $XMLLINT --format --encode utf-8 -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE"
 fi
 
 tx push --source --no-interactive -r calamares.calamares-master