From 8ee3297b50e270523d9372be2eea61bd253e6e4d Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 20 Jul 2010 01:49:48 +0200 Subject: todo update --- doc/plugins/po.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/plugins') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 53327c1da..e3feb8843 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -351,7 +351,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]] -- cgit v1.2.3 From 081b43a8aec8c49fca0ffa4e4b72d41869050e89 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 20 Jul 2010 13:48:37 +0200 Subject: Implemented, please merge. --- doc/plugins/po.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/plugins') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index e3feb8843..fc7d1d502 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -301,6 +301,9 @@ 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]] + Pagespecs --------- -- cgit v1.2.3 From d2f56f7dea7252ce8c11b6c58049ecce515f155c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:29:17 -0400 Subject: merged; notes --- debian/changelog | 2 ++ doc/plugins/po.mdwn | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'doc/plugins') diff --git a/debian/changelog b/debian/changelog index c27af5615..0f6a7c810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. + * po: The po_slave_languages setting is now a list, so the order of + translated languages can be controlled. (intrigeri) -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index ddaba86f0..d70247295 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.) >>>>> 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? +>>>>>> Also, the compatability code for HASH is not really needed, +>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] + Pagespecs --------- -- cgit v1.2.3 From 11bd781a9dc8c04a005a04a99845ec339079b610 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 24 Jul 2010 11:18:57 +0200 Subject: answering joey --- doc/plugins/po.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc/plugins') 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 --------- -- cgit v1.2.3