X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b45688e34e25a596dc19f6a2b94f3f342041da1e..d98296d1db02febfa7cc4fbe7f304ca2a9858fef:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 43804a8f2..0af47aad5 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,7 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
-my @slavelanguages; # orderer as in config po_slave_languages
+my @slavelanguages; # languages codes ordered as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
@@ -106,10 +106,10 @@ sub getsetup () {
 		po_slave_languages => {
 			type => "string",
 			example => [
-				'fr' => 'Français',
-				'es' => 'Español',
-				'de' => 'Deutsch'
-			],
+				'fr|Français',
+				'es|Español',
+				'de|Deutsch'
+                            ],
 			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
@@ -141,12 +141,15 @@ sub checkconfig () {
 
 	if (ref $config{po_slave_languages} eq 'ARRAY') {
 		my %slaves;
-		if (@{$config{po_slave_languages}} % 2 != 0) {
-			error(sprintf(gettext("The %s field is invalid."), 'po_slave_languages'));
-                }
-		for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
-			$slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
-			push @slavelanguages, $config{po_slave_languages}->[$i];
+		foreach my $pair (@{$config{po_slave_languages}}) {
+			my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ );
+			if (!defined $code || !defined $name) {
+				error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
+				              $pair));
+                        }
+			$slaves{$code} = $name;
+			push @slavelanguages, $code;
+
                 }
 		$config{po_slave_languages} = \%slaves;
         }
@@ -161,7 +164,7 @@ sub checkconfig () {
 	map {
 		islanguagecode($_)
 			or error(sprintf(gettext("%s is not a valid language code"), $_));
-	} ($config{po_master_language}{code}, keys %{$config{po_slave_languages}});
+	} ($config{po_master_language}{code}, @slavelanguages);
 
 	if (! exists $config{po_translatable_pages} ||
 	    ! defined $config{po_translatable_pages}) {
@@ -190,7 +193,7 @@ sub checkconfig () {
 		next if $underlay=~/^locale\//;
 
 		# Underlays containing the po files for slave languages.
-		foreach my $ll (keys %{$config{po_slave_languages}}) {
+		foreach my $ll (@slavelanguages) {
 			add_underlay("po/$ll/$underlay")
 				if -d "$config{underlaydirbase}/po/$ll/$underlay";
 		}
@@ -612,7 +615,7 @@ sub mybeautify_urlpath ($) {
 		$res =~ s!/\Qindex.$config{htmlext}\E$!/!;
 		map {
 			$res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;
-		} (keys %{$config{po_slave_languages}});
+		} @slavelanguages;
 	}
 	return $res;
 }
@@ -887,7 +890,7 @@ sub pofile ($$) {
 sub pofiles ($) {
 	my $masterfile=shift;
 
-	return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
+	return map pofile($masterfile, $_), @slavelanguages;
 }
 
 sub refreshpot ($) {
@@ -1045,7 +1048,7 @@ sub ishomepage ($) {
 	my $page = shift;
 
 	return 1 if $page eq 'index';
-	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+	map { return 1 if $page eq 'index.'.$_ } @slavelanguages;
 	return undef;
 }
 
@@ -1060,7 +1063,7 @@ sub deletetranslations ($) {
 		if (-e $absfile && ! -l $absfile && ! -d $absfile) {
 			push @todelete, $file;
 		}
-	} keys %{$config{po_slave_languages}};
+	} @slavelanguages;
 
 	map {
 		if ($config{rcs}) {