Merge branch 'master' into po

master
Joey Hess 2009-03-27 15:51:35 -04:00
commit a4d7ee2559
2 changed files with 15 additions and 0 deletions

View File

@ -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]]

View File

@ -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]]