urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-07-24 05:22:20 -04:00
parent 855fad15e5 11bd781a9d
commit a47444fd97
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/plugins/po.mdwn
View File

@ -305,9 +305,21 @@ to an array to support this. (If twere done, twere best done quickly.)
>>>>> accordingly. Please have a look. --[[intrigeri]] >>>>> accordingly. Please have a look. --[[intrigeri]]
>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? >>>>>> Merged. I wonder if "ll: Lang" would be better than pipe?
>>>>>>> I've no clear opinion on this one. --[[intrigeri]]
>>>>>> Also, the compatability code for HASH is not really needed, >>>>>> Also, the compatability code for HASH is not really needed,
>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] >>>>>> ikiwiki has not been released using a hash for it. --[[Joey]]
>>>>>>> The compatibility code is there to support the
>>>>>>> `po_slave_languages => {fr => 'Français'}` format that has
>>>>>>> been supported for ages. It's not there to support the
>>>>>>> intermediate array of hash-like pairs I proposed in the
>>>>>>> meantime.
>>>>>>>
>>>>>>> By the way, could you please have a look to the rest of my po
>>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]]
Pagespecs Pagespecs
--------- ---------