aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-24 05:22:20 -0400
committerJoey Hess <joey@kitenet.net>2010-07-24 05:22:20 -0400
commita47444fd97d73c756072abe655abf90b591defaa (patch)
treee2a68324dda4f26aae9ce1c61e72d78a24e97f76
parent855fad15e50217ea768768ad1a3a68bb9422eae1 (diff)
parent11bd781a9dc8c04a005a04a99845ec339079b610 (diff)
downloadikiwiki-a47444fd97d73c756072abe655abf90b591defaa.tar
ikiwiki-a47444fd97d73c756072abe655abf90b591defaa.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/plugins/po.mdwn12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index d70247295..9426ec9c5 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -305,9 +305,21 @@ to an array to support this. (If twere done, twere best done quickly.)
>>>>> 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
---------