Browse code

problem in po2wml finally fixed

Runa A. Sandvik authored on21/07/2011 10:15:36
Showing1 changed files
... ...
@@ -373,14 +373,6 @@ for file in $po ; do
373 373
 	# subdirectory.
374 374
 	if [ $onedirup == $lang ]
375 375
 	then
376
-		# If the current subdirectory is of the form "xx_XX",
377
-		# rename to "xx-xx" instead (except for pl_PL)
378
-		if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]
379
-		then
380
-			subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]'	'[a-z]'`"
381
-			nosubdir
382
-		fi
383
-
384 376
 		# If the current directory is "pl_PL" use "pl" instead
385 377
 		if [ $subdir = "pl_PL" ]
386 378
 		then
... ...
@@ -402,20 +394,20 @@ for file in $po ; do
402 394
 			nosubdir
403 395
 		fi
404 396
 
397
+                # If the current subdirectory is of the form "xx_XX",
398
+                # rename to "xx-xx" instead (except for pl_PL)
399
+                if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]
400
+                then
401
+                        subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
402
+                        nosubdir
403
+                fi  
404
+
405 405
 		# Convert everything else
406 406
 		if [[ $subdir != "en" && $subdir != "pl_PL" && ! ($subdir =~ "_") && $subdir != "nb" && $subdir != "sv" ]]
407 407
 		then
408 408
 			nosubdir
409 409
 		fi
410 410
 	else
411
-		# If the current languge is of the form "xx_XX", rename
412
-		# to "xx-xx" instead (except for pl_PL)
413
-		if [[ $lang =~ "_" && $lang != "pl_PL" ]]
414
-		then
415
-			lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
416
-			subdir
417
-		fi
418
-
419 411
 		# If the current language is "pl_PL" use "pl" instead
420 412
 		if [ $lang = "pl_PL" ]
421 413
 		then
... ...
@@ -436,7 +428,15 @@ for file in $po ; do
436 428
 			lang="se"
437 429
 			subdir
438 430
 		fi
439
-	
431
+
432
+                # If the current languge is of the form "xx_XX", rename
433
+                # to "xx-xx" instead (except for pl_PL)
434
+                if [[ $lang =~ "_" && $lang != "pl_PL" ]]
435
+                then
436
+                        lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"
437
+                        subdir
438
+                fi
439
+
440 440
 		# Convert everything else
441 441
 		if [[ $lang != "en" && $lang != "pl_PL" && ! ($lang =~ "_") && $lang != "nb" && $lang != "sv" ]]
442 442
 		then