From: Colin Watson <cjwatson@chiark.greenend.org.uk>
Date: Tue, 3 Apr 2007 16:25:50 +0000 (+0000)
Subject: add --apply option; pa_IN handling; misc merging improvements
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=commitdiff_plain;h=1ddf5a972595fcf9b788bb5ef479b36554958ee3

add --apply option; pa_IN handling; misc merging improvements
---

diff --git a/rosetta-merge b/rosetta-merge
index 9119bc9..58bb1fa 100755
--- a/rosetta-merge
+++ b/rosetta-merge
@@ -1,3 +1,19 @@
 #! /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
+
+case $2 in
+	pa_IN)
+		ROSETTA_LANG=pa
+		;;
+	*)
+		ROSETTA_LANG="$2"
+		;;
+esac
+
+[ -e $1/$ROSETTA_LANG.po ] || exit
+msgmerge -q -N <(msgconv -t UTF-8 $1/$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | msgmerge -q -N - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgattrib --no-obsolete - | if $APPLY; then sponge $2.po; else diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -; fi
diff --git a/rosetta-merge-all b/rosetta-merge-all
index 0dadc1e..98627a2 100755
--- a/rosetta-merge-all
+++ b/rosetta-merge-all
@@ -1,2 +1,7 @@
 #! /bin/sh
-for x in *.po; do rosetta-merge $1 ${x%.*} | view -; done
+if [ "$1" = --apply ]; then
+	shift
+	for x in *.po; do rosetta-merge --apply $1 ${x%.*}; done
+else
+	for x in *.po; do rosetta-merge $1 ${x%.*} | view -; done
+fi