urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

po: do not inject custom bestlink function when po_link_to eq default 

Signed-off-by: intrigeri <intrigeri@boum.org>
master
intrigeri 2009-08-27 20:31:44 +02:00
parent 6c0f9c691c
commit cdc3576c8d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki/Plugin/po.pm
View File

@ -51,8 +51,6 @@ sub import {
hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
hook(type => "formbuilder", id => "po", call => \&formbuilder);
$origsubs{'bestlink'}=\&IkiWiki::bestlink;
inject(name => "IkiWiki::bestlink", call => \&mybestlink);
$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
$origsubs{'targetpage'}=\&IkiWiki::targetpage;
@ -153,6 +151,10 @@ sub checkconfig () {
warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
$config{po_link_to}='default';
}
unless ($config{po_link_to} eq 'default') {
$origsubs{'bestlink'}=\&IkiWiki::bestlink;
inject(name => "IkiWiki::bestlink", call => \&mybestlink);
}
push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
@ -543,16 +545,13 @@ sub formbuilder (@) {
# `----
# Implement po_link_to 'current' and 'negotiated' settings.
# Not injected otherwise.
sub mybestlink ($$) {
my $page=shift;
my $link=shift;
return $origsubs{'bestlink'}->($page, $link)
if $config{po_link_to} eq "default";
my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
if (length $res
&& ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
&& istranslatable($res)
&& istranslation($page)) {
return $res . "." . lang($page);