diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:51:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:51:35 -0400 |
| commit | a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591 (patch) | |
| tree | 7f6a5458e3fc82b8b5baab062dcf0de90ff8a614 | |
| parent | e1e936d27c919d6dde1a6f0c2405ca3ac7122b54 (diff) | |
| parent | 2852cf14a2b2b6610ea1d4c64f3bb9741b494ae1 (diff) | |
| download | ikiwiki-a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591.tar ikiwiki-a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591.tar.gz | |
Merge branch 'master' into po
| -rw-r--r-- | doc/plugins/contrib/po.mdwn | 11 | ||||
| -rw-r--r-- | doc/todo/need_global_renamepage_hook.mdwn | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index c39008466..a5e3375ce 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -328,3 +328,14 @@ but the po thing is supposed to work without these ugly `our`. Seems like it was the last unaddressed item from Joey's review, so I'm daring a timid "please pull"... or rather, please review again :) --[[intrigeri]] + +> 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`. +> +> * Is it worth trying to fix compatability with `indexpages`? +> * Would it make sense to go ahead and modify `page.tmpl` to use +> OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it? +> +> --[[Joey]] diff --git a/doc/todo/need_global_renamepage_hook.mdwn b/doc/todo/need_global_renamepage_hook.mdwn index a6080ddc1..874460b29 100644 --- a/doc/todo/need_global_renamepage_hook.mdwn +++ b/doc/todo/need_global_renamepage_hook.mdwn @@ -107,3 +107,7 @@ hashes is desired, it could return the full set of hashes. >>> I've implemented this nice solution in my po branch, please review. >>> I'm slowly coming back to do the last bits needed to get my po and >>> meta branch merged. --[[intrigeri]] + +>>>> It looks good. I made some small changes to it in my own po branch. +>>>> Nothing significant really. If this were not tied up in the po branch, +>>>> I've have merged it to master already. --[[Joey]] |