further fixes for config data structure change

diff --git a/po/po2wiki b/po/po2wiki
index 116abbfecafd19adc14897a7524d017cd2d0c1c1..126aa8e17d0949d0c9a55477268464936092ff33 100755 (executable)
--- 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 8d3516cff14a789341e25ae6c08d56feb397809e..ebe7251cf613074542865357489b22101447d26d 100644 (file)
--- 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}],