fix cherry-picked

diff --git a/debian/changelog b/debian/changelog
index 69e197e37e8b39fe724884d0518a1e447e27a745..9f10c2913af9893c28c4924f1c8427559d0e28d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
   * htmltidy: Print a warning message if tidy fails. Closes: #543722
+  * po: Fix name of translated toplevel index page. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9c4d8ffbd8a75d5781f287a4e6340c6e299a14a3..f020adac2e587ed516d767018e08db445f4a213b 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -289,27 +289,6 @@ order, as `po_slave_languages` is a hash. It would need to be converted
 to an array to support this. (If twere done, twere best done quickly.)
 --[[Joey]] 
 
-Name of toplevel index page
----------------------------
-
-Normally at the top index page of a wiki, you see the wiki name at
-the top. However, at the top *translated* index page, you see something
-like "index.da". --[[Joey]]
-
-> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'`
-> test with a predicate call such as isindexpage($page). Such a predicate
-> function could then be overriden by the po plugin. --[[intrigeri]]
-
->> Could do that, but if you have such a function it's natural to want to
->> use it elsewhere. Not clear to me it would make sense for po to override
->> such a function if it were used in some of the other places that compare
->> to index.
->> 
->> The other option would be for po to override the template setting.
->> --[[Joey]] 
-
->>> Great idea. Commit 6c0f9c691c3df3a in my po branch does it. --[[intrigeri]]
-
 Pagespecs
 ---------