* Fix handling of discussion links on discussion pages when l10n is used.

master
joey 2007-01-18 15:06:57 +00:00
parent d8c3baf7a3
commit f6e917fcce
4 changed files with 20 additions and 14 deletions

View File

@ -156,11 +156,14 @@ sub preprocess_inline (@) { #{{{
if ($actions) {
my $file = $pagesources{$page};
my $type = pagetype($file);
if ($config{discussion} &&
$page !~ /.*\/discussion$/ &&
(length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
$template->param(have_actions => 1);
$template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
if ($config{discussion}) {
my $discussionlink=gettext("discussion");
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
$template->param(have_actions => 1);
$template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
}
}
if (length $config{cgiurl} && defined $type) {
$template->param(have_actions => 1);

View File

@ -93,10 +93,14 @@ sub genpage ($$$) { #{{{
$template->param(historyurl => $u);
$actions++;
}
if ($config{discussion} && $page !~ /.*\/discussion$/ &&
(length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
$actions++;
if ($config{discussion}) {
my $discussionlink=gettext("discussion");
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
$actions++;
}
}
if ($actions) {

3
debian/changelog vendored
View File

@ -4,8 +4,9 @@ ikiwiki (1.41) UNRELEASED; urgency=low
if an older version is installed, just don't gettext strings, instead of
crashing.
* Added smileys for Moin Moin compatability.
* Fix handling of discussion links on discussion pages when l10n is used.
-- Joey Hess <joeyh@debian.org> Thu, 18 Jan 2007 09:45:47 -0500
-- Joey Hess <joeyh@debian.org> Thu, 18 Jan 2007 10:03:59 -0500
ikiwiki (1.40) unstable; urgency=low

View File

@ -4,13 +4,11 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
-- [[JeremyReed]]
> Discussion pages should clearly be a special case that don't get Discussion
> links put at the top... aaand.. [[done]]! --[[Joey]]
> links put at the top... aaand.. [[bugs/done]]! --[[Joey]]
>>> Joey, I've just seen that you closed that bug in ikiwiki 1.37, but it seems
>>> you fixed it only for English "discussion" page. The bug still occurs
>>> for the international "discussion" pages. I have backported ikiwiki 1.40
>>> and I can see "Dyskusja" link on my Polish "dyskusja" pages. --Pawel
>>> I'm so sorry for two commits, but first I clicked "Save Page" button
>>> and next I clicked "Cancel" button, because I forgot about my signature :)
>>> --Pawel
>>> Yes, I missed that string when internationalizing ikiwiki, fixed now.