unfuzzy

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 70b353ec5ef5970852677cf8ae02e4070641fdf4..13ff0aa19c92ea5b97134240b97c985b732b30fa 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,7 +5,6 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki 1.00;
-use IkiWiki::Render; # for displaytime
 use URI;
 
 sub import { #{{{
@@ -34,7 +33,7 @@ sub getopt () { #{{{
 
 sub checkconfig () { #{{{
        if (($config{rss} || $config{atom}) && ! length $config{url}) {
-               error("Must specify url to wiki with --url when using --rss or --atom");
+               error(gettext("Must specify url to wiki with --url when using --rss or --atom"));
        }
        if ($config{rss}) {
                push @{$config{wiki_file_prune_regexps}}, qr/\.rss$/;
@@ -94,7 +93,7 @@ sub preprocess_inline (@) { #{{{
                @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
        }
        else {
-               return "unknown sort type $params{sort}";
+               return sprintf(gettext("unknown sort type %s"), $params{sort});
        }
 
        if (exists $params{skip}) {
@@ -157,7 +156,9 @@ sub preprocess_inline (@) { #{{{
                        if ($actions) {
                                my $file = $pagesources{$page};
                                my $type = pagetype($file);
-                               if ($config{discussion}) {
+                               if ($config{discussion} &&
+                                   $page !~ /.*\/discussion$/ &&
+                                   (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
                                        $template->param(have_actions => 1);
                                        $template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
                                }
@@ -236,7 +237,7 @@ sub date_822 ($) { #{{{
 
        eval q{use POSIX};
        error($@) if $@;
-       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
        my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
@@ -248,7 +249,7 @@ sub date_3339 ($) { #{{{
 
        eval q{use POSIX};
        error($@) if $@;
-       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
        my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
@@ -365,7 +366,7 @@ sub pingurl (@) { #{{{
 
        eval q{require RPC::XML::Client};
        if ($@) {
-               debug("RPC::XML::Client not found, not pinging");
+               debug(gettext("RPC::XML::Client not found, not pinging"));
                return;
        }
 
@@ -373,11 +374,11 @@ sub pingurl (@) { #{{{
        defined(my $pid = fork) or error("Can't fork: $!");
        return if $pid;
        chdir '/';
-       eval q{use POSIX ’setsid’};
+       eval q{use POSIX 'setsid'};
        setsid() or error("Can't start a new session: $!");
        open STDIN, '/dev/null';
        open STDOUT, '>/dev/null';
-       open STDERR, '>&STDOUT' or error("Can’t dup stdout: $!");
+       open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");
 
        # Don't need to keep a lock on the wiki as a daemon.
        IkiWiki::unlockwiki();