From 56ff8b16f2fff6fbe9fef5713e6840c4630b3995 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Jul 2010 16:59:40 -0400 Subject: add news item for ikiwiki 3.20100722 --- doc/news/version_3.20100518.mdwn | 6 ------ doc/news/version_3.20100722.mdwn | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 doc/news/version_3.20100518.mdwn create mode 100644 doc/news/version_3.20100722.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn deleted file mode 100644 index f622a4be9..000000000 --- a/doc/news/version_3.20100518.mdwn +++ /dev/null @@ -1,6 +0,0 @@ -ikiwiki 3.20100518 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * page.tmpl: Accidentially broke po plugin's otherlanguages list styling - when modifying for html5; now fixed. - * Fix a bug that prevented matching deleted comments, and so did not update - pages that had contained them."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100722.mdwn b/doc/news/version_3.20100722.mdwn new file mode 100644 index 000000000..27ed1fd4d --- /dev/null +++ b/doc/news/version_3.20100722.mdwn @@ -0,0 +1,25 @@ +ikiwiki 3.20100722 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * img: Add a margin around images displayed by this directive. + * comments: Added commentmoderation directive for easy linking to the + comment moderation queue. + * aggregate: Write timestamp next aggregation can happen to + .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs. + * Add --changesetup mode that allows easily changing options in a + setup file. + * openid: Fix handling of utf-8 nicknames. + * Clarified what the filter hook should be passed: Only be the raw, + complete text of a page. Not a snippet, or data read in from an + unrelated file. + * template: Do not pass filled in template through filter hook. + Avoids causing breakage in po plugin. + * color, comments, conditional, cutpaste, more, sidebar, toggle: Also + avoid unnecessary calls to filter hook. + * po: needstranslation() pagespec can have a percent specified. + * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have + the caching problem that was added to work around). Closes: #[588623](http://bugs.debian.org/588623) + * Made much more robust in cases where multiple source files produce + conflicting files/directories in the destdir. + * Updated French translation from Philippe Batailler. Closes: #[589423](http://bugs.debian.org/589423) + * po: Fix selflink display on tranlsated pages. (intrigeri) + * Avoid showing 'Add a comment' link at the bottom of the comment post form."""]] \ No newline at end of file -- cgit v1.2.3 From ddecdbe85402e71ac5a07a46e301cc6ab512eeed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 12:49:34 -0400 Subject: add flattr button --- doc/tipjar.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn index b725a2eff..ae612e129 100644 --- a/doc/tipjar.mdwn +++ b/doc/tipjar.mdwn @@ -5,6 +5,9 @@ choose. If you'd like to fund development of a specific feature, see the donate with PayPal + + + Thanks to the following people for their kind contributions: * James Westby -- cgit v1.2.3 From d78578f1b8e37045f47876ca3b21afb9b36215d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 13:24:15 -0400 Subject: add tipjar link to sidebar and flattr button, as an experiment --- doc/templates/links.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index 2b18bceb2..3ad043145 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -8,5 +8,9 @@
  • [[Users|IkiWikiUsers]]
  • [[SiteMap]]
  • [[Contact]]
    • +
  • [[TipJar]]
    • + + -- cgit v1.2.3 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') 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') 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 055dfa00c6bf16af237731426caf2cdfa0bdcb90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:16:22 -0400 Subject: html --- doc/templates/links.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index 3ad043145..3e21e8017 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -9,8 +9,8 @@
  • [[SiteMap]]
  • [[Contact]]
  • [[TipJar]]
    • + Flattr this - -- cgit v1.2.3 From e3004912dd64d28f7b9c1e6d63caeeb4e674d056 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:19:54 -0400 Subject: html --- doc/templates/links.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index 3e21e8017..c66720ffe 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -10,7 +10,7 @@
  • [[Contact]]
  • [[TipJar]]
    • - + Flattr this -- cgit v1.2.3 From ef8a74fbc30b7b49b717afc110e46f49a88cd77d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:22:18 -0400 Subject: html --- doc/templates/links.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index c66720ffe..b7c3028cd 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -12,5 +12,5 @@ +alt="Flattr this" title="Flattr this" /> -- 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') 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') 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