From 6842328405494dd4971d3bfa443901084efe87ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Jun 2009 13:15:05 -0400 Subject: Avoid relying on translators preserving the case when translating "discussion", which caused Discussion pages to get unwanted Discussion links. --- IkiWiki/Render.pm | 2 +- debian/changelog | 3 +++ doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index adae9f0d5..ba1d1eae5 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -76,7 +76,7 @@ sub genpage ($$) { $actions++; } if ($config{discussion}) { - my $discussionlink=gettext("discussion"); + my $discussionlink=lc(gettext("Discussion")); if ($page !~ /.*\/\Q$discussionlink\E$/ && (length $config{cgiurl} || exists $links{$page."/".$discussionlink})) { diff --git a/debian/changelog b/debian/changelog index cee073b3a..be1db6f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ ikiwiki (3.15) UNRELEASED; urgency=low * comment: Make comment directives no longer use the internal "_comment" 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 Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn index c7506c6de..c74a094ce 100644 --- a/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn +++ b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn @@ -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. +> [[done]] --[[Joey]] + [[!tag patch]] -- cgit v1.2.3