X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=check-translations.sh;h=6a55b5ef732f3dff77418a4c06ead7660a8b2a6b;hb=7db1266f5b9d7bfcdda4fc4c8d5ba6ab121fd2df;hp=6b59b853aa9a743bac21b6874ac6a2056e5a8d1c;hpb=f287e05f7e7715842779b17e2f44151172a53dd2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/check-translations.sh b/check-translations.sh
index 6b59b853a..6a55b5ef7 100755
--- a/check-translations.sh
+++ b/check-translations.sh
@@ -32,7 +32,7 @@ if [ x"$mode" = x"pot" ]; then
 	make QCC="../../../../gmqcc/gmqcc" clean
 	make QCC="../../../../gmqcc/gmqcc"
 	{
-		grep -h '^\.' qcsrc/tmp/*_includes.txt | cut -d ' ' -f 2 | sed -e 's,^,qcsrc/,' | while IFS= read -r name; do
+		grep -h '^\.' .tmp/*_includes.txt | cut -d ' ' -f 2 | sed -e 's,^,qcsrc/,' | while IFS= read -r name; do
 			while :; do
 				case "$name" in
 					*/./*)
@@ -55,8 +55,15 @@ if [ x"$mode" = x"pot" ]; then
 				esac
 			done
 			echo "$name"
-		done | sort -u | tee lst
-	} | xgettext -LC -k_ -f- --from-code utf-8 -F -o common.pot >&2
+		done | sort -u
+	} | xgettext -LC -k_ -f- --from-code utf-8 -F -o common.pot.new >&2
+	if msgcmp -N --use-untranslated common.pot common.pot.new; then
+		echo "No contentful changes to common.pot - OK."
+		rm -f common.pot.new
+	else
+		echo "Updating common.pot. This probably should be committed."
+		mv -v common.pot.new common.pot
+	fi
 fi
 
 if [ x"$mode" = x"txt" ]; then
@@ -74,6 +81,7 @@ if [ x"$mode" = x"txt" ]; then
 					continue
 				fi
 			fi
+			# Note: we're only reporting EXISTING fuzzy matches in the Fuzzy count, thus -N.
 			po=`msgmerge -N "$X" common.pot`
 			ne=`printf "%s\n" "$po" | msgfmt -o /dev/null --check-format --check-header --use-fuzzy - 2>&1 | grep . | wc -l`
 			nu=`printf "%s\n" "$po" | msgattrib --untranslated - | grep -c ^#:`
@@ -93,11 +101,11 @@ if [ x"$mode" = x"txt" ]; then
 				if [ "$p" -lt 50 ]; then
 					continue
 				fi
-				item="$l $l \"$l\" 0%"
+				item="$l \"$l\" \"$l\" 0%"
 			fi
 			printf "%s\n" "$item" | sed -e "s/[0-9][0-9]*%/$p%/"
 		done
-	} | tr '"' '\t' | sort -k3 | tr '\t' '"'
+	} | LC_ALL=C sort -t '"' -k4,4
 fi
 
 if [ x"$mode" = x"po" ]; then
@@ -112,6 +120,7 @@ if [ x"$mode" = x"po" ]; then
 				continue
 			fi
 		fi
+		# Note: no -N here, this is the point where we allow fuzzy matching.
 		msgmerge -F -U "$X" common.pot >&2
 		msgfmt -o /dev/null --check-format --check-header --use-fuzzy "$X" 2>&1 \
 		                              | grep . > "$X".errors       || rm -f "$X".errors
@@ -263,6 +272,7 @@ EOF
 				continue
 			fi
 		fi
+		# Note: no -N here, this is the point where we allow fuzzy matching.
 		msgmerge -F -U "$X" common.pot >/dev/null 2>&1
 	done
 fi