Merge commit 'intrigeri/po'

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 14c7318feff935209e85e317039f0cee70fe620d..792d84261855ccd074421717207d0276cadc1928 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -154,8 +154,10 @@ sub checkconfig () {
                $config{po_link_to}='default';
        }
        unless ($config{po_link_to} eq 'default') {
-               $origsubs{'bestlink'}=\&IkiWiki::bestlink;
-               inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+               if (! exists $origsubs{'bestlink'}) {
+                       $origsubs{'bestlink'}=\&IkiWiki::bestlink;
+                       inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+               }
        }
 
        push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
@@ -566,9 +568,12 @@ sub mybestlink ($$) {
        my $link=shift;
 
        my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
+       my @caller = caller(1);
        if (length $res
            && istranslatable($res)
-           && istranslation($page)) {
+           && istranslation($page)
+           &&  !(exists $caller[3] && defined $caller[3]
+                 && ($caller[3] eq "IkiWiki::PageSpec::match_link"))) {
                return $res . "." . lang($page);
        }
        return $res;