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

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 7d13ab455c60dd80a743d6fb519d1400b9e02b4b..11d562523807ea448c73ff81898d30341804830f 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,7 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
-       die "usage: ikiwiki [options] source dest\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -32,8 +32,6 @@ sub getconfig () { #{{{
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "anonok!" => \$config{anonok},
-                       "rss!" => \$config{rss},
-                       "atom!" => \$config{atom},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
@@ -49,7 +47,7 @@ sub getconfig () { #{{{
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
                        "exclude=s@" => sub {
-                               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+                               push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]