Avoid relying on translators preserving the case when translating "discussion", which caused Discussion pages to get unwanted Discussion links.

master
Joey Hess 2009-06-04 13:15:05 -04:00
parent 2e48da19a2
commit 6842328405
3 changed files with 6 additions and 1 deletions

View File

@ -76,7 +76,7 @@ sub genpage ($$) {
$actions++; $actions++;
} }
if ($config{discussion}) { if ($config{discussion}) {
my $discussionlink=gettext("discussion"); my $discussionlink=lc(gettext("Discussion"));
if ($page !~ /.*\/\Q$discussionlink\E$/ && if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} || (length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) { exists $links{$page."/".$discussionlink})) {

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ ikiwiki (3.15) UNRELEASED; urgency=low
* comment: Make comment directives no longer use the internal "_comment" * comment: Make comment directives no longer use the internal "_comment"
form, and document the comment directive syntax. form, and document the comment directive syntax.
* Avoid relying on translators preserving the case when translating
"discussion", which caused Discussion pages to get unwanted Discussion
links.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400 -- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400

View File

@ -31,4 +31,6 @@ A simple fix that seems to work is to make this regexp case-insensitive:
But the best way would be to avoid assuming implicitely that translators will translate "discussion" and "Discussion" the same way. But the best way would be to avoid assuming implicitely that translators will translate "discussion" and "Discussion" the same way.
> [[done]] --[[Joey]]
[[!tag patch]] [[!tag patch]]