diff options
author | intrigeri <intrigeri@boum.org> | 2010-07-24 11:19:28 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-07-24 11:19:28 +0200 |
commit | 2f71e7f8f5a5c69753fb77c897d4446cdc23f856 (patch) | |
tree | 144bd3fb2710042f8b9fddd9c47b05cad90e8ff9 /doc/plugins/po.mdwn | |
parent | d98296d1db02febfa7cc4fbe7f304ca2a9858fef (diff) | |
parent | 11bd781a9dc8c04a005a04a99845ec339079b610 (diff) | |
download | ikiwiki-2f71e7f8f5a5c69753fb77c897d4446cdc23f856.tar ikiwiki-2f71e7f8f5a5c69753fb77c897d4446cdc23f856.tar.gz |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'doc/plugins/po.mdwn')
-rw-r--r-- | doc/plugins/po.mdwn | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index c36414c8e..9426ec9c5 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -301,6 +301,25 @@ to an array to support this. (If twere done, twere best done quickly.) >>>> no way to really sanely represent complex data structures in web >>>> setup. --[[Joey]] +>>>>> Implemented using the pipe separator, fixed the po.t test suite +>>>>> accordingly. Please have a look. --[[intrigeri]] + +>>>>>> 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, +>>>>>> 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 --------- @@ -351,7 +370,7 @@ and then committed again. The second commit makes this change: Same thing happens when a change to an existing page triggers a po file update. --[[Joey]] -> * The s/utf-8/UTF-8 part is fixed in my po branch. +> * The s/utf-8/UTF-8 part has been fixed. > * The ENCODING\n part is due to an inconsistency in po4a, which > I've just send a patch for. --[[intrigeri]] |