refuse to run po2po if the source was not configured;
reinstate --use-first in msgcat call to avoid spurious conflicts in header, since I do not see what was the problem that caused me to remove it
This commit is contained in:
parent
327b102e64
commit
213b602d60
1 changed files with 7 additions and 1 deletions
|
@ -14,6 +14,12 @@ DSTDOMAIN=$2
|
|||
shift
|
||||
shift
|
||||
|
||||
if ! [ -r po/$DSTDOMAIN/Makefile ]
|
||||
then
|
||||
echo "Source not configured in po/$DSTDOMAIN"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $# = 0 ]
|
||||
then
|
||||
set -- `cat po/$SRCDOMAIN/LINGUAS`
|
||||
|
@ -23,7 +29,7 @@ tmp=`tempfile`
|
|||
for LANG in "$@"
|
||||
do
|
||||
# merge the 2 files
|
||||
msgcat -F po/$DSTDOMAIN/$LANG.po po/$SRCDOMAIN/$LANG.po >$tmp
|
||||
msgcat --use-first -F po/$DSTDOMAIN/$LANG.po po/$SRCDOMAIN/$LANG.po >$tmp
|
||||
mv po/$DSTDOMAIN/$LANG.po po/$DSTDOMAIN/$LANG.po.bak
|
||||
mv $tmp po/$DSTDOMAIN/$LANG.po
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue