From 447e65f3fda85d90fc43aa81efb417cda3a623f3 Mon Sep 17 00:00:00 2001
From: Robin Johnson <robbat2@users.sourceforge.net>
Date: Mon, 12 Aug 2002 01:09:37 +0000
Subject: [PATCH] Fixed bugs

---
 lang/sort_lang.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lang/sort_lang.sh b/lang/sort_lang.sh
index 98858a54e..27c8d549c 100755
--- a/lang/sort_lang.sh
+++ b/lang/sort_lang.sh
@@ -17,14 +17,19 @@ function sortlang()
     STRINGSTRING='^[[:space:]]*\$str[[:alnum:]_]*'
     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"
+    CVSID='/* .Id: .* . */'
 
     echo -n "Extracting:"
     echo -n " head"
     egrep -i -v $TRANSLATIONSTRING $f | \
-    egrep -v $STRINGSTRING | \
+    egrep -v "$STRINGSTRING|$CVSID" | \
     sed 's/?>//g;s/<?php//g'| \
     uniq >>$targetdir/head
 
+    echo -n " cvs"
+    head -n10 $f | \
+    egrep "$CVSID" >>$targetdir/cvs
+
     echo -n " strings"
     egrep -i -v $TRANSLATIONSTRING $f | \
     egrep $STRINGSTRING | \
@@ -39,7 +44,8 @@ function sortlang()
     for i in $STRINGORDER;
     do
         echo
-        egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-tosort | sort 
+        egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-tosort | \
+        sort -k 1,1
     done | \
     uniq >>$targetdir/sort
 
@@ -49,14 +55,16 @@ function sortlang()
     for i in $STRINGORDER;
     do
         echo
-        egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-translate | sort
+        egrep '^\$str'$i'[[:alpha:]]*' $targetdir/tmp-translate | \
+        sort -k 1,1
     done | \
     uniq >>$targetdir/translate
 
     echo -e "\nAssembling final"
     f=$f$2
     echo "<?php" >$f
-    cat $targetdir/head $targetdir/sort $targetdir/translate >>$f
+    cat $targetdir/cvs $targetdir/head $targetdir/sort $targetdir/translate | \
+    uniq >>$f
     echo "?>" >>$f
 
     rm -rf $targetdir
@@ -66,6 +74,6 @@ echo "-------------------------------------------------------------------"
 for i in $1; 
 do
     echo "Sorting $i"
-    sortlang $i
+    sortlang $i $2
     echo "-------------------------------------------------------------------"
 done;