Fixed bugs

This commit is contained in:
Robin Johnson
2002-08-12 01:09:37 +00:00
parent ac1eb3840a
commit 447e65f3fd

View File

@@ -17,14 +17,19 @@ function sortlang()
STRINGSTRING='^[[:space:]]*\$str[[:alnum:]_]*' STRINGSTRING='^[[:space:]]*\$str[[:alnum:]_]*'
WHITESPACE='^[[:blank:]]*$' WHITESPACE='^[[:blank:]]*$'
STRINGORDER="A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" STRINGORDER="A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
CVSID='/* .Id: .* . */'
echo -n "Extracting:" echo -n "Extracting:"
echo -n " head" echo -n " head"
egrep -i -v $TRANSLATIONSTRING $f | \ egrep -i -v $TRANSLATIONSTRING $f | \
egrep -v $STRINGSTRING | \ egrep -v "$STRINGSTRING|$CVSID" | \
sed 's/?>//g;s/<?php//g'| \ sed 's/?>//g;s/<?php//g'| \
uniq >>$targetdir/head uniq >>$targetdir/head
echo -n " cvs"
head -n10 $f | \
egrep "$CVSID" >>$targetdir/cvs
echo -n " strings" echo -n " strings"
egrep -i -v $TRANSLATIONSTRING $f | \ egrep -i -v $TRANSLATIONSTRING $f | \
egrep $STRINGSTRING | \ egrep $STRINGSTRING | \
@@ -39,7 +44,8 @@ function sortlang()
for i in $STRINGORDER; for i in $STRINGORDER;
do do
echo echo
egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-tosort | sort egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-tosort | \
sort -k 1,1
done | \ done | \
uniq >>$targetdir/sort uniq >>$targetdir/sort
@@ -49,14 +55,16 @@ function sortlang()
for i in $STRINGORDER; for i in $STRINGORDER;
do do
echo echo
egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-translate | sort egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-translate | \
sort -k 1,1
done | \ done | \
uniq >>$targetdir/translate uniq >>$targetdir/translate
echo -e "\nAssembling final" echo -e "\nAssembling final"
f=$f$2 f=$f$2
echo "<?php" >$f echo "<?php" >$f
cat $targetdir/head $targetdir/sort $targetdir/translate >>$f cat $targetdir/cvs $targetdir/head $targetdir/sort $targetdir/translate | \
uniq >>$f
echo "?>" >>$f echo "?>" >>$f
rm -rf $targetdir rm -rf $targetdir
@@ -66,6 +74,6 @@ echo "-------------------------------------------------------------------"
for i in $1; for i in $1;
do do
echo "Sorting $i" echo "Sorting $i"
sortlang $i sortlang $i $2
echo "-------------------------------------------------------------------" echo "-------------------------------------------------------------------"
done; done;