Revert "po: do not inject custom bestlink function when po_link_to eq default"

[ikiwiki.git] / doc / plugins / po.mdwn

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9c4d8ffbd8a75d5781f287a4e6340c6e299a14a3..38b6b12cdefdd80c897baaaf05e794bc5ef27d08 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -253,33 +253,6 @@ once [[intrigeri]]'s `meta` branch is merged.
 An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
 and `meta` branches, and thus has this additional features.
 
-Self links
-----------
-
-If a page contains a WikiLink to itself, ikiwiki does not normally
-turn that into a hyperlink. However, if a translated page contains a
-WikiLink to itself, a hyperlink is inserted, at least with the default
-`po_link_to` the link points to the English version of the page. Is there a
-good reason for that to be done? --[[Joey]]
-
-> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
-
->> It may fix it in passing, but shouldn't it also be fixed for the other
->> `po_link_to` styles?
-
->>> Other `po_link_to` styles already work ok: say there is
->>> a \[[dest]] link on a page called `dest`. When rendering
->>> `dest.LL`, `mybestlink` returns `dest.LL`, and `htmllink` is then
->>> able to detect, and manage correctly, that it is a self-link.
->>> --[[intrigeri]]
-
->> (Also, if `mybestlink` is going to always just return `bestlink` in
->> this case, there seems no reason to inject it.) --[[Joey]]
-
->>> Right. Commit cdc3576c8d1efb2 in my po branch prevents
->>> `mybestlink` to be injected when `po_link_to` is
->>> `default`. --[[intrigeri]]
-
 Language display order
 ----------------------
 
@@ -289,27 +262,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
 ---------
 
@@ -365,6 +317,28 @@ text, or text in whatever single language ikiwiki is configured to "speak".
 Maybe there could be a way to switch ikiwiki to speaking another language
 when building a non-english page? Then the directives would get translated.
 
+2 test suite failures
+--------------------
+
+t/po is currently failing tests 57 and 59 (and I would like to release
+soon..) --[[Joey]] 
+
+> They are failing because of commit cdc3576c8d1e (po: do not inject
+> custom bestlink function when `po_link_to` eq `default`). The test
+> suite changes `$config{po_link_to}`, but the `checkconfig` hook is
+> not re-run. I could manually run it when needed in the test-suite,
+> but this would lead to this function being injected several times,
+> and then `$origsubs{'bestlink'}` to be sometimes set to a wrong
+> value, which would break other parts of the test-suite. The best
+> solution I can think of (apart of reverting this commit or disabling
+> these two tests) is to split the test-suite into 3 parts, depending
+> on the `$config{po_link_to}` setting, either in 3 different `.t`
+> files, or inside the existing one and completely reset the IkiWiki
+> environment at the start of these parts... which I did not manage to
+> achieve in the last 2 hours :/ --[[intrigeri]]
+
+>> I've reverted it. --[[Joey]] 
+
 Documentation
 -------------