From: Joey Hess Date: Sun, 29 Mar 2009 18:54:53 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.09~36 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d8f0b1a3f749006424fb719ea1841ef366b5090?ds=sidebyside;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info Conflicts: doc/plugins/contrib/po.mdwn --- 3d8f0b1a3f749006424fb719ea1841ef366b5090 diff --combined doc/plugins/contrib/po.mdwn index 3f5a65c05,5f0de3b5e..618e16598 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@@ -332,8 -332,7 +332,8 @@@ daring a timid "please pull"... or rath > Ok, I've reviewed and merged into my own po branch. It's looking very > mergeable. I would still like to go over the `po.pm` code in detail and > review it, but it's very complex, and I'm happy with all the changes -> outside `po.pm`. +> outside `po.pm`. (Reviewed the first 520 lines, up to injected +> functions.) > > * Is it worth trying to fix compatability with `indexpages`? >> @@@ -359,17 -358,6 +359,17 @@@ >> disabled, I fear the ones who could do this would maybe think >> it's blandly impossible and give up. >> - > ++ +> * What's the reasoning behind checking that the link plugin +> is enabled? AFAICS, the same code in the scan hook should +> also work when other link plugins like camelcase are used. +> * In `pagetemplate` there is a comment that claims the code +> relies on `genpage`, but I don't see how it does; it seems +> to always add a discussion link? +> * Is there any real reason not to allow removing a translation? +> I'm imagining a spammy translation, which an admin might not +> be able to fix, but could remove. +> > --[[Joey]] >> >> --[[intrigeri]]