po: use discussionpage config setting

This was tricky. $links{$page/discussion} must be checked; with it in
lowercase.
master
Joey Hess 2009-08-13 21:41:48 -04:00
parent 830c9e59b2
commit 949eb252e9
1 changed files with 4 additions and 5 deletions

View File

@ -284,17 +284,16 @@ sub pagetemplate (@) {
map add_depends($page, $_), (values %{otherlanguages($page)}); map add_depends($page, $_), (values %{otherlanguages($page)});
} }
if ($config{discussion} && istranslation($page)) { if ($config{discussion} && istranslation($page)) {
my $discussionlink=gettext("discussion"); if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
if ($page !~ /.*\/\Q$discussionlink\E$/i &&
(length $config{cgiurl} || (length $config{cgiurl} ||
exists $links{$masterpage."/".$discussionlink})) { exists $links{$masterpage."/".lc($config{discussionpage})})) {
$template->param('discussionlink' => htmllink( $template->param('discussionlink' => htmllink(
$page, $page,
$destpage, $destpage,
$masterpage . '/' . gettext("Discussion"), $masterpage . '/' . $config{discussionpage},
noimageinline => 1, noimageinline => 1,
forcesubpage => 0, forcesubpage => 0,
linktext => gettext("Discussion"), linktext => $config{discussionpage},
)); ));
} }
} }