web commit by JoshTriplett

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 225d8d829f28ee842024934c6038443b01c5f27f..af2418ff4b5f917e6932761ec9553dd426419212 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -20,20 +20,21 @@ sub preprocess (@) { #{{{
        
        my @broken;
        foreach my $page (keys %links) {
-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {
+                       my $discussion=gettext("discussion");
                        foreach my $link (@{$links{$page}}) {
-                               next if $link =~ /.*\/discussion/i && $config{discussion};
+                               next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
                                my $bestlink=bestlink($page, $link);
                                next if length $bestlink;
                                push @broken,
                                        htmllink($page, $params{destpage}, $link, 1).
-                                       " in ".
+                                       " from ".
                                        htmllink($params{page}, $params{destpage}, $page, 1);
                        }
                }
        }
        
-       return "There are no broken links!" unless @broken;
+       return gettext("There are no broken links!") unless @broken;
        my %seen;
        return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
 } # }}}