tor-webwml.git

@@ -124,90 +124,9 @@ for file in $po ; do

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

-			# If the directory does not include sidenav.wmi,

-			# copy it from the English directory (only if

-			# the English directory has this file)

-			if [[ ! -e "$wmldir/$subdir/sidenav.wmi" && -e "$wmldir/en/sidenav.wmi" ]]

-			then

-				cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir"

-			fi

-

-		fi

-	}	

-

-	# Convert translations to directories such as website/torbrowser/nb/.

-	# Again, po4a will write the file and then delete it if less than 80% has been translated

-	function subdir {

-		# The location of the english wml file

-                english="$wmldir/$subdir/en/$wmlfile"

-

-		# Convert the files

-		po4a-translate -f wml -m "$english" -p "$file" -l "$wmldir/$subdir/$lang/$wmlfile" --master-charset utf-8 -L utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

-

-		# Check to see if the file was written

-		if [ -e "$wmldir/$subdir/$lang/$wmlfile" ]

-		then

-			# Remove last three lines in file

-			sed -i -e :a -e '$d;N;2,3ba' -e 'P;D' "$wmldir/$subdir/$lang/$wmlfile"

-

-			# Remove a specific comment from a specific file

-			if [ $wmlfile == "download-easy.wml" ]			

-			then

-				translator_comment="# Translators: please point to the version of TBB in your language, if there is one."

-				sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile"

-			fi

-

-			# Include the English footer for most of the

-			# translations 

-			if [[ $lang != "ar" && $lang != "pl" ]]

-			then

-				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

-			fi

-

-			# If the directory does not include sidenav.wmi,

-			# copy it from the English directory (only if 

-			# the English directory has this file)

-			if [[ ! -e "$wmldir/$subdir/$lang/sidenav.wmi" && -e "$wmldir/$subdir/en/sidenav.wmi" ]]

-			then

-				cp "$wmldir/$subdir/en/sidenav.wmi" "$wmldir/$subdir/$lang/"

-			fi

-		fi

-	}

-

-	# If $onedirup is equal to $lang, that means we do not have a

-	# subdirectory.

-	if [ $onedirup == $lang ]

-	then

-		# If the current subdirectory is "zh_CN" use "zh-cn" instead

-		if [ $subdir = "zh_CN" ]

-		then

-			subdir="zh-cn"

-			nosubdir

-		fi

-		

-		# If the current directory is "nb" use "no" instead

-		if [ $subdir = "nb" ]

-		then

-			subdir="no"

-			nosubdir

-		fi

-

-		# If the current directory is "sv" use "se" instead

-		if [ $subdir = "sv" ]

-		then

-			subdir="se"

-			nosubdir

-		fi

-

-		# If the current directory is "pl_PL" use "pl" instead

-		if [ $subdir = "pl_PL" ]

-		then

-			subdir="pl"

-			nosubdir

-

-			# If the file was written, include the right

-			# header, menu files and footer

-			if [ -e "$wmldir/$subdir/$wmlfile" ]

+			# If the translation is Polish, include the

+			# correct header, menu files and footer

+			if [ $subdir = "pl" ]

 			then

 				# Head

 				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"`

@@ -233,17 +152,10 @@ for file in $po ; do

 				# Footer

 				echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

-		fi

-		# If the file is an Arabic translation, include

-		# the right header, css, menu files and footer

+			# If the translation is Arabic, include the

+			# correct header, css, menu files and footer

 			if [ $subdir = "ar" ]

-		then

-			# Convert the file first

-			nosubdir

-

-			# If it was written, do the following

-			if [ -e "$wmldir/$subdir/$wmlfile" ]

 			then

 				# Head

 				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"`

@@ -270,46 +182,50 @@ for file in $po ; do

 				# Footer

 				echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

-		fi

-		# Convert everything else

-		if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "ar" ]]

+			# If the directory does not include sidenav.wmi,

+			# copy it from the English directory (only if

+			# the English directory has this file)

+			if [[ ! -e "$wmldir/$subdir/sidenav.wmi" && -e "$wmldir/en/sidenav.wmi" ]]

 			then

-			nosubdir

+				cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir"

 			fi

-	else

-		# If the current language is "zh_CN" use "zh-cn" instead

-		if [ $lang = "zh_CN" ]

-		then

-			lang="zh-cn"

-			subdir

 		fi

+	}	

-		# If the current language is "nb" use "no" instead

-		if [ $lang = "nb" ]

+	# Convert translations to directories such as website/torbrowser/nb/.

