[or-cvs] r20197: {translation} drop po4a-gettextize and fix a regex (translation/trunk/tools/gsoc09)

[runa@xxxxxxxx]

Author: runa
Date: 2009-07-29 15:08:18 -0400 (Wed, 29 Jul 2009)
New Revision: 20197

Modified:
   translation/trunk/tools/gsoc09/wml2po.sh
Log:
drop po4a-gettextize and fix a regex

Modified: translation/trunk/tools/gsoc09/wml2po.sh
===================================================================
--- translation/trunk/tools/gsoc09/wml2po.sh	2009-07-29 18:16:49 UTC (rev 20196)
+++ translation/trunk/tools/gsoc09/wml2po.sh	2009-07-29 19:08:18 UTC (rev 20197)
@@ -10,11 +10,13 @@
 ### start config ###
 
 # Location of the wml files, 
-# for example "/home/runa/tor/website"
+# for example "/home/runa/tor/website".
+# Note: do not put a slash at the end
 wmldir=""
 
 # Location of the po files,
-# for example "/home/runa/tor/translation/projects/website"
+# for example "/home/runa/tor/translation/projects/website".
+# Note: do not put a slash at the end
 podir=""
 
 # We need to know which languages directories we are dealing with.
@@ -141,7 +143,7 @@
 		if [ $poexist = 0 ]
 		then
 			# Convert it
-			po4a-gettextize -f wml -m "$file" -p "$popath/$pofile" --master-charset utf-8 -o customtag="$customtag" -o nodefault="$nodefault" --copyright-holder "$copyright"
+			po4a-updatepo -f wml -m "$file" -p "$popath/$pofile" --master-charset utf-8 -o customtag="$customtag" -o nodefault="$nodefault"
 
 			# Check to see if the file exists
 			if [ -e "$popath/$pofile" ]
@@ -158,8 +160,8 @@
 					rm -f "$popath/$pofile"
 				else
 					# Set the right encoding and charset
-					sed -i '1,/CHARSET/ s/CHARSET/UTF-8/' "$popath/$pofile"
-					sed -i '1,/ENCODING/ s/ENCODING/8bit/' "$popath/$pofile"
+					sed -i '0,/ENCODING/ s/ENCODING/8bit/' "$popath/$pofile"
+					sed -i "0,/Free Software Foundation, Inc/ s/Free Software Foundation, Inc/$copyright/" "$popath/$pofile"
 
 					# And add it to the repository
 					svn add "$popath/$pofile"