From: Joey Hess Date: Fri, 14 Aug 2009 01:41:48 +0000 (-0400) Subject: po: use discussionpage config setting X-Git-Tag: 3.1415926~133 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=949eb252e9f918bd57e58b75479ed3b4c017f87d;p=ikiwiki.git po: use discussionpage config setting This was tricky. $links{$page/discussion} must be checked; with it in lowercase. --- diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 52677076e..b8967058e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -284,17 +284,16 @@ sub pagetemplate (@) { map add_depends($page, $_), (values %{otherlanguages($page)}); } if ($config{discussion} && istranslation($page)) { - my $discussionlink=gettext("discussion"); - if ($page !~ /.*\/\Q$discussionlink\E$/i && + if ($page !~ /.*\/\Q$config{discussionpage}\E$/i && (length $config{cgiurl} || - exists $links{$masterpage."/".$discussionlink})) { + exists $links{$masterpage."/".lc($config{discussionpage})})) { $template->param('discussionlink' => htmllink( $page, $destpage, - $masterpage . '/' . gettext("Discussion"), + $masterpage . '/' . $config{discussionpage}, noimageinline => 1, forcesubpage => 0, - linktext => gettext("Discussion"), + linktext => $config{discussionpage}, )); } }