[tor-commits] r24921: {website} problem in po2wml finally fixed (website/trunk)

[Runa Sandvik]

Author: runa
Date: 2011-07-21 08:15:36 +0000 (Thu, 21 Jul 2011)
New Revision: 24921

Modified:
   website/trunk/po2wml.sh
Log:
problem in po2wml finally fixed

Modified: website/trunk/po2wml.sh
===================================================================
--- website/trunk/po2wml.sh	2011-07-21 07:39:29 UTC (rev 24920)
+++ website/trunk/po2wml.sh	2011-07-21 08:15:36 UTC (rev 24921)
@@ -373,14 +373,6 @@
 	# subdirectory.
 	if [ $onedirup == $lang ]
 	then
-		# If the current subdirectory is of the form "xx_XX",
-		# rename to "xx-xx" instead (except for pl_PL)
-		if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]
-		then
-			subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]'	'[a-z]'`"
-			nosubdir
-		fi
-
 		# If the current directory is "pl_PL" use "pl" instead
 		if [ $subdir = "pl_PL" ]
 		then
@@ -402,20 +394,20 @@
 			nosubdir
 		fi
 
+                # If the current subdirectory is of the form "xx_XX",
+                # rename to "xx-xx" instead (except for pl_PL)
+                if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]
+                then
+                        subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
+                        nosubdir
+                fi  
+
 		# Convert everything else
 		if [[ $subdir != "en" && $subdir != "pl_PL" && ! ($subdir =~ "_") && $subdir != "nb" && $subdir != "sv" ]]
 		then
 			nosubdir
 		fi
 	else
-		# If the current languge is of the form "xx_XX", rename
-		# to "xx-xx" instead (except for pl_PL)
-		if [[ $lang =~ "_" && $lang != "pl_PL" ]]
-		then
-			lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
-			subdir
-		fi
-
 		# If the current language is "pl_PL" use "pl" instead
 		if [ $lang = "pl_PL" ]
 		then
@@ -436,7 +428,15 @@
 			lang="se"
 			subdir
 		fi
-	
+
+                # If the current languge is of the form "xx_XX", rename
+                # to "xx-xx" instead (except for pl_PL)
+                if [[ $lang =~ "_" && $lang != "pl_PL" ]]
+                then
+                        lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
+                        subdir
+                fi
+
 		# Convert everything else
 		if [[ $lang != "en" && $lang != "pl_PL" && ! ($lang =~ "_") && $lang != "nb" && $lang != "sv" ]]
 		then