From 91a79f7f8a507dd0838fe9319346ada239ccad92 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 3 Feb 2018 00:00:10 +0100
Subject: [PATCH] Add a batch mode for transifex sync (don't call out to vim
 but just ignore anything that can't be merged).

---
 common.ast.po |  2 +-
 tx.sh         | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common.ast.po b/common.ast.po
index b7d36a76d..3ae974f44 100644
--- a/common.ast.po
+++ b/common.ast.po
@@ -2886,7 +2886,7 @@ msgstr "^BG%s%s^K1 comió'l cohete de ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:463
 #, c-format
-msgid "^BG%s%s^K1 got too close ^BG%s^K1's rocket%s%s"
+msgid "^BG%s%s^K1 got too close to ^BG%s^K1's rocket%s%s"
 msgstr ""
 
 #: qcsrc/common/notifications/all.inc:464
diff --git a/tx.sh b/tx.sh
index c2e9f3a5f..271f1cc75 100644
--- a/tx.sh
+++ b/tx.sh
@@ -63,13 +63,15 @@ if $sync_po; then
 				cp "$tcurfile" "$gnewfile"
 			else
 				if ! diff -u "$goldfile" "$gnewfile" | patch "$tcurfile"; then
-					while :; do
-						vim -o "$tcurfile.rej" "$tcurfile"
-						echo "OK?"
-						read -r OK || exit 1
-						[ x"$OK" != x"y" ] || break
-					done
-					rm -f "$tcurfile.rej"
+					if [ -z "$BATCH" ]; then
+						while :; do
+							vim -o "$tcurfile.rej" "$tcurfile"
+							echo "OK?"
+							read -r OK || exit 1
+							[ x"$OK" != x"y" ] || break
+						done
+						rm -f "$tcurfile.rej"
+					fi
 				fi
 				msgmerge -N -F -U "$tcurfile" common.pot
 				cp "$tcurfile" "$gnewfile"
-- 
2.39.2