releasing version 2.31.1

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 0c8ad9208d50768d8f2eb37473ddc2f5d85187f4..235e93eafa061219e96736787273106ee6a32225 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -2,13 +2,17 @@
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki;
+use open qw{:utf8 :std};

 
 package IkiWiki;
 
 sub setup () { # {{{
        my $setup=possibly_foolish_untaint($config{setup});
        delete $config{setup};
 
 package IkiWiki;
 
 sub setup () { # {{{
        my $setup=possibly_foolish_untaint($config{setup});
        delete $config{setup};

-       open (IN, $setup) || error("read $setup: $!\n");
+       #translators: The first parameter is a filename, and the second
+       #translators: is a (probably not translated) error message.
+       open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));

        my $code;
        {
                local $/=undef;
        my $code;
        {
                local $/=undef;


@@ -18,7 +22,8 @@ sub setup () { # {{{
        close IN;
 
        eval $code;
        close IN;
 
        eval $code;

-       error($@) if $@;
+       error("$setup: ".$@) if $@;
+

        exit;
 } #}}}
 
        exit;
 } #}}}