Improve error message when postsignin (probably from openid) fails due to

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7512c258758eb7e7a577d73e08b2679dc5a6e6b0..0c4272286d13eace9ee24c393717b6edd93066b9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,18 +24,12 @@ sub setup_standard {
                push @{$setup{plugin}}, @{$setup{add_plugins}};
                delete $setup{add_plugins};
        }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
-       }
        if (exists $setup{exclude}) {
-               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }
 
        if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
-               debug("generating wrappers..");
+               debug(gettext("generating wrappers.."));
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                my %startconfig=(%config);
@@ -71,10 +65,10 @@ sub setup_standard {
        }
        elsif (! $config{refresh}) {
                $config{rebuild}=1;
-               debug("rebuilding wiki..");
+               debug(gettext("rebuilding wiki.."));
        }
        else {
-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));
        }
 
        loadplugins();
@@ -83,7 +77,7 @@ sub setup_standard {
        loadindex();
        refresh();
 
-       debug("done");
+       debug(gettext("done"));
        saveindex();
 }