Optimise use of gettext, and avoid ugly warnings if Locale::gettext is not available.

[git.ikiwiki.info.git] / auto.setup

diff --git a/auto.setup b/auto.setup
index 9cf5e7725ede534f1d5e16c1d7f06a8064156ed0..3da5e3a621cc32c2b11b8a9e3d03efd953232231 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -17,7 +17,7 @@ our $wikiname=IkiWiki::Setup::Automator::ask(
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(

-       gettext("What wiki user (or openid) will be wiki admin?"), $ENV{USER});
+       gettext("What wiki user (or openid) will be admin?"), $ENV{USER});

 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
        gettext("What is the domain name of the web server?"), "");
 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
        gettext("What is the domain name of the web server?"), "");


@@ -40,5 +40,4 @@ IkiWiki::Setup::Automator->import(
        rss => 1,
        atom => 1,
        syslog => 1,
        rss => 1,
        atom => 1,
        syslog => 1,

-       hardlink => 1,

 )
 )