Avoid relying on translators preserving the case when translating "discussion", which...

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index adae9f0d5898dee39190a29328fa7e221c82dcdc..ba1d1eae5705e156fe65baac158170300a3de8c5 100644 (file)
--- 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 cee073b3ad3c43b4c967d3cf404ce831e9c21459..be1db6f3c4b3ba6b681333913114eedbacd17b2a 100644 (file)
--- 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 <joeyh@debian.org>  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 c7506c6dee990b12af1087af3f2cc8e5de4dfa58..c74a094ce44e03939ac45e78e539d1b9e62b3c62 100644 (file)
--- 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]]