tor-webwml.git

@@ -6,8 +6,9 @@

 # This is Free Software (GPLv3)

 # http://www.gnu.org/licenses/gpl-3.0.txt

 #

-# This script will convert all of the english wml files to pot files and

-# keep them updated.

+# This script will convert all of the english wml files to po files, and

+# keep them updated. The script will also convert subdirectories that

+# exist in the english website module.

 #

 # For more information, see the HOWTO and README in

 # translation/tools/gsoc09.

@@ -18,11 +19,11 @@

 # Location of the wml files

 wmldir="$PWD"

-# Location of the pot files.

+# Location of the po files.

 # Assuming that the translation directory is relative to the website

-podir="`dirname $wmldir`/translation/projects/website/templates"

+podir="`dirname $wmldir`/translation/projects/website"

-# Set the copyright holder of the pot files,

+# Set the copyright holder of the po files,

 # for example "The Tor Project, Inc"

 copyright="The Tor Project, Inc"

@@ -75,14 +76,20 @@ fi

 # Create the temp log

 touch $tmplog

-# cd to the right directory so we can commit the files later

-cd "$podir"

+# We need to find out which language directories we have.

+# We also need to excluse the website module directory itself, as well

+# as .svn

+langdir=`find "$podir" -maxdepth 1 -type d ! -path "$podir" ! -path "$podir/templates" ! -path "*\.*" | sed "s#$podir/##"`

 # We only need the english wml files, but we do not wish to translate

 # the eff documents.

 wml=`find $wmldir -regex '^'$wmldir'/.*en/.*\.wml' -type f | grep -v '^'$wmldir'/eff'`

-# For every wml, update po

+# For every language directory, create and/or update the po files.

+for lang in $langdir ; do

+

+	# For every english wml, see if the po needs to be created or

+	# updated

 	for file in $wml ; do

 		# Get the basename of the file we are dealing with

@@ -99,8 +106,8 @@ for file in $wml ; do

 			continue

 		fi

-	# Strip the file for its original extension and add .pot

-	pofile="$priority.${wmlfile%%.*}.pot"

+		# Strip the file for its original extension and add .po

+		pofile="$priority.${wmlfile%%.*}.po"

 		# Find out what directory the file is in.

 		# Also, remove the parth of the path that is $wmldir

@@ -109,33 +116,35 @@ for file in $wml ; do

 		# We need to know what one dir up is

 		onedirup=`dirname $indir | sed "s#$wmldir/##"`

-	# We need to have the correct, full path to the pot

+		# We need to have the correct, full path to the po

 		# directory for the file we are working on.

 		# Also, did the subdirectory exist prior to running this

 		# script? If not, create it now and add it to the

 		# repository.

 		if [ $onedirup = $wmldir ]

 		then

-		popath="$podir"

+			popath="$podir/$lang"

 		else

+

 			# We need to know if a subdirectory, such as torbutton,

 			# exist in the translation module. If it does not exist,

 			# the script will create it in all the directories under

 			# translation/projects/website (excluding .svn)

-		langdir=`find $(dirname "$podir") -maxdepth 1 -type d ! -path $(dirname "$podir") ! -path "*\.*"`

+			subdir=`find "$podir/$lang" -maxdepth 1 -type d	! -path "$ppodir/$lang" ! -path "*\.*"`

-		for dir in $langdir ; do

-			if [ ! -d "$dir/$onedirup" ]

+			for dir in $subdir ; do

+				if [ ! -d "$podir/$lang/$onedirup" ]

 				then

-				svn mkdir "$dir/$onedirup"

+					svn mkdir "$podir/$lang/$onedirup"

 				fi

 			done

 			# Set the path

-		popath="$podir/$onedirup"

+			popath="$podir/$lang/$onedirup"

+

 		fi

-	# Check to see if the pot file existed prior to running this

+		# Check to see if the po existed prior to running this

 		# script. If it didn't, check if there any files with the same

 		# filename, but different priority. If neither of the files

 		# exist, create with po4a-gettextize.

@@ -155,7 +165,7 @@ for file in $wml ; do

 			poexist=0

 		fi

-	# If the pot file does not exist, convert it with

+		# If the po file does not exist, convert it with

 		# po4a-gettextize, set the right encoding and charset

 		# and the correct copyright.

 		if [ $poexist = 0 ]

@@ -188,16 +198,23 @@ for file in $wml ; do

 					echo "$popath/$pofile" > $tmplog

 				fi

 			fi

+

+			# Update the file with po4a-updatepo to make the

+			# word wrapping perfect

+			po4a-updatepo -f wml -m "$file" -p "$popath/$pofile" --master-charset utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

+

+			# Delete the backup

+			rm -f "$popath/$pofile~"

 		fi

-	# If the pot file does exist, calculate the hash first,

+		# If the po file does exist, calculate the hash first,

 		# then update the file, then calculate the hash again.

 		if [ $poexist = 1 ]

 		then

 			# Calculate the hash before we update the file

 			before=`grep -vE '^("POT-Creation-Date:|#)' "$popath/$pofile" | md5sum | cut -d " " -f1`

-		# Update the pot file

+			# Update the po file

 			po4a-updatepo -f wml -m "$file" -p "$popath/$pofile" --master-charset utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

 			# Calculate the new hash

@@ -240,7 +257,4 @@ for file in $wml ; do

 		# Delete the temp log

 		rm -f $tmplog

 	done

-

-	# If you want the script to commit the files automatically,

-	# uncomment the following line.

-	# svn ci -m 'automatically generated and updated the pot files'

+done