Merge remote-tracking branch 'schmonz/cvs'

[git.ikiwiki.info.git] / po / underlay.setup

diff --git a/po/underlay.setup b/po/underlay.setup
index 237acef5d3a11c7e4b4c0fc96d7c62080b5b7094..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 => {
-               #'fr' => 'Français',
-               #'es' => 'Español',
-               #'de' => 'Deutsch',
-               '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}],
 
@@ -24,6 +24,7 @@ use IkiWiki::Setup::Standard {
        # we don't want to pull in the normal underlays
        underlaydirbase => "underlays/empty",
        underlaydir => "underlays/empty",
+       disable_plugins => [qw{openid}], # needs special underlay
        discussion => 0,
        locale => '',
        verbose => 1,