X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tx.sh;h=47c388f6813968d161c84134042e271c7b5c6ad7;hb=6ba6b6eb811c3fe293cfdd883e00344caf68f7a9;hp=212a036fcb08d459ba4db7eb5d1b251065d8e665;hpb=6545f51bb6cadeb9f10e1dadf48492ed39108e1b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/tx.sh b/tx.sh
index 212a036fc..47c388f68 100644
--- a/tx.sh
+++ b/tx.sh
@@ -7,6 +7,9 @@ mergebase=`git log --pretty=oneline -1 .tx/merge-base | cut -d ' ' -f 1`
 
 set -e
 
+# Update the .pot.
+sh check-translations.sh pot
+
 # First upload our current .pot.
 mkdir -p translations/xonotic.commonpot/
 cp common.pot translations/xonotic.commonpot/en..po
@@ -23,30 +26,27 @@ for f in common.*.po; do
 	gnewfile=common.$lang.po
 	if [ -f "$tcurfile" ]; then
 		git show "$mergebase":"$gnewfile" > "$goldfile"
-		msgcat -s --no-location --strict "$tcurfile" | grep -v "^#" > "$tcurfile.sorted"
-		msgcat -s --no-location --strict "$goldfile" | grep -v "^#" > "$goldfile.sorted"
-		msgcat -s --no-location --strict "$gnewfile" | grep -v "^#" > "$gnewfile.sorted"
-		if diff -u "$goldfile.sorted" "$gnewfile.sorted" >/dev/null; then
+		msgmerge -F -U "$tcurfile" common.pot
+		msgmerge -F -U "$goldfile" common.pot
+		msgmerge -F -U "$gnewfile" common.pot
+		if diff -u "$goldfile" "$gnewfile" >/dev/null; then
 			# no change on git, changed on tx only
 			msgmerge -F -U "$tcurfile" common.pot
 			cp "$tcurfile" "$gnewfile"
 		else
-			if ! diff -u "$goldfile.sorted" "$gnewfile.sorted" | patch "$tcurfile.sorted"; then
+			if ! diff -u "$goldfile" "$gnewfile" | patch "$tcurfile"; then
 				while :; do
-					vim -o "$tcurfile.sorted.rej" "$tcurfile.sorted"
+					vim -o "$tcurfile.rej" "$tcurfile"
 					echo "OK?"
 					read -r OK || exit 1
 					[ x"$OK" != x"y" ] || break
 				done
-				rm -f "$tcurfile.sorted.rej"
+				rm -f "$tcurfile.rej"
 			fi
-			mv "$tcurfile.sorted" "$tcurfile"
 			msgmerge -F -U "$tcurfile" common.pot
 			cp "$tcurfile" "$gnewfile"
-			rm "$goldfile.sorted"
-			rm "$gnewfile.sorted"
-			rm "$goldfile"
 		fi
+		rm "$goldfile"
 	else
 		msgmerge -F -U "$gnewfile" common.pot
 		cp "$gnewfile" "$tcurfile"
@@ -64,5 +64,13 @@ for f in translations/xonotic.commonpot/*..po; do
 		cp "$tcurfile" "$gnewfile"
 	fi
 done
-tx push -t
+tx push -t --skip
 date > .tx/merge-base
+
+# Build new languages list.
+sh check-translations.sh txt > languages.txt.new
+mv languages.txt.new languages.txt
+
+# Report stats.
+git diff --stat
+git diff --color-words languages.txt