Merge commit 'upstream/master' into prv/po

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index fdef41e454936b3b01a22ae649ed2a4c9c3197c4..39b237c73b6a48a98c479bb6a5e65c08ee94b6b3 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -332,6 +332,17 @@ creation (when `from=page.LL`). This is commit c9301d2c296f682.
 
 > Both cherry picked. --[[Joey]] 
 
+inline's post form's rootpage
+-----------------------------
+
+When a translatable page (say it is called "bugs") contains an
+[[inline directive|ikiwiki/directive/inline]] with `postform` enabled,
+the rootpage is l10n'd on translations pages (e.g. "bugs.fr" gets
+a `rootpage` value of `bugs.fr`). This is usually not what's expected,
+as translation pages are not supposed to have subpages. My po branch
+has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes
+this. --[[intrigeri]]
+
 Documentation
 -------------
 

diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 90bfbef3b49ca6532e9cdc0351fb154e3a27fa17..44fcf32bb612ae034f03077940bf5509b71efd8d 100644 (file)
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -95,7 +95,24 @@ This may be useful for sites with a few pages in different languages, but no ful
 
 >>> Now that po has been merged, this patch should probably also be adapted
 >>> so that the po plugin forces the meta::lang of every page to what po
->>> thinks it should be. Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]]
->>> should also work with meta-assigned languages? --[[smcv]]
+>>> thinks it should be. --[[smcv]]
+
+>>>> Agreed, users of the po plugin would greatly benefit from it.
+>>>> Seems doable. --[[intrigeri]]
+
+>>> Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]] should
+>>> also work with meta-assigned languages? --[[smcv]]
+
+>>>> Yes. But then, these special pagespecs should be moved outside of
+>>>> [[plugins/po]], as they could be useful to anyone using the
+>>>> currently discussed patch even when not using the po plugin.
+>>>> 
+>>>> We could add these pagespecs to the core and make them use
+>>>> a simple language-guessing system based on a new hook. Any plugin
+>>>> that implements such a hook could decide whether it should
+>>>> overrides the language guessed by another one, and optionally use
+>>>> the `first`/`last` options (e.g. the po plugin will want to be
+>>>> authoritative on the pages of type po, and will then use
+>>>> `last`). --[[intrigeri]]
 
 [[!tag wishlist patch plugins/meta translation]]