diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-02 11:21:18 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-02 16:05:27 +0100 |
| commit | 0bf9ea723ad8969a422b4589ced8385ef6c0f170 (patch) | |
| tree | 3d29b101d6d24ac8a89eecbcc7530fb1f0cf26fb | |
| parent | fce78d71a0d4a6847cbb83da33fdb4522a002578 (diff) | |
meta branch merge required
Signed-off-by: intrigeri <intrigeri@boum.org>
| -rw-r--r-- | doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/contrib/po.mdwn | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn index 158656a13..cccd53d05 100644 --- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn +++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn @@ -14,3 +14,5 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title >> It was actually more complicated than expected. A working prototype is >> now in my `meta` branch, see my userpage for the up-to-date url. >> Thus tagging [[patch]]. --[[intrigeri]] +>> +>>> Joey, please consider merging my `meta` branch. --[[intrigeri]] diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index f90ffeed2..9919ac595 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -139,6 +139,11 @@ Any thoughts on this? >>>>> to have the links text generation more customizable through >>>>> plugins, I could do both at the same time if we consider this >>>>> matter to be important enough. --[[intrigeri]] +>>>>> +>>>>>> The translation status in links is now implemented in my +>>>>>> `po`branch. It requires my `meta` branch changes to +>>>>>> work, though. I consider the latter to be mature enough to +>>>>>> be merged. --[[intrigeri]] >> FWIW, I'm tracking your po branch in ikiwiki master git in the po >> branch. One thing I'd like to try in there is setting up a translated |