X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/888f4203f5a228005a15b70f962b7e7f16de9ad3..611256ba1c6f9b5cfdaabed634a1be00eb32e7a7:/auto.setup

diff --git a/auto.setup b/auto.setup
index 47d0d868f..b3d2513d9 100644
--- a/auto.setup
+++ b/auto.setup
@@ -13,14 +13,14 @@
 require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
-	"What will the wiki be named?", "wiki");
+	gettext("What will the wiki be named?"), gettext("wiki"));
 our $rcs=IkiWiki::Setup::Automator::ask(
-	"What revision control system to use?", "git");
+	gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
-	"What wiki user (or openid) will be wiki admin?", $ENV{USER});
+	gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
-	"What is the domain name of the web server?", "");
+	gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
 	wikiname => $wikiname,
@@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
 	rcs => $rcs,
 	srcdir => "$ENV{HOME}/$wikiname",
 	destdir => "$ENV{HOME}/public_html/$wikiname",
-	repository => "$ENV{HOME}/$wikiname.$rcs",
+	repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
 	dumpsetup => "$ENV{HOME}/$wikiname.setup",
 	url => "http://$domain/~$ENV{USER}/$wikiname",
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
@@ -40,6 +40,4 @@ IkiWiki::Setup::Automator->import(
 	rss => 1,
 	atom => 1,
 	syslog => 1,
-	prefix_directives => 1,
-	hardlink => 1,
 )