* Initial work on internationalization of the program code. po/ikiwiki.pot

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b76c87b8e9ccf4b17c83c8e32dd88821e98016d6..1e65b23e3bf5a42e5e102a2bf331b39e933b6185 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -31,11 +31,11 @@ sub setup_standard {
                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{refresh} || $config{wrappers}) {
-               debug("generating wrappers..");
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
+               debug(gettext("generating wrappers.."));
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                my %startconfig=(%config);
@@ -55,18 +55,26 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }
+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }
                }
                else {
                        $config{$c}=undef;
                }
        }
 
-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
                $config{rebuild}=1;
-               debug("rebuilding wiki..");
+               debug(gettext("rebuilding wiki.."));
        }
        else {
-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));
        }
 
        loadplugins();
@@ -75,7 +83,7 @@ sub setup_standard {
        loadindex();
        refresh();
 
-       debug("done");
+       debug(gettext("done"));
        saveindex();
 }