From: Joey Hess <joey@kitenet.net>
Date: Mon, 13 Sep 2010 20:48:12 +0000 (-0400)
Subject: further fixes for config data structure change
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a4b4b464d27490d3868e8430a6f833b54a625cad?ds=sidebyside

further fixes for config data structure change
---

diff --git a/po/po2wiki b/po/po2wiki
index 116abbfec..126aa8e17 100755
--- a/po/po2wiki
+++ b/po/po2wiki
@@ -22,7 +22,8 @@ foreach my $file (@$files) {
 	$pagesources{$page}=$file; # used by po plugin functions
 }
 
-foreach my $ll (@{$config{po_slave_languages}}) {
+foreach my $lang (@{$config{po_slave_languages}}) {
+	my ($ll, $name)=IkiWiki::Plugin::po::splitlangpair($lang);
 	$config{destdir}="../underlays/locale/$ll";
 
 	foreach my $file (@$files) {
diff --git a/po/underlay.setup b/po/underlay.setup
index 8d3516cff..ebe7251cf 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -6,14 +6,14 @@ use IkiWiki::Setup::Standard {
 	# List here all languages that have translations.
 	# Listing languages without active translations
 	# will excessively bloat things.
-        po_slave_languages => {
-		'es' => 'Español',
-		'de' => 'Deutsch',
-		'fr' => 'Français',
-		'da' => 'Dansk',
-		'cs' => 'česky',
-        },
-	po_master_language => { 'code' => 'en', 'name' => 'English' },
+        po_slave_languages => [
+		'es|Español',
+		'de|Deutsch',
+		'fr|Français',
+		'da|Dansk',
+		'cs|česky',
+	],
+	po_master_language => 'en|English',
 	po_translatable_pages => "*",
 	add_plugins => [qw{po}],