X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=rosetta-merge;h=b34676cfc1dae68882259d28d295bcfd26f56285;hp=9119bc9a6547d9174afcdaa266c3d02162823d3a;hb=5937962b50ebb4d190204d24e5335267c419ca22;hpb=b30d72d311d269ce75c942c990af37e63e11fba7

diff --git a/rosetta-merge b/rosetta-merge
index 9119bc9..b34676c 100755
--- a/rosetta-merge
+++ b/rosetta-merge
@@ -1,3 +1,50 @@
 #! /bin/bash
-[ -e ../../../rosetta-$1/$2.po ] || exit
-msgmerge -q <(msgconv -t UTF-8 ../../../rosetta-$1/$2.po | msgattrib --no-obsolete -) <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgmerge -q - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -
+
+APPLY=false
+if [ "$1" = --apply ]; then
+	APPLY=:
+	shift
+fi
+
+KEEP_OLD=false
+if [ "$1" = --keep-old ]; then
+	KEEP_OLD=:
+	shift
+fi
+
+PREFIX=
+if [ "$1" = --prefix ]; then
+	PREFIX="$2-"
+	shift 2
+fi
+
+SOURCE="$1"
+shift
+
+MY_LANG="$1"
+case $MY_LANG in
+	pa_IN)
+		ROSETTA_LANG=pa
+		;;
+	*)
+		ROSETTA_LANG="$MY_LANG"
+		;;
+esac
+
+[ -e $SOURCE/$PREFIX$ROSETTA_LANG.po ] || exit
+msgmerge -q -N <(msgconv -t UTF-8 $SOURCE/$PREFIX$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | \
+	if [ -e $MY_LANG.po ]; then
+		if $KEEP_OLD; then
+			msgmerge -q -N <(msgconv -t UTF-8 $MY_LANG.po | msgattrib --no-obsolete -) *.pot -C -
+		else
+			msgmerge -q -N - <(msgconv -t UTF-8 $MY_LANG.po | msgattrib --no-obsolete -)
+		fi | \
+		msgattrib --no-obsolete -
+	else
+		cat
+	fi | \
+	if $APPLY; then
+		sponge $MY_LANG.po
+	else
+		diff -u --label $MY_LANG.po <(msgconv -t UTF-8 $MY_LANG.po) -
+	fi