+	# Again, po4a will write the file and then delete it if less than 80% has been translated

+	function subdir {

+		# The location of the english wml file

+                english="$wmldir/$subdir/en/$wmlfile"

+

+		# Convert the files

+		po4a-translate -f wml -m "$english" -p "$file" -l "$wmldir/$subdir/$lang/$wmlfile" --master-charset utf-8 -L utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

+

+		# Check to see if the file was written

+		if [ -e "$wmldir/$subdir/$lang/$wmlfile" ]

 		then

-			lang="no"

-			subdir

-		fi

+			# Remove last three lines in file

+			sed -i -e :a -e '$d;N;2,3ba' -e 'P;D' "$wmldir/$subdir/$lang/$wmlfile"

-		# If the current language is "sv" use "se" instead

-		if [ $lang = "sv" ]

+			# Remove a specific comment from a specific file

+			if [ $wmlfile == "download-easy.wml" ]			

 			then

-			lang="se"

-			subdir

+				translator_comment="# Translators: please point to the version of TBB in your language, if there is one."

+				sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile"

 			fi

-		# If the current language is "pl_PL" use "pl" instead

-		if [ $lang = "pl_PL" ]

+			# Include the English footer for most of the

+			# translations 

+			if [[ $lang != "ar" && $lang != "pl" ]]

 			then

-			lang="pl"

-			subdir

+				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

+			fi

-			# If the file was written, include the right

-			# header, menu files and footer

-			if [ -e "$wmldir/$subdir/$lang/$wmlfile" ]

+                        # If the translation is Polish, include the

+                        # correct header, menu files and footer

+			if [ $lang = "pl" ]

 			then

-				# Head

 				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"`

 				new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@`

 				sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile"

@@ -334,17 +250,9 @@ for file in $po ; do

 				echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

-		fi

-

 			# If the file is an Arabic translation, include the

-		# right header, css, menu files and footer

+			# correct header, css, menu files and footer

 			if [ $lang = "ar" ]

-		then

-			# Convert the file first

-			subdir

-

-			# If it was written, do the following

-			if [ -e "$wmldir/$subdir/$lang/$wmlfile" ]

 			then

 				# Head

 				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"`

@@ -371,10 +279,85 @@ for file in $po ; do

 				# Footer

 				echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+

+			# If the directory does not include sidenav.wmi,

+			# copy it from the English directory (only if 

+			# the English directory has this file)

+			if [[ ! -e "$wmldir/$subdir/$lang/sidenav.wmi" && -e "$wmldir/$subdir/en/sidenav.wmi" ]]

+			then

+				cp "$wmldir/$subdir/en/sidenav.wmi" "$wmldir/$subdir/$lang/"

+			fi

+		fi

+	}

+

+	# If $onedirup is equal to $lang, that means we do not have a

+	# subdirectory.

+	if [ $onedirup == $lang ]

+	then

+		# If the current subdirectory is "zh_CN" use "zh-cn" instead

+		if [ $subdir = "zh_CN" ]

+		then

+			subdir="zh-cn"

+			nosubdir

+		fi

+		

+		# If the current directory is "nb" use "no" instead

+		if [ $subdir = "nb" ]

+		then

+			subdir="no"

+			nosubdir

+		fi

+

+		# If the current directory is "sv" use "se" instead

+		if [ $subdir = "sv" ]

+		then

+			subdir="se"

+			nosubdir

+		fi

+

+		# If the current directory is "pl_PL" use "pl" instead

+		if [ $subdir = "pl_PL" ]

+		then

+			subdir="pl"

+			nosubdir

+		fi

+

+		# Convert everything else

+		if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "pl_PL" ]]

+		then

+			nosubdir

+		fi

+	else

+		# If the current language is "zh_CN" use "zh-cn" instead

+		if [ $lang = "zh_CN" ]

+		then

+			lang="zh-cn"

+			subdir

+		fi

+

+		# If the current language is "nb" use "no" instead

+		if [ $lang = "nb" ]

+		then

+			lang="no"

+			subdir

+		fi

+

+		# If the current language is "sv" use "se" instead

+		if [ $lang = "sv" ]

+		then

+			lang="se"

+			subdir

+		fi

+	

+		# If the current language is "pl_PL" use "pl" instead

+		if [ $lang = "pl_PL" ]

+		then

+			lang="pl"

+			subdir

 		fi

 		# Convert everything else

-		if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "ar" ]]

+		if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "pl_PL" ]]

 		then

 			subdir

 		fi