From 018df1df824e440004b276129c2867b552a0ec4d Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Tue, 24 Aug 2010 10:32:29 +0000 Subject: darcs command --- doc/setup.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 266222cc3..83409228c 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -68,6 +68,7 @@ source. (Remember to replace "foo" with the real directory name.) cvs -d `pwd`/foo get -P ikiwiki bzr clone foo foo.src hg clone foo foo.src + darcs get foo foo.src # TODO monotone, tla Now to edit pages by hand, go into the directory you checked out (ie, -- cgit v1.2.3 From 37f62dde2d9b752ba559b796cf6c1b3bc3dee9bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 25 Aug 2010 14:57:45 -0400 Subject: response --- doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn index 8721277aa..77e46049f 100644 --- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn +++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn @@ -42,3 +42,11 @@ browsers emulate it. [[done]] Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page. > I don't think it would need a wiki rebuild, as the textarea is generated dynamically by the CGI when you perform a CGI action, and (as far as I know) is not cooked into any static content. -- [[Jon]] + +>> There is no need for a configuration setting for this -- to change +>> the default height from 20 rows to something else, you can just put +>> something like this in your `local.css`: --[[Joey]] + + #editcontent { + height: 50em; + } -- cgit v1.2.3 From 612493567f946f333a73e4f55fae2ab157108fd9 Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Wed, 25 Aug 2010 20:20:39 +0000 Subject: Marco Sivla --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index e76d547cc..2f70c67b7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -158,6 +158,7 @@ Personal sites and blogs * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) +* [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From e5c4b811369f271dc313741538adfe7cbf745be6 Mon Sep 17 00:00:00 2001 From: "http://www.google.com/profiles/hakim.cassimally" Date: Thu, 26 Aug 2010 07:35:47 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 01308dae4..137075ee7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -49,6 +49,7 @@ Bulleted list * + ---- This **SandBox** is also a [[blog]]! -- cgit v1.2.3 From 6d213a0c739d5b34357b01a616f99197eeba6ad9 Mon Sep 17 00:00:00 2001 From: "http://www.google.com/profiles/hakim.cassimally" Date: Thu, 26 Aug 2010 07:38:02 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 137075ee7..365cb3321 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,5 +53,6 @@ Bulleted list ---- This **SandBox** is also a [[blog]]! +[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] -- cgit v1.2.3 From 958e5735c946263a111420fe47abe58782581e8c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Aug 2010 10:01:47 +0200 Subject: Fix typo in usage text of postsparkline directlive. --- doc/ikiwiki/directive/postsparkline.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwiki/directive/postsparkline.mdwn b/doc/ikiwiki/directive/postsparkline.mdwn index c17d32952..a7cb6822a 100644 --- a/doc/ikiwiki/directive/postsparkline.mdwn +++ b/doc/ikiwiki/directive/postsparkline.mdwn @@ -15,7 +15,7 @@ This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to crea # usage -All options aside fron the `pages`, `max`, `formula`, `time`, and `color` +All options aside from the `pages`, `max`, `formula`, `time`, and `color` options are the same as in [[sparkline]] directive. You don't need to specify any data points (though you can if you want to). -- cgit v1.2.3 From decf432fd53d85a81cc4e8904b1ee04d64d6ce3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Aug 2010 10:02:27 -0400 Subject: Danish translation update. Closes: #594673 --- debian/changelog | 1 + po/da.po | 386 ++++++++++++++++++++++++------------------------------- 2 files changed, 167 insertions(+), 220 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb445a3ff..d5587bfce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low the bug and providing access to debug it. * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. * htmlscrubber: Do not scrub url anchors that contain colons. + * Danish translation update. Closes: #594673 -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/po/da.po b/po/da.po index c3178a7ea..4d289b8af 100644 --- a/po/da.po +++ b/po/da.po @@ -1,17 +1,17 @@ # Danish translations for ikiwiki package -# Copyright (C) 2008 Jonas Smedegaard +# Copyright (C) 2008, 2009, 2010, Jonas Smedegaard # This file is distributed under the same license as the ikiwiki package. -# Jonas Smedegaard , 2008. # +# Jonas Smedegaard , 2008-2010. msgid "" msgstr "" -"Project-Id-Version: ikiwiki 3.14159\n" +"Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" -"PO-Revision-Date: 2009-07-23 01:07+0200\n" +"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" -"Language: \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -56,7 +56,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 msgid "Error" msgstr "Fejl" @@ -85,50 +85,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 msgid "done" msgstr "færdig" @@ -147,17 +147,14 @@ msgid "Must specify %s" msgstr "Skal angive %s" #: ../IkiWiki/Plugin/amazon_s3.pm:140 -#, fuzzy msgid "Failed to create S3 bucket: " -msgstr "Oprettelse af bundt i S3 mislykkedes: " +msgstr "Oprettelse af S3 bundt mislykkedes: " #: ../IkiWiki/Plugin/amazon_s3.pm:225 -#, fuzzy msgid "Failed to save file to S3: " -msgstr "Arkivering af fil i S3 mislykkedes: " +msgstr "Arkivering af fil til S3 mislykkedes: " #: ../IkiWiki/Plugin/amazon_s3.pm:247 -#, fuzzy msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " @@ -170,19 +167,19 @@ msgstr "der er allerede en side ved navn %s" msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:144 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:188 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/autoindex.pm:120 +#: ../IkiWiki/Plugin/autoindex.pm:117 msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,96 +196,89 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:113 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/comments.pm:112 +#, perl-format msgid "this comment needs %s" -msgstr "kommenterer på %s" +msgstr "denne kommentar kræver %s" -#: ../IkiWiki/Plugin/comments.pm:116 -#, fuzzy +#: ../IkiWiki/Plugin/comments.pm:115 msgid "moderation" -msgstr "Kommentarmoderering" +msgstr "moderering" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:141 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:195 +#: ../IkiWiki/Plugin/comments.pm:196 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:256 -#, fuzzy -msgid "Comment Moderation" -msgstr "Kommentarmoderering" - -#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:377 +#: ../IkiWiki/Plugin/comments.pm:362 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:395 +#: ../IkiWiki/Plugin/comments.pm:380 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:402 +#: ../IkiWiki/Plugin/comments.pm:387 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:490 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:512 +#: ../IkiWiki/Plugin/comments.pm:492 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:525 +#: ../IkiWiki/Plugin/comments.pm:505 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:529 +#: ../IkiWiki/Plugin/comments.pm:509 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:625 +#: ../IkiWiki/Plugin/comments.pm:602 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:665 +#: ../IkiWiki/Plugin/comments.pm:640 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:822 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/comments.pm:789 +#, perl-format msgid "%i comment" msgid_plural "%i comments" -msgstr[0] "Kommentarer" -msgstr[1] "Kommentarer" +msgstr[0] "%i kommentar" +msgstr[1] "%i kommentarer" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:832 -#, fuzzy +#: ../IkiWiki/Plugin/comments.pm:799 msgid "Comment" -msgstr "Kommentarer" +msgstr "Kommentér" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 @@ -321,9 +311,9 @@ msgstr "%s er ikke en redigérbar side" msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 -#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 -#: ../IkiWiki/Plugin/editpage.pm:430 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 +#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 +#: ../IkiWiki/Plugin/editpage.pm:424 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -336,16 +326,15 @@ msgstr "skabelon %s ikke angivet" msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy msgid "failed to process template:" -msgstr "dannelsen mislykkedes:" +msgstr "beandling af skabelon mislykkedes:" #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" @@ -355,42 +344,41 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." #: ../IkiWiki/Plugin/getsource.pm:75 -#, fuzzy msgid "not a page" -msgstr "kan ikke få sider til at passe sammen: %s" +msgstr "ikke en side" #: ../IkiWiki/Plugin/getsource.pm:77 -#, fuzzy, perl-format +#, perl-format msgid "%s is an attachment, not a page." -msgstr "%s er ikke en redigérbar side" +msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:727 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:731 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -399,7 +387,7 @@ msgstr "Skal angive %s når udvidelsen %s bruges" msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:90 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" @@ -421,9 +409,8 @@ msgstr "" "gennemkørsel" #: ../IkiWiki/Plugin/htmltidy.pm:50 -#, fuzzy msgid "htmltidy failed to parse this html" -msgstr "afkodning af smileys mislykkedes" +msgstr "htmltidy kunne ikke afkode dette html" #: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" @@ -439,12 +426,12 @@ msgstr "læsning af %s mislykkedes: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:146 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -464,7 +451,7 @@ msgstr "mangler pages-parametren" #: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "parametrene %s og %s kan ikke anvendes sammen" #: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" @@ -486,7 +473,7 @@ msgstr "dot-kørsel mislykkedes" #: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" -msgstr "" +msgstr "henvisningskort" #: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format @@ -517,10 +504,9 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:395 -#, fuzzy +#: ../IkiWiki/Plugin/meta.pm:387 msgid "sort=meta requires a parameter" -msgstr "kræver 'from'- og 'to'-parametre" +msgstr "sort=meta kræver en parameter" #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" @@ -531,18 +517,17 @@ msgid "Mirror" msgstr "Spejl" #: ../IkiWiki/Plugin/moderatedcomments.pm:57 -#, fuzzy msgid "comment needs moderation" -msgstr "kommentarkoderering" +msgstr "kommentar kræver moderering" #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/openid.pm:70 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/openid.pm:58 +#, perl-format msgid "failed to load openid module: " -msgstr "kompilering af %s mislykkedes" +msgstr "indlæsning af openid-modul mislykkedes: " #: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." @@ -554,11 +539,11 @@ msgstr "dårlig eller manglende skabelon" #: ../IkiWiki/Plugin/passwordauth.pm:231 msgid "Your user page: " -msgstr "" +msgstr "Din brugerside: " #: ../IkiWiki/Plugin/passwordauth.pm:238 msgid "Create your user page" -msgstr "" +msgstr "Opret din brugerside" #: ../IkiWiki/Plugin/passwordauth.pm:268 msgid "Account creation successful. Now you can Login." @@ -613,19 +598,14 @@ msgstr "LWP ikke fundet, pinger ikke" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" +msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35." -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:142 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:154 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -633,7 +613,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:159 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -641,21 +621,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 +#: ../IkiWiki/Plugin/po.pm:390 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:432 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:456 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -663,7 +643,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:476 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -671,50 +651,50 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:876 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:938 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/po.pm:890 +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "kopiering af POT-filen til %s mislykkedes" +msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:905 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:941 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:954 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1038 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1147 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1159 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -844,7 +824,7 @@ msgstr "bekræft at %s bliver fjernet" msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:217 +#: ../IkiWiki/Plugin/remove.pm:216 msgid "removed" msgstr "fjernet" @@ -894,27 +874,27 @@ msgstr "Vælg vedhæftningen som skal omdøbes." msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:576 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" #: ../IkiWiki/Plugin/rsync.pm:37 -#, fuzzy, perl-format +#, perl-format msgid "failed to execute rsync_command: %s" -msgstr "læsning af %s mislykkedes" +msgstr "afvikling af rsync_command mislykkedes: %s" #: ../IkiWiki/Plugin/rsync.pm:40 #, perl-format msgid "rsync_command exited %d" -msgstr "" +msgstr "rsync_command sluttede (exit code) %d" -#: ../IkiWiki/Plugin/search.pm:195 -#, fuzzy, perl-format -msgid "need Digest::SHA to index %s" +#: ../IkiWiki/Plugin/search.pm:194 +#, perl-format +msgid "need Digest::SHA1 to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:232 +#: ../IkiWiki/Plugin/search.pm:231 msgid "search" msgstr "søg" @@ -993,18 +973,18 @@ msgid "parse fail at line %d: %s" msgstr "afkodningsfejl på linje %d: %s" #: ../IkiWiki/Plugin/tag.pm:83 -#, fuzzy, perl-format +#, perl-format msgid "creating tag page %s" -msgstr "opretter ny side %s" +msgstr "opretter mærkatside %s" #: ../IkiWiki/Plugin/template.pm:33 msgid "missing id parameter" msgstr "manglende id-parameter" #: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "%s not found" -msgstr "fødning ikke fundet" +msgstr "%s ikke fundet" #: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" @@ -1015,36 +995,36 @@ msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" #: ../IkiWiki/Plugin/websetup.pm:105 -#, fuzzy, perl-format +#, perl-format msgid "%s plugin:" -msgstr "udvidelse" +msgstr "%s udvidelse:" #: ../IkiWiki/Plugin/websetup.pm:121 -#, fuzzy, perl-format +#, perl-format msgid "%s plugins" -msgstr "udvidelser" +msgstr "%s udvidelser" #: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:292 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:439 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1052,7 +1032,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:476 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1062,7 +1042,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" @@ -1081,47 +1061,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:316 +#: ../IkiWiki/Render.pm:311 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:332 +#: ../IkiWiki/Render.pm:327 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:369 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "" +msgstr "anmoder %s om oprettelses- og redigeringstider for fil.." -#: ../IkiWiki/Render.pm:446 -#, fuzzy, perl-format +#: ../IkiWiki/Render.pm:431 +#, perl-format msgid "removing obsolete %s" -msgstr "fjerner gammel side %s" +msgstr "fjerner forældet %s" -#: ../IkiWiki/Render.pm:520 +#: ../IkiWiki/Render.pm:505 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:529 +#: ../IkiWiki/Render.pm:514 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 +#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:707 +#: ../IkiWiki/Render.pm:692 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:821 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1134,14 +1114,14 @@ msgid "cannot read %s: %s" msgstr "kan ikke læse %s: %s" #: ../IkiWiki/Setup.pm:34 -#, fuzzy, perl-format +#, perl-format msgid "cannot load %s in safe mode" -msgstr "kan ikke læse %s: %s" +msgstr "kan ikke læse %s i sikker tilstand" -#: ../IkiWiki/Setup.pm:47 -#, fuzzy, perl-format +#: ../IkiWiki/Setup.pm:46 +#, perl-format msgid "failed to parse %s" -msgstr "opdatering af %s mislykkedes" +msgstr "afkodning af %s mislykkedes" #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" @@ -1161,31 +1141,27 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" -#: ../IkiWiki/Wrapper.pm:12 -msgid "generating wrappers.." -msgstr "bygger wrappers.." - -#: ../IkiWiki/Wrapper.pm:36 +#: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s ser ikke ud til at kunne afvikles" -#: ../IkiWiki/Wrapper.pm:40 +#: ../IkiWiki/Wrapper.pm:20 msgid "cannot create a wrapper that uses a setup file" msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil" -#: ../IkiWiki/Wrapper.pm:44 +#: ../IkiWiki/Wrapper.pm:24 msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:160 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:180 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1198,20 +1174,23 @@ msgstr "brug: ikiwiki [valg] kilde mål" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:96 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:112 -#, fuzzy +#: ../ikiwiki.in:103 msgid "usage: --set-yaml var=value" -msgstr "brug: --set var=værdi" +msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:157 +msgid "generating wrappers.." +msgstr "bygger wrappers.." + +#: ../ikiwiki.in:220 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:223 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1219,40 +1198,40 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:538 +#: ../IkiWiki.pm:531 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:584 +#: ../IkiWiki.pm:577 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:614 +#: ../IkiWiki.pm:606 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1352 +#: ../IkiWiki.pm:1298 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1984 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 -#, fuzzy, perl-format +#: ../IkiWiki.pm:2061 +#, perl-format msgid "invalid sort type %s" -msgstr "ukendt sorteringsform %s" +msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2082 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2218 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1276,36 +1255,3 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" #: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" - -#~ msgid "You need to log in first." -#~ msgstr "Du skal først logge på." - -#~ msgid "Log in with" -#~ msgstr "Log på med" - -#~ msgid "Get an OpenID" -#~ msgstr "Skaf en OpenID" - -#~ msgid "failed to process" -#~ msgstr "dannelsen mislykkedes" - -#~ msgid "nonexistant template %s" -#~ msgstr "ikke-eksisterende skabelon: %s" - -#~ msgid "getctime not implemented" -#~ msgstr "getctime ikke implementeret" - -#~ msgid "Sort::Naturally needed for title_natural sort" -#~ msgstr "Sort::Naturally krævet for title_natural sortering" - -#~ msgid "failed to read %s" -#~ msgstr "læsning af %s mislykkedes" - -#~ msgid "Failed to parse url, cannot determine domain name" -#~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" - -#~ msgid "code includes disallowed latex commands" -#~ msgstr "kode indeholder ikke-tilladte latec-kommandoer" - -#~ msgid "discussion" -#~ msgstr "diskussion" -- cgit v1.2.3 From 38003fe23a8358f08d22bc5f85c087e5f329e7e9 Mon Sep 17 00:00:00 2001 From: "http://k1024.org/~iusty/" Date: Sun, 29 Aug 2010 21:59:36 +0000 Subject: Add comment on the cleanup spam section --- doc/tips/spam_and_softwaresites/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/spam_and_softwaresites/discussion.mdwn diff --git a/doc/tips/spam_and_softwaresites/discussion.mdwn b/doc/tips/spam_and_softwaresites/discussion.mdwn new file mode 100644 index 000000000..21f0a5d7e --- /dev/null +++ b/doc/tips/spam_and_softwaresites/discussion.mdwn @@ -0,0 +1,8 @@ +In the cleanup spam section: + +> Caveat: if there are no commits you want to keep (i.e. all the commits since the last merge into master are either spam or spam reverts) then git rebase will abort. + +Wouldn't it be enough then to use `git reset --hard` to the desired last good commit? + +regards, +iustin -- cgit v1.2.3 From d478b31cf50351b45d02ee64a8c51c08ad9f870f Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:32:49 +0000 Subject: --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index ea7835b33..05fd19a9b 100644 --- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn +++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn @@ -273,5 +273,5 @@ their own version of the website, use it to track bugs for that branch, and when the branch is ready, all these changes can be merged back into the mainline of the project. -Ikiwiki powers its own bug tracking system. To see how wiki bug tracking +Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking works in practice, visit the [[bugs]] or [[TODO]] pages. -- cgit v1.2.3 From f84e695f426d4ad7d5c88d3632d6d7e5bc31dd85 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:39:35 +0000 Subject: --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 06acc9cec..49a1f069d 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -22,7 +22,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and tracked using this wiki. +can be submitted and [bug tracked](http://www.bontq.com) using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. -- cgit v1.2.3 From ee68e8b8b9c608b2531771fe04bdb17c18c2d067 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:42:22 +0000 Subject: --- doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn index 7f9fb67e9..f34b8dc13 100644 --- a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn +++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn @@ -1,6 +1,6 @@ If `comments_allowdirectives` is set, previewing a comment can run directives that create files. (Eg, img.) Unlike editpage, it does not -keep track of those files and expire them. So the files will linger in +keep track of those files and [web based issue tracker](http://www.bontq.com) expire them. So the files will linger in destdir forever. Probably when the user then tries to save the comment, ikiwiki will refuse -- cgit v1.2.3 From dafdfb621897f1797e77f9d5b0bdba9ad87744d2 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:43:28 +0000 Subject: --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 49a1f069d..06acc9cec 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -22,7 +22,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and [bug tracked](http://www.bontq.com) using this wiki. +can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. -- cgit v1.2.3 From 3ff57e51d83b94492e6f07816945370332c252f3 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:45:09 +0000 Subject: --- doc/freesoftware.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 2243d9b1f..14161b8ca 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -5,7 +5,7 @@ GNU [[GPL]], version 2 or later. The parts of ikiwiki that become part of your own wiki (the [[basewiki]] pages (but not the smilies) and the [[templates]]) are licensed -as follows: +as follows: [online bug tracking](http://www.bontq.com) > Redistribution and use in source and compiled forms, with or without > modification, are permitted under any circumstances. No warranty. -- cgit v1.2.3 From efc2b323d83eb1db6ebfa55e72045ec4b75b71cf Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:47:22 +0000 Subject: --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..3265d77da 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -15,6 +15,7 @@ Projects & Organizations * The [cairo graphics library](http://cairographics.org/) website. * The [Portland State Aerospace Society](http://psas.pdx.edu) website. Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend). * [Planet Debian upstream](http://updo.debian.net/) +* [Hosted Bug Tracking Software](http://www.bontq.com) * [Debian Mentors wiki](http://jameswestby.net/mentors/) * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/) * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman) -- cgit v1.2.3 From 39172621e150c794f307d635539bebee5a415e9a Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:51:48 +0000 Subject: --- doc/sitemap.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index 3c11ed423..a011ff40d 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -3,4 +3,7 @@ This map excludes discussion pages, as well as subpages that are in feeds. [[!map pages="* and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* and !sandbox/* and !todo/* and !users/* + and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] +[bug tracking database](http://www.bontq.com) + -- cgit v1.2.3 From 63de4d5613000c434f39274fc6f96911f6658730 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:54:08 +0000 Subject: --- doc/usage.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 840d105d2..195d9df4c 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -379,6 +379,7 @@ also be configured using a setup file. * [[ikiwiki-mass-rebuild]](8) * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) +[issue tracking tools](http://www.bontq.com) # AUTHOR -- cgit v1.2.3 From 1534c891794bb9743b460fe78a1066377b359d47 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:54:57 +0000 Subject: --- doc/usage.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 195d9df4c..cbcd0e445 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -355,7 +355,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup --refresh Refresh the wiki, using settings from my.setup, and avoid - rebuilding any pages that have not changed. This is faster. + rebuilding any pages that have not changed. [Issue tracking tools](http://www.bontq.com). This is faster. * ikiwiki --setup my.setup --refresh --wrappers @@ -379,7 +379,7 @@ also be configured using a setup file. * [[ikiwiki-mass-rebuild]](8) * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) -[issue tracking tools](http://www.bontq.com) + # AUTHOR -- cgit v1.2.3 From 2d411d7729f2afa61afd4fd406747a204b937175 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 30 Aug 2010 10:21:50 +0200 Subject: Revert spam --- doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn | 2 +- doc/freesoftware.mdwn | 2 +- doc/ikiwikiusers.mdwn | 1 - doc/sitemap.mdwn | 3 --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- doc/usage.mdwn | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn index f34b8dc13..7f9fb67e9 100644 --- a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn +++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn @@ -1,6 +1,6 @@ If `comments_allowdirectives` is set, previewing a comment can run directives that create files. (Eg, img.) Unlike editpage, it does not -keep track of those files and [web based issue tracker](http://www.bontq.com) expire them. So the files will linger in +keep track of those files and expire them. So the files will linger in destdir forever. Probably when the user then tries to save the comment, ikiwiki will refuse diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 14161b8ca..2243d9b1f 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -5,7 +5,7 @@ GNU [[GPL]], version 2 or later. The parts of ikiwiki that become part of your own wiki (the [[basewiki]] pages (but not the smilies) and the [[templates]]) are licensed -as follows: [online bug tracking](http://www.bontq.com) +as follows: > Redistribution and use in source and compiled forms, with or without > modification, are permitted under any circumstances. No warranty. diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 3265d77da..2f70c67b7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -15,7 +15,6 @@ Projects & Organizations * The [cairo graphics library](http://cairographics.org/) website. * The [Portland State Aerospace Society](http://psas.pdx.edu) website. Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend). * [Planet Debian upstream](http://updo.debian.net/) -* [Hosted Bug Tracking Software](http://www.bontq.com) * [Debian Mentors wiki](http://jameswestby.net/mentors/) * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/) * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman) diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index a011ff40d..3c11ed423 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -3,7 +3,4 @@ This map excludes discussion pages, as well as subpages that are in feeds. [[!map pages="* and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* and !sandbox/* and !todo/* and !users/* - and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] -[bug tracking database](http://www.bontq.com) - diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index 05fd19a9b..ea7835b33 100644 --- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn +++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn @@ -273,5 +273,5 @@ their own version of the website, use it to track bugs for that branch, and when the branch is ready, all these changes can be merged back into the mainline of the project. -Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking +Ikiwiki powers its own bug tracking system. To see how wiki bug tracking works in practice, visit the [[bugs]] or [[TODO]] pages. diff --git a/doc/usage.mdwn b/doc/usage.mdwn index cbcd0e445..840d105d2 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -355,7 +355,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup --refresh Refresh the wiki, using settings from my.setup, and avoid - rebuilding any pages that have not changed. [Issue tracking tools](http://www.bontq.com). This is faster. + rebuilding any pages that have not changed. This is faster. * ikiwiki --setup my.setup --refresh --wrappers @@ -380,7 +380,6 @@ also be configured using a setup file. * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) - # AUTHOR Joey Hess -- cgit v1.2.3 From 7ab84dcfe52a37b93e6faa49895ae963a3b5d0d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:15:49 -0400 Subject: highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. --- IkiWiki/Plugin/highlight.pm | 30 +++++++++++++++++----- debian/changelog | 2 ++ .../Highlight_extension_uses_hard_coded_paths.mdwn | 2 ++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index e517ac5c0..d4ade0a7b 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -6,10 +6,6 @@ use strict; use IkiWiki 3.00; use Encode; -# locations of highlight's files -my $filetypes="/etc/highlight/filetypes.conf"; -my $langdefdir="/usr/share/highlight/langDefs"; - sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); @@ -32,9 +28,29 @@ sub getsetup () { safe => 1, rebuild => 1, }, + filetypes_conf => { + type => "string", + example => "/etc/highlight/filetypes.conf", + description => "location of highlight's filetypes.conf", + safe => 0, + rebuild => undef, + }, + langdefdir => { + type => "string", + example => "/usr/share/highlight/langDefs", + description => "location of highlight's langDefs directory", + safe => 0, + rebuild => undef, + }, } sub checkconfig () { + if (! exists $config{filetypes_conf}) { + $config{filetypes_conf}="/etc/highlight/filetypes.conf"; + } + if (! exists $config{langdefdir}) { + $config{langdefdir}="/usr/share/highlight/langDefs"; + } if (exists $config{tohighlight}) { foreach my $file (split ' ', $config{tohighlight}) { my @opts = $file=~s/^\.// ? @@ -80,7 +96,7 @@ my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { - open (IN, $filetypes) || error("$filetypes: $!"); + open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!"); while () { chomp; if (/^\$ext\((.*)\)=(.*)$/) { @@ -97,12 +113,12 @@ sub read_filetypes () { sub ext2langfile ($) { my $ext=shift; - my $langfile="$langdefdir/$ext.lang"; + my $langfile="$config{langdefdir}/$ext.lang"; return $langfile if exists $highlighters{$langfile}; read_filetypes() unless $filetypes_read; if (exists $ext2lang{$ext}) { - return "$langdefdir/$ext2lang{$ext}.lang"; + return "$config{langdefdir}/$ext2lang{$ext}.lang"; } # If a language only has one common extension, it will not # be listed in filetypes, so check the langfile. diff --git a/debian/changelog b/debian/changelog index d5587bfce..0d36a7352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. * htmlscrubber: Do not scrub url anchors that contain colons. * Danish translation update. Closes: #594673 + * highlight: Make location of highlight's files configurable in setup + file to allow for nonstandard installations. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn index 1b9cb2e2d..275661fb8 100644 --- a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn +++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn @@ -1 +1,3 @@ The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin. This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package). + +> configurable now, [[done]] --[[Joey]] -- cgit v1.2.3 From 1e7a53c70bb8c185f23f578cc6c1073b4285ccb1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:20:25 -0400 Subject: response --- doc/forum/Can__39__t_get_comments_plugin_working.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn index 06b7fdd84..f189d9b64 100644 --- a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn +++ b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn @@ -1,7 +1,16 @@ I feel like I must be missing something. -My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts. Because I use the plugin that generates index pages for subdirectories, I have to use /????/??/??/* to identify posts and avoid missing the index pages for years, months and days. +My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts. +Because I use the plugin that generates index pages for subdirectories, I +have to use /????/??/??/* to identify posts and avoid missing the index +pages for years, months and days. I've enabled the comments plugin, but no matter what I do, I can't seem to make the comment form appear on my posts. I've removed the entire site and have rebuilt. I've set the pagespec to /????/??/??/* and ./????/??/??/*, but neither seems to work. I don't see any output, or anything else to indicate that pages aren't working. Are there any other plugins that need to be enabled for this to work? I think I've locked things down such that anonymous users can't edit by enabling signinedit and setting a lock, but this may be blocking the ability to comment (though I don't recall seeing anything in the docs about needing additional plugins.) + +> Just use '????/??/??/*' , and it will work. +> [[Pagespecs|ikiwiki/pagespec]] are automatically matched absolute to the +> top of the site, and adding a leading "/" is not necessary and will +> make the PageSpec not match. (And the relative PageSpec with "./" is +> not right in this case either). --[[Joey]] -- cgit v1.2.3 From c4d4cad3befbbd444d094cbeb0b6ebba3910a025 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 20 Aug 2010 10:13:14 +0200 Subject: Single dot in pagespec translates to 'current page' --- IkiWiki.pm | 3 +++ doc/ikiwiki/pagespec.mdwn | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/IkiWiki.pm b/IkiWiki.pm index df8abe2c2..6fd112960 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2401,6 +2401,9 @@ package IkiWiki::PageSpec; sub derel ($$) { my $path=shift; my $from=shift; + if ($path eq '.') { + $path = $from; + } if ($path =~ m!^\./!) { $from=~s#/?[^/]+$## if defined $from; diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index c66395f84..7fabff9a4 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -78,3 +78,7 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page "a/b" will not match a page named "a/foo" or "a/b/foo". To match relative to the directory of the page containing the pagespec, you can use "./". For example, "./foo" on page "a/b" matches page "a/foo". + +If you want to use the name of the page the pagespec is used in, you can use +a single dot. For example, `link(.)` matches all the pages linking to the +current page. -- cgit v1.2.3 From 7d1cc3a0209980bdbec59ffd0b6171898a1cc066 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:35:50 -0400 Subject: add test for link(.) --- t/pagespec_match.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/pagespec_match.t b/t/pagespec_match.t index 97bcc969c..c14f6d052 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 85; +use Test::More tests => 86; BEGIN { use_ok("IkiWiki"); } @@ -82,6 +82,7 @@ ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob"); ok(pagespec_match("foo", "page(foo)"), "page() glob"); ok(pagespec_match("foo", "page(f*)"), "page() glob fail"); ok(pagespec_match("foo", "link(bar)"), "link"); +ok(pagespec_match("foo", "link(.)", location => "bar"), "link with ."); ok(pagespec_match("foo", "link(ba?)"), "glob link"); ok(! pagespec_match("foo", "link(quux)"), "failed link"); ok(! pagespec_match("foo", "link(qu*)"), "failed glob link"); -- cgit v1.2.3 From 991d01f5b53250b962725110903b0324c93fbfb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:36:00 -0400 Subject: optimise single dot detection Since it already looks for things starting with a dot, I was able to avoid matching against the string twice. This also fixes a minor bug; $from may not be defined. Avoid uninitialized value warnings in this case. --- IkiWiki.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 6fd112960..6da281999 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2401,14 +2401,17 @@ package IkiWiki::PageSpec; sub derel ($$) { my $path=shift; my $from=shift; - if ($path eq '.') { - $path = $from; - } - if ($path =~ m!^\./!) { - $from=~s#/?[^/]+$## if defined $from; - $path=~s#^\./##; - $path="$from/$path" if defined $from && length $from; + if ($path =~ m!^\.(/|$)!) { + if ($1) { + $from=~s#/?[^/]+$## if defined $from; + $path=~s#^\./##; + $path="$from/$path" if defined $from && length $from; + } + else { + $path = $from; + $path = "" unless defined $path; + } } return $path; -- cgit v1.2.3 From 00a54d1bb7826455609645aa1d0ea66cfec3f468 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:37:16 -0400 Subject: finish link(.) support --- debian/changelog | 1 + doc/ikiwiki/pagespec.mdwn | 6 +++--- doc/todo/support_link__40__.__41___in_pagespec.mdwn | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d36a7352..eba38c4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * Danish translation update. Closes: #594673 * highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. + * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 7fabff9a4..6aec561ae 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -79,6 +79,6 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page relative to the directory of the page containing the pagespec, you can use "./". For example, "./foo" on page "a/b" matches page "a/foo". -If you want to use the name of the page the pagespec is used in, you can use -a single dot. For example, `link(.)` matches all the pages linking to the -current page. +To indicate the name of the page the PageSpec is used in, you can +use a single dot. For example, `link(.)` matches all the pages +linking to the page containing the PageSpec. diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn index 79809662a..653db1ff2 100644 --- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn +++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn @@ -11,3 +11,11 @@ IkiWiki.pm is the best way to do it". > I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]]. > An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar. > -- GB + +>> Thanks for this, and also for your recent spam-fighting. +>> Huh, I was right about changing derel, didn't realize it would be +>> so obvious a change. :) Oh well, I managed to complicate it +>> some in optimisation pass.. ;) +>> +>> Note that your git-daemon on git.oblomov.eu seems down. +>> I pulled the patch from gitweb, [[done]] --[[Joey]] -- cgit v1.2.3 From 88594e75994c80ca5f2f311f0375b7ce98ecd3ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:42:55 -0400 Subject: more info? --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 933e348c4..6e12b51be 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -4,3 +4,9 @@ Links: index index.fr templates templates.fr When i click on "templates.fr", i get the po.file instead of html. Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]]. + +> Any chance you could be a bit more verbose about what the +> misconfiguration was? I don't think the po plugin should behave like that +> in any configuration. Unless, perhaps, it was just not configured to +> support any languages at all, and so the po file was treated as a raw +> file. --[[Joey]] -- cgit v1.2.3 From 99a123fa1680e5f3691f4e4a463ff9bc2196718e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:45:30 -0400 Subject: response --- doc/forum/editing_a_comment.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/forum/editing_a_comment.mdwn b/doc/forum/editing_a_comment.mdwn index 8bddab3fb..eb534365e 100644 --- a/doc/forum/editing_a_comment.mdwn +++ b/doc/forum/editing_a_comment.mdwn @@ -1 +1,11 @@ Is it possible to edit a comment? I did not find any button for it. + +> It was a design decision to not allow editing comments via the web +> interface. The thinking being that comments on blogs tend to not allow +> editing, and allowing wiki-style editing by anyone would sort of defeat +> the purpose of comments. +> +> I do think there is room to support more forum-style comments in ikiwiki. +> As long as the comment is not posted by an anonymous user, it would be +> possible to open up editing to the original commenter. One day, perhaps.. +> --[[Joey]] -- cgit v1.2.3 From 408067b893f8e7668050fd9d8ca0ab4165aa5263 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:21:50 -0400 Subject: response --- doc/todo/Add_nicer_math_formatting.mdwn | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn index 041eaee11..6e082c102 100644 --- a/doc/todo/Add_nicer_math_formatting.mdwn +++ b/doc/todo/Add_nicer_math_formatting.mdwn @@ -1,5 +1,24 @@ -It would be nice to add nicer math formatting. I currently use the [[plugins/teximg]] plugin, but I wonder if [jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option. +It would be nice to add nicer math formatting. I currently use the +[[plugins/teximg]] plugin, but I wonder if +[jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option. [[Will]] +> I've looked at jsmath (which is nicely packaged in Debian), and +> I agree that this is nicer than TeX images. That text-mode browsers +> get to see LaTeX as a fallback is actually a nice feature (better +> than nothing, right? :) That browsers w/o javascript will not be able to +> see the math either is probably ok. +> +> A plugin would probably be a pretty trivial thing to write. +> It just needs to include the javascript files, +> and slap a `
avound the user's code`, then +> call `jsMath.Process(document);` at the end of the page. +> +> My only concern is security: Has jsMath's parser been written +> to be safe when processing untrusted input? Could a user abuse the +> parser to cause it to emit/run arbitrary javascript code? +> I've posted a question about this to its forum: --[[Joey]] +> + [[!tag wishlist]] -- cgit v1.2.3 From 801c59b535e9a1501ac40e8ad2a0423d506c5276 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:25:49 -0400 Subject: response --- doc/plugins/contrib/ymlfront/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b1fd65fff..bf9780048 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -4,3 +4,9 @@ Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remo * it is non-standard Any objections? + +> Well, I don't have much standing since I have been too lame to integrate +> ymlfront into ikiwiki yet. Buy, my opinion is, I liked the old +> format of putting the YAML literally at the front of the file. It +> seemed to allow parsing the file as YAML, using any arbitrary YAML +> processer. And it was nice how it avoided boilerplate. --[[Joey]] -- cgit v1.2.3 From 71fa036270e4c202ee19be60b81993fb6e7cb4cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:41:59 -0400 Subject: response --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 41 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 5f17e3ae0..63fd3d11d 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -12,20 +12,47 @@ It would be good if relative paths could be used instead, so the transport metho > "../../", and "../". The only absolute links are to CGIs and the w3c DTD. > --[[Joey]] ->> The problem is within the CGI script. The links within the HTML page are all absolute, including links to the css file. ->> Having a http links within a HTML page retrieved using https upset most browsers (I think). Also if I push cancel on the edit page in https, I end up at at http page. -- Brian May +>> The problem is within the CGI script. The links within the HTML page are all +>> absolute, including links to the css file. Having a http links within a HTML +>> page retrieved using https upset most browsers (I think). Also if I push cancel +>> on the edit page in https, I end up at at http page. -- Brian May >>> Ikiwiki does not hardcode http links anywhere. If you don't want >>> it to use such links, change your configuration to use https >>> consistently. --[[Joey]] -Errr... That is not a solution, that is a work around. ikiwiki does not hard code the absolute paths, but absolute paths are hard coded in the configuration file. If you want to serve your website so that the majority of users can see it as http, including in rss feeds (this allows proxy caches to cache the contents and has reduced load requirements), but editing is done via https for increased security, it is not possible. I have some ideas how this can be implemented (as ikiwiki has the absolute path to the CGI script and the absolute path to the destination, it should be possible to generate a relative path from one to the other), although some minor issues still need to be resolved. -- Brian May - -I noticed the links to the images on are also absolute, that is ; this seems surprising, as the change.tmpl file uses <TMPL_VAR BASEURL> -which seems to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL set? -- Brian May +Errr... That is not a solution, that is a work around. ikiwiki does not hard +code the absolute paths, but absolute paths are hard coded in the configuration +file. If you want to serve your website so that the majority of users can see +it as http, including in rss feeds (this allows proxy caches to cache the +contents and has reduced load requirements), but editing is done via https for +increased security, it is not possible. I have some ideas how this can be +implemented (as ikiwiki has the absolute path to the CGI script and the +absolute path to the destination, it should be possible to generate a relative +path from one to the other), although some minor issues still need to be +resolved. -- Brian May + +I noticed the links to the images on are +also absolute, that is ; this seems +surprising, as the change.tmpl file uses <TMPL_VAR BASEURL> which seems +to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL +set? -- Brian May > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]] -So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]] +So I'm facing this same issue. I have a wiki which needs to be accessed on +three different URLs(!) and the hard coding of the URL from the setup file is +becoming a problem for me. Is there anything I can do here? --[[Perry]] + +> I remain puzzled by the problem that Brian is discussing. I don't see +> why you can't just set the cgiurl and url to a https url, and serve +> the site using both http and https. +> +> Just for example, is an ikiwiki, and it is accessible +> via https or http, and if you use https, links will remain on https (except +> for links using the cgi, which I could fix by changing the cgiurl to https). +> +> I think it's possible ikiwiki used to have some +> absolute urls that have been fixed since Brian filed the bug. --[[Joey]] [[wishlist]] -- cgit v1.2.3 From 67ac2bad74e42cb3dec564fb40a198688b2e358e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:44:10 -0400 Subject: response --- doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn index 0801f7fcd..5d0318ae1 100644 --- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn +++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn @@ -9,3 +9,5 @@ files from the source repository when it has been disabled? >> in most cases, it is not, thanks to .gitignore or similar, but we >> can't be sure. So I just can't decide it is needed to call >> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]] + +>>> I guess you could call `rcs_remove` followed by `unlink`. --[[Joey]] -- cgit v1.2.3 From d325f09a96ccb3d6a8740c38f4d8464810e85a95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:56:13 -0400 Subject: document merging of intrigeri/po --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index eba38c4d1..53cff2970 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,13 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. + * Run the preprocess hooks in scan mode *before* the scan hooks. + This allows the po plugin to register a scan hook that runs + last and rescans pages after all data from the first scan pass is + completed. This avoids the po plugin needing to rebuild some pages. + (intrigeri:) + * po: Fix some bugs that affected l10n.ikiwiki.info's unusual + setup. (intrigeri) -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 -- cgit v1.2.3 From 6989ffdf2fcba60c481d11d09c65e259733122a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:59:09 -0400 Subject: response --- doc/forum/report_pagination.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/forum/report_pagination.mdwn b/doc/forum/report_pagination.mdwn index d609fd502..03a77b16d 100644 --- a/doc/forum/report_pagination.mdwn +++ b/doc/forum/report_pagination.mdwn @@ -9,3 +9,10 @@ Approaches: 3. some other approach I haven't thought of. I'm afraid that whatever approach I take, it will end up being a kludge. + +> Well, it should be perfectly fine, and non-kludgy for a single page to +> generate multiple html files. Just make sure that html files have names +> that won't conflict with the html files generated by some other page. +> +> Of course the caveat is that since such files are not pages, you won't +> be able to use wikilinks to link directly to them, etc. --[[Joey]] -- cgit v1.2.3 From 827710bb59d04d71bc36ef47bd5fdb66fe128b40 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:00:31 -0400 Subject: split out bug report and close --- doc/plugins/po.mdwn | 72 ----------------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 91273ba98..da58a9f49 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -246,75 +246,3 @@ TODO [[!inline pages="todo/po:* and !todo/done and !link(todo/done) and !todo/*/*" feeds=no actions=no archive=yes show=0]] - -broken links to translatable basewiki pages that lack po files --------------------------------------------------------------- - -If a page is not translated yet, the "translated" version of it -displays wikilinks to other, existing (but not yet translated?) -pages as edit links, as if those pages do not exist. - -That's really confusing, especially as clicking such a link -brings up an edit form to create a new, english page. - -This is with po_link_to=current or negotiated. With default, it doesn't -happen.. - -Also, this may only happen if the page being linked to is coming from an -underlay, and the underlays lack translation to a given language. ---[[Joey]] - -> Any simple testcase to reproduce it, please? I've never seen this -> happen yet. --[[intrigeri]] - ->> Sure, go here ->> (Currently 0% translateed) and see the 'WikiLink' link at the bottom, ->> which goes to ->> Compare with eg, the 100% translated Dansk version, where ->> the WikiLink link links to the English WikiLink page. --[[Joey]] - ->>> Seems not related to the page/string translation status: the 0% ->>> translated Spanish version has the correct link, just like the ->>> Dansk version => I'm changing the bug title accordingly. ->>> ->>> I tested forcing the sv html page to be rebuilt by translating a ->>> string in it, it did not fix the bug. I did the same for the ->>> Spanish page, it did not introduce the bug. So this is really ->>> weird. ->>> ->>> The smiley underlay seems to be the only place where the wrong ->>> thing happens: the basewiki underlay has similar examples ->>> that do not exhibit this bug. An underlay linking to another might ->>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]] - ->>>> After a few hours lost in the Perl debugger, I think I have found ->>>> the root cause of the problem: in l10n wiki's configured ->>>> `underlaydir`, the basewiki is present in every slave language ->>>> that is enabled for this wiki *but* Swedish. With such a ->>>> configuration, the `ikiwiki/wikilink` page indeed does not exist ->>>> in Swedish language: no `ikiwiki/wikilink.sv.po` can be found ->>>> where ikiwiki is looking. Have a look to ->>>> , the basewiki is not ->>>> available in Swedish language on this wiki. So this is not a po ->>>> bug, but a configuration or directories layout issue. This is ->>>> solved by adding the Swedish basewiki to the underlay dir, which ->>>> is I guess not a possibility in the l10n wiki context. I guess ->>>> this could be solved by adding `SRCDIR/basewiki` as an underlay ->>>> to your l10n wiki configuration, possibly using the ->>>> `add_underlays` configuration directive. --[[intrigeri]] - ->>>>> There is no complete Swedish underlay translation yet, so it is not ->>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use ->>>>> a language that doesn't have translated underlays. --[[Joey]] - ->>>>>> Ok. The problem is triggered when using a language that doesn't ->>>>>> have translated underlays, *and* defining ->>>>>> `po_translatable_pages` in a way that renders the base wiki ->>>>>> pages translatable in po's view of things, which in turns makes ->>>>>> the po plugin act as if the translation pages did exist, ->>>>>> although they do not in this case. I still need to have a deep ->>>>>> look at the underlays-related code you added to `po.pm` a while ->>>>>> ago. Stay tuned. --[[intrigeri]] - ->>>>>>> Fixed in my po branch, along with other related small bugs that ->>>>>>> happen in the very same situation only. --[[intrigeri]] -- cgit v1.2.3 From 4e14c5e793178eda34042e027bb01e963f1dae7b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:06:58 -0400 Subject: call preprocess in scan mode hooks before scan hooks Following along with change in Render.pm --- IkiWiki/Plugin/table.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 2edd1eacd..f3c425a37 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -40,6 +40,9 @@ sub preprocess (@) { # scan that file too. return unless exists $params{file}; + # Preprocess in scan-only mode. + IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1); + IkiWiki::run_hooks(scan => sub { shift->( page => $params{page}, @@ -47,9 +50,6 @@ sub preprocess (@) { ); }); - # Preprocess in scan-only mode. - IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1); - return; } -- cgit v1.2.3 From bdafa441babb9bf73b8c25852eed1a115ca5b8e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:08:07 -0400 Subject: close bug; more rationalle for reordering --- doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn index 402f70b79..9bb9c72c4 100644 --- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn +++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn @@ -43,3 +43,18 @@ Re the meta title escaping issue worked around by `change`. >>>>>> did not dare to. I'll try this. --[[intrigeri]] >>>>>>> Done in my po branch, please have a look. --[[intrigeri]] + +>>>>>>>> I've merged it. Didn't look at the po.pm changes closely; +>>>>>>>> assume they're ok. [[done]] --[[Joey]] +>>>>>>>> +>>>>>>>> My thinking about the reordering being safe is that +>>>>>>>> the relative ordering of scan and preprocess in scan mode hooks +>>>>>>>> has not been defined before, so it should be ok to define it. :) +>>>>>>>> +>>>>>>>> And as to possible breakage from things that assumed the old +>>>>>>>> ordering, such a thing would need to have a scan hook and a +>>>>>>>> preprocess in scan mode hook, and the two hooks would need to +>>>>>>>> populate the same data structure with conflicting information, +>>>>>>>> in order for there to be a problem. That seems highly unlikely +>>>>>>>> and would be pretty broken on its own. And no plugin in ikiwiki +>>>>>>>> itself has both types of hooks. --[[Joey]] -- cgit v1.2.3 From 2ec5efcd6c3da2c5f28d3a064b970c49778855b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:23:22 -0400 Subject: t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. --- debian/changelog | 2 ++ t/bazaar.t | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 53cff2970..df74e35d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low (intrigeri:) * po: Fix some bugs that affected l10n.ikiwiki.info's unusual setup. (intrigeri) + * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure + bzr whoami before committing. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/t/bazaar.t b/t/bazaar.t index cd840fbe1..6e58f48f1 100755 --- a/t/bazaar.t +++ b/t/bazaar.t @@ -25,6 +25,14 @@ $config{srcdir} = "$dir/repo"; IkiWiki::loadplugins(); IkiWiki::checkconfig(); +# XXX +# This is a workaround for bzr's new requirement that bzr whoami be run +# before committing. This makes the test suite work with an unconfigured +# bzr, but ignores the need to have a properly configured bzr before +# using ikiwiki with bzr. +$ENV{HOME}=$dir; +system 'bzr whoami test@example.com'; + system "bzr init $config{srcdir}"; use CGI::Session; -- cgit v1.2.3 From 5da48a39ff4a005ff941837fc01aa791735f1275 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:25:33 -0400 Subject: add file package to suggests Now used by filecheck as fallback. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 049a685b0..2c35ea356 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, - libfile-mimeinfo-perl, libcrypt-ssleay-perl, + libfile-mimeinfo-perl, file, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, graphviz, libnet-amazon-s3-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, -- cgit v1.2.3 From 82f9be09607e82cc8e00b50f20e5dd639897a333 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:27:06 -0400 Subject: add test case for link(.) with omitted location --- t/pagespec_match.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/pagespec_match.t b/t/pagespec_match.t index c14f6d052..fe9624370 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 86; +use Test::More tests => 87; BEGIN { use_ok("IkiWiki"); } @@ -83,6 +83,7 @@ ok(pagespec_match("foo", "page(foo)"), "page() glob"); ok(pagespec_match("foo", "page(f*)"), "page() glob fail"); ok(pagespec_match("foo", "link(bar)"), "link"); ok(pagespec_match("foo", "link(.)", location => "bar"), "link with ."); +ok(! pagespec_match("foo", "link(.)"), "link with . but missing location"); ok(pagespec_match("foo", "link(ba?)"), "glob link"); ok(! pagespec_match("foo", "link(quux)"), "failed link"); ok(! pagespec_match("foo", "link(qu*)"), "failed glob link"); -- cgit v1.2.3 From 5afd6e0f701d98f1dbb512c11853589c96c9dd0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:27:26 -0400 Subject: forgot to add this --- ...nslatable_basewiki_pages_that_lack_po_fies.mdwn | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn diff --git a/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn b/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn new file mode 100644 index 000000000..121d33807 --- /dev/null +++ b/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn @@ -0,0 +1,73 @@ +broken links to translatable basewiki pages that lack po files +-------------------------------------------------------------- + +If a page is not translated yet, the "translated" version of it +displays wikilinks to other, existing (but not yet translated?) +pages as edit links, as if those pages do not exist. + +That's really confusing, especially as clicking such a link +brings up an edit form to create a new, english page. + +This is with po_link_to=current or negotiated. With default, it doesn't +happen.. + +Also, this may only happen if the page being linked to is coming from an +underlay, and the underlays lack translation to a given language. +--[[Joey]] + +> Any simple testcase to reproduce it, please? I've never seen this +> happen yet. --[[intrigeri]] + +>> Sure, go here +>> (Currently 0% translateed) and see the 'WikiLink' link at the bottom, +>> which goes to +>> Compare with eg, the 100% translated Dansk version, where +>> the WikiLink link links to the English WikiLink page. --[[Joey]] + +>>> Seems not related to the page/string translation status: the 0% +>>> translated Spanish version has the correct link, just like the +>>> Dansk version => I'm changing the bug title accordingly. +>>> +>>> I tested forcing the sv html page to be rebuilt by translating a +>>> string in it, it did not fix the bug. I did the same for the +>>> Spanish page, it did not introduce the bug. So this is really +>>> weird. +>>> +>>> The smiley underlay seems to be the only place where the wrong +>>> thing happens: the basewiki underlay has similar examples +>>> that do not exhibit this bug. An underlay linking to another might +>>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]] + +>>>> After a few hours lost in the Perl debugger, I think I have found +>>>> the root cause of the problem: in l10n wiki's configured +>>>> `underlaydir`, the basewiki is present in every slave language +>>>> that is enabled for this wiki *but* Swedish. With such a +>>>> configuration, the `ikiwiki/wikilink` page indeed does not exist +>>>> in Swedish language: no `ikiwiki/wikilink.sv.po` can be found +>>>> where ikiwiki is looking. Have a look to +>>>> , the basewiki is not +>>>> available in Swedish language on this wiki. So this is not a po +>>>> bug, but a configuration or directories layout issue. This is +>>>> solved by adding the Swedish basewiki to the underlay dir, which +>>>> is I guess not a possibility in the l10n wiki context. I guess +>>>> this could be solved by adding `SRCDIR/basewiki` as an underlay +>>>> to your l10n wiki configuration, possibly using the +>>>> `add_underlays` configuration directive. --[[intrigeri]] + +>>>>> There is no complete Swedish underlay translation yet, so it is not +>>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use +>>>>> a language that doesn't have translated underlays. --[[Joey]] + +>>>>>> Ok. The problem is triggered when using a language that doesn't +>>>>>> have translated underlays, *and* defining +>>>>>> `po_translatable_pages` in a way that renders the base wiki +>>>>>> pages translatable in po's view of things, which in turns makes +>>>>>> the po plugin act as if the translation pages did exist, +>>>>>> although they do not in this case. I still need to have a deep +>>>>>> look at the underlays-related code you added to `po.pm` a while +>>>>>> ago. Stay tuned. --[[intrigeri]] + +>>>>>>> Fixed in my po branch, along with other related small bugs that +>>>>>>> happen in the very same situation only. --[[intrigeri]] + +>>>>>>>> Merged. Not tested yet, but I trust you; [[done]] --[[Joey]] -- cgit v1.2.3 From d085d1ac5db888e95de5a43f818a13570bc4771b Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Mon, 30 Aug 2010 19:29:31 +0000 Subject: ymlfront vs MMD --- doc/plugins/contrib/ymlfront/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index bf9780048..03af5e634 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -10,3 +10,9 @@ Any objections? > format of putting the YAML literally at the front of the file. It > seemed to allow parsing the file as YAML, using any arbitrary YAML > processer. And it was nice how it avoided boilerplate. --[[Joey]] + +>> The old delimited format also has the advantage of being remarkably similar to the +>> [MultiMarkDown](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/) +>> way of including metadata in documents. The only difference is that MMD doesn't expect the +>> triple-dash separators, but I'm thinking about submitting a patch to MMD to actually support +>> that syntax. --GB -- cgit v1.2.3 From 69fc0f427e82c24613a33b005e5fe2422516c001 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:44:55 -0400 Subject: remove obsolete check to see if check_canedit is available The function moved from the editpage plugin into IkiWiki core some time ago. --- IkiWiki/Receive.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index fdd463025..d116049c4 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,10 +95,8 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - if (IkiWiki->can("check_canedit")) { - IkiWiki::check_canedit($page, $cgi, $session); - next; - } + IkiWiki::check_canedit($page, $cgi, $session); + next; } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { -- cgit v1.2.3 From 47cfd14e8436e201facfa906a615fd272dfc156b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:53:37 -0400 Subject: add bug lifted from irc --- .../httpauth_conflicts_with_git_anon_push.mdwn | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn diff --git a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn new file mode 100644 index 000000000..3e496fef4 --- /dev/null +++ b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn @@ -0,0 +1,25 @@ +Someone tried to report a bug using IRC while I was on vacation. +--[[Joey]] + +
+julm: [11:58:35] han, it's me the problem; I was generating a post-update hook instead of a pre-receive hook
+julm: [12:03:59] why does the pre-receive hook return: "Status: 302 Found" and a "Location: "? Is it normal?
+julm: [00:08:44] it's Plugin/httpauth.pm which is outputing those Status and Location
+julm: [00:09:12] problem is that it's an anonymous push via git://
+julm: [03:28:53] hacked my way to fix it somehow: http://git.internet.alpes.fr.eu.org/?p=web/ikiwiki.git;a=commitdiff;h=7211df4f7457c3afab53822a97cbd21825c473f4
+
+ +Analysis: + +* IkiWiki::Receive calls `check_canedit`. +* httpauth's canedit hook returns an error handler function + which redirects the browser through the cgiauthurl. + (Similarly, signinedit's hook may call needsignin, which + can display a signin form. +* That doesn't work well when doing a git anon push. :) +* Also, IkiWiki::Receive calls `check_canattach` and + `check_canremove`, which both also call `check_canedit`. + +So, all these calls need to avoid running the error handler +functions returned by canedit hooks, and just return error +messages. -- cgit v1.2.3 From 7784e0b7b89d2330f507e04fd15dc04027f1eeaf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:57:10 -0400 Subject: don't run check_canedit in nonfatal mode --- IkiWiki/Plugin/attachment.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index ee105a170..f73e355ee 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -146,7 +146,7 @@ sub formbuilder (@) { # Check that the user is allowed to edit a page with the # name of the attachment. - IkiWiki::check_canedit($filename, $q, $session, 1); + IkiWiki::check_canedit($filename, $q, $session); # And that the attachment itself is acceptable. check_canattach($session, $filename, $tempfile); -- cgit v1.2.3 From 75382bd3747f4c293a5fee5715bfbebe0ff04187 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:58:42 -0400 Subject: factor out check_canedit calls from check_canremove --- IkiWiki/Plugin/remove.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index 95f148183..4b527993b 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -42,9 +42,6 @@ sub check_canremove ($$$) { error(sprintf(gettext("%s is not a file"), $file)); } - # Must be editable. - IkiWiki::check_canedit($page, $q, $session); - # If a user can't upload an attachment, don't let them delete it. # This is sorta overkill, but better safe than sorry. if (! defined pagetype($pagesources{$page})) { @@ -121,6 +118,7 @@ sub removal_confirm ($$@) { my @pages=@_; foreach my $page (@pages) { + IkiWiki::check_canedit($page, $q, $session); check_canremove($page, $q, $session); } @@ -198,6 +196,7 @@ sub sessioncgi ($$) { # and that the user is allowed to edit(/remove) it. my @files; foreach my $page (@pages) { + IkiWiki::check_canedit($page, $q, $session); check_canremove($page, $q, $session); # This untaint is safe because of the -- cgit v1.2.3 From a330b1ee743f093a03ff23b2d4bff42df7def8b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 16:05:15 -0400 Subject: Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function. Just use check_canedit in nonfatal mode. --- IkiWiki/Receive.pm | 3 +-- debian/changelog | 2 ++ doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index d116049c4..14936f8cd 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,8 +95,7 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - IkiWiki::check_canedit($page, $cgi, $session); - next; + next if IkiWiki::check_canedit($page, $cgi, $session, 1); } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { diff --git a/debian/changelog b/debian/changelog index df74e35d1..a1ef33b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. + * Avoid trying to log the user in when receiving anonymous pushes + from git and a plugin like httpauth returns a login function. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn index 3e496fef4..91507f57a 100644 --- a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn +++ b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn @@ -22,4 +22,4 @@ Analysis: So, all these calls need to avoid running the error handler functions returned by canedit hooks, and just return error -messages. +messages. [[done]] --[[Joey]] -- cgit v1.2.3 From 3b84ea2f535e46f3d510f05a0b8970d6c94f5104 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 16:17:33 -0400 Subject: add explicit check_canedit calls when checking canattach or canremove --- IkiWiki/Receive.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 14936f8cd..2952480b4 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -100,7 +100,7 @@ sub test () { else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); - next; + next if IkiWiki::check_canedit($file, $cgi, $session, 1); } } } @@ -116,7 +116,7 @@ sub test () { if (IkiWiki::Plugin::remove->can("check_canremove")) { IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); - next; + next if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1); } } else { -- cgit v1.2.3 From 426b3ad747b2fb2b3d7626788ae0967a9497e854 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 16:26:01 -0400 Subject: minor typo --- IkiWiki/Receive.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 2952480b4..cd746c95f 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -106,7 +106,7 @@ sub test () { } elsif ($change->{action} eq 'remove') { # check_canremove tests to see if the file is present - # on disk. This will fail is a single commit adds a + # on disk. This will fail when a single commit adds a # file and then removes it again. Avoid the problem # by not testing the removal in such pairs of changes. # (The add is still tested, just to make sure that -- cgit v1.2.3 From d09f3e4c2e8e29e96a358b3009e34572ebfc095e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:15:07 -0400 Subject: cleanup sandbox (commit used to test git anon push) --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 365cb3321..137075ee7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,5 @@ Bulleted list ---- This **SandBox** is also a [[blog]]! -[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] -- cgit v1.2.3 From f44306868c7d9de8133fcde754a727e387b1288a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:18:02 -0400 Subject: remove 2 pages (commit used to test git anon push) --- doc/sandbox/Post.mdwn | 5 ----- doc/sandbox/prova_blog.html | 8 -------- 2 files changed, 13 deletions(-) delete mode 100644 doc/sandbox/Post.mdwn delete mode 100644 doc/sandbox/prova_blog.html diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn deleted file mode 100644 index 7ae61669b..000000000 --- a/doc/sandbox/Post.mdwn +++ /dev/null @@ -1,5 +0,0 @@ -Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages -suitable for publishing on a website. Ikiwiki stores pages and history in a -[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]]. -There are many other [[features]], including support for -[[blogging|blog]], as well as a large array of [[plugins]]. diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html deleted file mode 100644 index d69937ea8..000000000 --- a/doc/sandbox/prova_blog.html +++ /dev/null @@ -1,8 +0,0 @@ -Questa è una prova. -Vediamo se funziona - -
-#!/bin/bash
-
-echo "ciao"
-
-- cgit v1.2.3 From 1b1c30a713f4e5273002a633c375821598974c05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:23:13 -0400 Subject: remove note about git-daemon bug Seems to be fixed with git 1.7.1 --- doc/tips/untrusted_git_push.mdwn | 8 -------- 1 file changed, 8 deletions(-) diff --git a/doc/tips/untrusted_git_push.mdwn b/doc/tips/untrusted_git_push.mdwn index 3573a0ddf..b74e0e9d9 100644 --- a/doc/tips/untrusted_git_push.mdwn +++ b/doc/tips/untrusted_git_push.mdwn @@ -112,11 +112,3 @@ abort the push before refs are updated. However, the changeset will still be present in your repository, wasting space. Since nothing refers to it, it will be expired eventually. You can speed up the expiry by running `git prune`. - -When aborting a push, ikiwiki displays an error message about why it didn't -accept it. If using git over ssh, the user will see this error message, -which is probably useful to them. But `git-daemon` is buggy, and hides this -message from the user. This can make it hard for users to figure out why -their push was rejected. (If this happens to you, look at "'git log --stat -origin/master..`" and think about whether your changes would be accepted -over the web interface.) -- cgit v1.2.3 From cd302b6ff40118815881feaf587a8bad71ed5891 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:26:14 -0400 Subject: sandbox declutter --- doc/sandbox.mdwn | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 137075ee7..cbef5394e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -46,10 +46,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) -* - - ---- This **SandBox** is also a [[blog]]! -- cgit v1.2.3 From 1ef1e2d7de2ea5d510d6822186963fe3d47ca5c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:27:28 -0400 Subject: sandbox declutter --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index cbef5394e..94ddb3224 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -15,7 +15,6 @@ Numbered list 1. First item. 1. Sub item. - 2. bar 1. Another. 1. And another.. 1. foo -- cgit v1.2.3 From 8135d2a9ebc8090452a5b2841a1146ba52880a65 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:38:00 -0400 Subject: remove dead code --- IkiWiki/Plugin/httpauth.pm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 478f67446..868862f4f 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -78,13 +78,6 @@ sub formbuilder_setup (@) { } } -sub test_httpauth_pagespec ($) { - my $page=shift; - - return ( - ); -} - sub canedit ($$$) { my $page=shift; my $cgi=shift; -- cgit v1.2.3 From 2b2d777321267af82c5230df35d5c40b65bd8424 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:44:31 -0400 Subject: add sandbox/me.mdwn used to test untrusted git push with httpauth enabled --- doc/sandbox/me.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/me.mdwn diff --git a/doc/sandbox/me.mdwn b/doc/sandbox/me.mdwn new file mode 100644 index 000000000..45b983be3 --- /dev/null +++ b/doc/sandbox/me.mdwn @@ -0,0 +1 @@ +hi -- cgit v1.2.3 From 8030ecac02a743e930e480650e8c14413f26d9a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:58:00 -0400 Subject: Receive: avoid hiding check_canedit error messages Avoid the generic "you are not allowed to change" message, and instead allow check_canedit to propigate out useful error messages. Went back to calling check_canedit in fatal mode, but added a parameter to avoid calling the troublesome subs that might cause a login attempt. --- IkiWiki.pm | 4 +++- IkiWiki/Receive.pm | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 6da281999..d114c9a69 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1455,11 +1455,12 @@ sub filter ($$$) { return $content; } -sub check_canedit ($$$;$) { +sub check_canedit ($$$;$$) { my $page=shift; my $q=shift; my $session=shift; my $nonfatal=shift; + my $nosubs=shift; my $canedit; run_hooks(canedit => sub { @@ -1470,6 +1471,7 @@ sub check_canedit ($$$;$) { $canedit=1; } elsif (ref $ret eq 'CODE') { + error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal; $ret->() unless $nonfatal; $canedit=0; } diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index cd746c95f..3a5f91758 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,12 +95,12 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - next if IkiWiki::check_canedit($page, $cgi, $session, 1); + IkiWiki::check_canedit($page, $cgi, $session, 0, 1); } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); - next if IkiWiki::check_canedit($file, $cgi, $session, 1); + IkiWiki::check_canedit($file, $cgi, $session, 0, 1); } } } @@ -116,14 +116,12 @@ sub test () { if (IkiWiki::Plugin::remove->can("check_canremove")) { IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); - next if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1); + IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1); } } else { error "unknown action ".$change->{action}; } - - error sprintf(gettext("you are not allowed to change %s"), $file); } exit 0; -- cgit v1.2.3 From 70db57134a73cde5cafac0f02a3858a22d44ed26 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:20:34 -0400 Subject: correct logic on error fallthrough --- IkiWiki/Receive.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 3a5f91758..972e3578d 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -96,11 +96,13 @@ sub test () { $change->{action} eq 'add') { if (defined $page) { IkiWiki::check_canedit($page, $cgi, $session, 0, 1); + next; } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); IkiWiki::check_canedit($file, $cgi, $session, 0, 1); + next; } } } @@ -117,11 +119,14 @@ sub test () { if (IkiWiki::Plugin::remove->can("check_canremove")) { IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1); + next; } } else { error "unknown action ".$change->{action}; } + + error sprintf(gettext("you are not allowed to change %s"), $file); } exit 0; -- cgit v1.2.3 From 2df0999e4033278a6cc8f6e2d00449224aa09efa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:31:56 -0400 Subject: revert check_canedit nosubs thing Abstraction violation. I now think the problem should be treated as a bug in httpauth. --- IkiWiki.pm | 4 +--- IkiWiki/Receive.pm | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index d114c9a69..6da281999 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1455,12 +1455,11 @@ sub filter ($$$) { return $content; } -sub check_canedit ($$$;$$) { +sub check_canedit ($$$;$) { my $page=shift; my $q=shift; my $session=shift; my $nonfatal=shift; - my $nosubs=shift; my $canedit; run_hooks(canedit => sub { @@ -1471,7 +1470,6 @@ sub check_canedit ($$$;$$) { $canedit=1; } elsif (ref $ret eq 'CODE') { - error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal; $ret->() unless $nonfatal; $canedit=0; } diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 972e3578d..e77c477a9 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,13 +95,13 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - IkiWiki::check_canedit($page, $cgi, $session, 0, 1); + IkiWiki::check_canedit($page, $cgi, $session); next; } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); - IkiWiki::check_canedit($file, $cgi, $session, 0, 1); + IkiWiki::check_canedit($file, $cgi, $session); next; } } @@ -118,7 +118,7 @@ sub test () { if (IkiWiki::Plugin::remove->can("check_canremove")) { IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); - IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1); + IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session); next; } } -- cgit v1.2.3 From f55c7d13966ff1cd90ddf50e05829f6bb3eda557 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:32:32 -0400 Subject: httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session. --- IkiWiki/Plugin/httpauth.pm | 2 ++ debian/changelog | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 868862f4f..cb488449d 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -84,6 +84,8 @@ sub canedit ($$$) { my $session=shift; if (! defined $cgi->remote_user() && + (! defined $session->param("name") || + ! IkiWiki::userinfo_get($session->param("name"), "regdate")) && defined $config{httpauth_pagespec} && length $config{httpauth_pagespec} && defined $config{cgiauthurl} && diff --git a/debian/changelog b/debian/changelog index a1ef33b22..44b54b123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. - * Avoid trying to log the user in when receiving anonymous pushes - from git and a plugin like httpauth returns a login function. + * httpauth: Avoid redirecting the user to the cgiauthurl if + they already have a login session. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 -- cgit v1.2.3 From e74729a3f0a7e2e9436fe148108ac18728c0d180 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:41:39 -0400 Subject: formatting (used to test anon git push again) --- doc/sandbox.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 94ddb3224..06ce35835 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,4 +1,5 @@ -This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +This is the [[SandBox]], a page anyone can edit to try out ikiwiki +(version [[!version ]]). > This is a blockquote. > -- cgit v1.2.3 From 89ddd60537abb73af8a739b4e88942cb3fef0d4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:42:19 -0400 Subject: remove sandbox/me (used to test anon git push again) --- doc/sandbox/me.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/sandbox/me.mdwn diff --git a/doc/sandbox/me.mdwn b/doc/sandbox/me.mdwn deleted file mode 100644 index 45b983be3..000000000 --- a/doc/sandbox/me.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi -- cgit v1.2.3 From d3d3bbbb17be3b2004e730e2a5d394e23cdff116 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:48:38 -0400 Subject: saner return codes for check_can{remove,rename} These return codes are not currently used, but might be later. --- IkiWiki/Plugin/remove.pm | 1 + IkiWiki/Plugin/rename.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index 4b527993b..1717c8cf3 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -71,6 +71,7 @@ sub check_canremove ($$$) { } } }); + return defined $canremove ? $canremove : 1; } sub formbuilder_setup (@) { diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 61d39d4b5..ad5e72645 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -108,6 +108,7 @@ sub check_canrename ($$$$$$) { } } }); + return defined $canrename ? $canrename : 1; } sub rename_form ($$$) { -- cgit v1.2.3 From 2eb04d8b4178f920996b0f74c953e956761a8f0b Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Tue, 31 Aug 2010 12:36:50 +0000 Subject: keeping triple-dash as default, but making it configurable --- doc/plugins/contrib/ymlfront/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 03af5e634..b30c2da37 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -16,3 +16,6 @@ Any objections? >> way of including metadata in documents. The only difference is that MMD doesn't expect the >> triple-dash separators, but I'm thinking about submitting a patch to MMD to actually support >> that syntax. --GB + +>>> Yes, the idea was to allow the file to be parsed as YAML, you're right. I just found that I tended to have problems when people used "---" for horizontal rules. However, I have also found that trying to keep it solely as an IkiWiki directive doesn't work either, since sometimes the meta-data I need also contained "]]" which broke the parsing of the directive. +>>> So I have decided to go for a compromise, and make the delimiter configurable, rather than hardcoded as "---"; the triple-dash is the default, but it can be configured to be something else instead. I haven't pushed the change yet, but I have written it, and it seems to work. -- [[KathrynAndersen]] -- cgit v1.2.3 From 3e7605d146c73ae283b6a00c1d6d84448805a121 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 31 Aug 2010 19:39:03 +0200 Subject: more on ymlfront vs MMD --- doc/plugins/contrib/ymlfront/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b30c2da37..0b58982ff 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -19,3 +19,11 @@ Any objections? >>> Yes, the idea was to allow the file to be parsed as YAML, you're right. I just found that I tended to have problems when people used "---" for horizontal rules. However, I have also found that trying to keep it solely as an IkiWiki directive doesn't work either, since sometimes the meta-data I need also contained "]]" which broke the parsing of the directive. >>> So I have decided to go for a compromise, and make the delimiter configurable, rather than hardcoded as "---"; the triple-dash is the default, but it can be configured to be something else instead. I haven't pushed the change yet, but I have written it, and it seems to work. -- [[KathrynAndersen]] + +>>>> I'm not sure about what kind of problems you're meeting with "---" being used +>>>> for horizontal rules: isn't it sufficient to just check that (1) the triple-dash +>>>> is the first thing in the page and (2) there are only YAML-style assignments +>>>> (and no blank lines) between the two markers? Check #2 would also be enough to +>>>> support MMD-style metadata, which means (a) no start marker and (b) empty line +>>>> to mark the end of the metadata block. Would this be supported by the plugin? +>>>> --GB -- cgit v1.2.3 From 2ff705367b44447c2a9159d14f80880c38556ce4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Aug 2010 14:30:34 -0400 Subject: releasing version 3.20100831 --- debian/changelog | 6 +- ikiwiki.spec | 2 +- po/bg.po | 52 +++++----- po/cs.po | 55 ++++++----- po/da.po | 281 +++++++++++++++++++++++++++++-------------------------- po/de.po | 55 ++++++----- po/es.po | 52 +++++----- po/fr.po | 59 ++++++------ po/gu.po | 52 +++++----- po/ikiwiki.pot | 52 +++++----- po/it.po | 55 ++++++----- po/pl.po | 52 +++++----- po/sv.po | 52 +++++----- po/tr.po | 52 +++++----- po/vi.po | 52 +++++----- 15 files changed, 477 insertions(+), 452 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44b54b123..81bd99a71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100816) UNRELEASED; urgency=low +ikiwiki (3.20100831) unstable; urgency=low * filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. @@ -18,7 +18,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low This allows the po plugin to register a scan hook that runs last and rescans pages after all data from the first scan pass is completed. This avoids the po plugin needing to rebuild some pages. - (intrigeri:) + (intrigeri) * po: Fix some bugs that affected l10n.ikiwiki.info's unusual setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure @@ -26,7 +26,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session. - -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 + -- Joey Hess Tue, 31 Aug 2010 14:22:47 -0400 ikiwiki (3.20100815) unstable; urgency=medium diff --git a/ikiwiki.spec b/ikiwiki.spec index 9250a67cf..85d912da0 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100815 +Version: 3.20100831 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 8534c6d85..845b3f7fa 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -399,17 +399,17 @@ msgstr "приставката „linkmap”: грешка при изпълне msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -639,27 +639,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "промяна на %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -831,12 +821,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -869,29 +859,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -933,7 +923,12 @@ msgstr "препратката няма указани параметрите msgid "shortcut %s points to %s" msgstr "препратката „%s” сочи към „%s”" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" @@ -1121,6 +1116,11 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "промяна на %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/cs.po b/po/cs.po index 11f1d05ed..7f1775b7d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -395,17 +395,17 @@ msgstr "nepodařilo se spustit graphviz" msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" @@ -625,21 +625,11 @@ msgid "" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "sestavuji %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -647,7 +637,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -820,12 +810,12 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." @@ -857,29 +847,29 @@ msgstr "%s již existuje" msgid "%s already exists on disk" msgstr "%s již na disku existuje" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "přejmenování %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -920,7 +910,12 @@ msgstr "chybí parametr jméno nebo url" msgid "shortcut %s points to %s" msgstr "zkratka %s odkazuje na %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "Modul shortcut nebude pracovat bez %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "nepodařilo se rozpoznat žádné smajlíky" @@ -1106,6 +1101,11 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "sestavuji %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1261,6 +1261,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" + #~ msgid "You need to log in first." #~ msgstr "Nejprve se musíte přihlásit." diff --git a/po/da.po b/po/da.po index 4d289b8af..32a75ed0b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -56,7 +56,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Fejl" @@ -85,50 +85,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "færdig" @@ -167,19 +167,19 @@ msgstr "der er allerede en side ved navn %s" msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -196,77 +196,82 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, perl-format msgid "this comment needs %s" msgstr "denne kommentar kræver %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "moderering" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Kommentarmoderering" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -276,7 +281,7 @@ msgstr[1] "%i kommentarer" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "Kommentér" @@ -311,9 +316,9 @@ msgstr "%s er ikke en redigérbar side" msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -326,12 +331,12 @@ msgstr "skabelon %s ikke angivet" msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "beandling af skabelon mislykkedes:" @@ -344,11 +349,11 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -362,23 +367,23 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -387,21 +392,21 @@ msgstr "Skal angive %s når udvidelsen %s bruges" msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -426,12 +431,12 @@ msgstr "læsning af %s mislykkedes: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -504,7 +509,7 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -524,7 +529,7 @@ msgstr "kommentar kræver moderering" msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, perl-format msgid "failed to load openid module: " msgstr "indlæsning af openid-modul mislykkedes: " @@ -600,12 +605,17 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35." -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -613,7 +623,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -621,21 +631,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "gendanner alle sider for at korrigere meta titler" - -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 -#, perl-format -msgid "building %s" -msgstr "danner %s" - -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -643,7 +643,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -651,50 +651,50 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -815,16 +815,16 @@ msgstr "%s er ikke i srcdir, så kan ikke blive slettet" msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "fjernet" @@ -852,29 +852,29 @@ msgstr "%s eksisterer allerede" msgid "%s already exists on disk" msgstr "%s eksisterer allerede på disken" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "omdøb %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Omdøb også UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Kun en vedhæftning kan blive omdøbt ad gangen." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -889,12 +889,12 @@ msgstr "afvikling af rsync_command mislykkedes: %s" msgid "rsync_command exited %d" msgstr "rsync_command sluttede (exit code) %d" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "søg" @@ -915,7 +915,12 @@ msgstr "manglende navn eller url parameter" msgid "shortcut %s points to %s" msgstr "genvej %s viser til %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "genvejsudvidelsen vil ikke fungere uden %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "afkodning af smileys mislykkedes" @@ -1009,22 +1014,22 @@ msgstr "%s udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1032,7 +1037,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1042,7 +1047,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" @@ -1061,47 +1066,52 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "anmoder %s om oprettelses- og redigeringstider for fil.." -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, perl-format msgid "removing obsolete %s" msgstr "fjerner forældet %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "danner %s" + +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1118,7 +1128,7 @@ msgstr "kan ikke læse %s: %s" msgid "cannot load %s in safe mode" msgstr "kan ikke læse %s i sikker tilstand" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, perl-format msgid "failed to parse %s" msgstr "afkodning af %s mislykkedes" @@ -1141,27 +1151,31 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "bygger wrappers.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s ser ikke ud til at kunne afvikles" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1174,23 +1188,19 @@ msgstr "brug: ikiwiki [valg] kilde mål" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:157 -msgid "generating wrappers.." -msgstr "bygger wrappers.." - -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1198,40 +1208,40 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2130 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1255,3 +1265,6 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" #: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" + +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "gendanner alle sider for at korrigere meta titler" diff --git a/po/de.po b/po/de.po index dc3f447f5..586788bb1 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -397,17 +397,17 @@ msgstr "graphviz konnte nicht ausgeführt werden" msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -637,21 +637,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "erzeuge %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -659,7 +649,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -834,12 +824,12 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." @@ -871,29 +861,29 @@ msgstr "%s existiert bereits" msgid "%s already exists on disk" msgstr "%s existiert bereits auf der Festplatte" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "benenne %s um" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -934,7 +924,12 @@ msgstr "fehlender Name oder URL-Parameter" msgid "shortcut %s points to %s" msgstr "Tastenkürzel %s verweist nach %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Smileys konnten nicht ausgewertet werden" @@ -1123,6 +1118,11 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "erzeuge %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1284,6 +1284,9 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" + #~ msgid "You need to log in first." #~ msgstr "Sie müssen sich zuerst anmelden." diff --git a/po/es.po b/po/es.po index c7ec94678..dfdacf764 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -405,17 +405,17 @@ msgstr "no he podido ejecutar el programa graphviz " msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -645,27 +645,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "Informaremos a %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -835,12 +825,12 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." @@ -872,29 +862,29 @@ msgstr "%s ya existe" msgid "%s already exists on disk" msgstr "%s ya existe en el disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "cambiando de nombre %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -935,7 +925,12 @@ msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'" msgid "shortcut %s points to %s" msgstr "El atajo %s apunta a %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "el complemento shortcut no funcionará si no existe la página %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Algunos emoticonos tienen errores" @@ -1129,6 +1124,11 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "Informaremos a %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/fr.po b/po/fr.po index e961ba0fa..221bff436 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -396,17 +396,17 @@ msgstr "Échec du lancement de graphviz" msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -638,23 +638,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" -"Reconstruction de toutes les pages pour corriger les titres (greffon " -"« meta »)." - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "construction de %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -662,7 +650,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -837,12 +825,12 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" @@ -874,29 +862,29 @@ msgstr "%s existe déjà" msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -937,7 +925,12 @@ msgstr "Il manque le paramètre nom ou URL." msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Aucun smiley n'a pu être analysé" @@ -1124,6 +1117,11 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "construction de %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1285,6 +1283,11 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "" +#~ "Reconstruction de toutes les pages pour corriger les titres (greffon " +#~ "« meta »)." + #~ msgid "You need to log in first." #~ msgstr "Vous devez d'abord vous identifier." diff --git a/po/gu.po b/po/gu.po index fbeea1492..baa8c8ee0 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -396,17 +396,17 @@ msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -629,27 +629,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "%s સુધારે છે" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -821,12 +811,12 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -859,29 +849,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -922,7 +912,12 @@ msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિ msgid "shortcut %s points to %s" msgstr "ટુંકોરસ્તો %s એ %s નો નિર્દેશ કરે છે" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" @@ -1108,6 +1103,11 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "%s સુધારે છે" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index a8226f402..62f2792e4 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-15 11:48-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -389,17 +389,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -614,27 +614,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -803,12 +793,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -840,29 +830,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -903,7 +893,12 @@ msgstr "" msgid "shortcut %s points to %s" msgstr "" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "" @@ -1083,6 +1078,11 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/it.po b/po/it.po index 3fda6d221..e120681c4 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -394,17 +394,17 @@ msgstr "errore nell'eseguire graphviz" msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -634,21 +634,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "compilazione di %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -656,7 +646,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -831,12 +821,12 @@ msgstr "%s non è in src, quindi non può essere eliminato" msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." @@ -868,29 +858,29 @@ msgstr "%s esiste già" msgid "%s already exists on disk" msgstr "%s già presente su disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "rinomina di %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -931,7 +921,12 @@ msgstr "parametro nome o url mancante" msgid "shortcut %s points to %s" msgstr "la scorciatoia %s punta a %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "il plugin scorciatoia non può funzionare senza %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "impossibile interpretare gli smile" @@ -1117,6 +1112,11 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "compilazione di %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1273,6 +1273,9 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" + #~ msgid "You need to log in first." #~ msgstr "Occorre prima effettuare l'accesso." diff --git a/po/pl.po b/po/pl.po index e93753abd..f02444224 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -401,17 +401,17 @@ msgstr "awaria w trakcie uruchamiania wtyczki graphviz" msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -642,27 +642,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "edycja %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -836,12 +826,12 @@ msgstr "" msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -874,29 +864,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "renderowanie %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -938,7 +928,12 @@ msgstr "brakujący parametr name lub url" msgid "shortcut %s points to %s" msgstr "skrót %s wskazuje na adres %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "awaria w trakcie przetwarzania emitoikonki" @@ -1129,6 +1124,11 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "edycja %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/sv.po b/po/sv.po index fee2693e2..d8c2cd70b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -398,17 +398,17 @@ msgstr "linkmap misslyckades att köra dot" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -635,27 +635,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "redigerar %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -826,12 +816,12 @@ msgstr "%s är låst av %s och kan inte redigeras" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -864,29 +854,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "ritar upp %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -928,7 +918,12 @@ msgstr "genväg saknar parameter för namn eller url" msgid "shortcut %s points to %s" msgstr "genvägen %s pekar på %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" @@ -1116,6 +1111,11 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "redigerar %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/tr.po b/po/tr.po index e1c5f03b5..91dca8739 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -385,17 +385,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -610,27 +610,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -799,12 +789,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -836,29 +826,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -899,7 +889,12 @@ msgstr "" msgid "shortcut %s points to %s" msgstr "" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "" @@ -1079,6 +1074,11 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/vi.po b/po/vi.po index b22f16418..aa0503f46 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -398,17 +398,17 @@ msgstr "linkmap không chạy dot được" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -635,27 +635,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "đang sửa %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -826,12 +816,12 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -864,29 +854,29 @@ msgstr "" msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Plugin/rename.pm:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -928,7 +918,12 @@ msgstr "lối tắt thiếu tên hay tham số url" msgid "shortcut %s points to %s" msgstr "lối tắt %s chỉ tới %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" @@ -1116,6 +1111,11 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "đang sửa %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" -- cgit v1.2.3 From 3b81ca0c39e6f03adbaacc0b436db6e7cb958f9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Aug 2010 14:30:56 -0400 Subject: add news item for ikiwiki 3.20100831 --- doc/news/version_3.20100610.mdwn | 18 ------------------ doc/news/version_3.20100623.mdwn | 29 ----------------------------- doc/news/version_3.20100831.mdwn | 27 +++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 doc/news/version_3.20100610.mdwn delete mode 100644 doc/news/version_3.20100623.mdwn create mode 100644 doc/news/version_3.20100831.mdwn diff --git a/doc/news/version_3.20100610.mdwn b/doc/news/version_3.20100610.mdwn deleted file mode 100644 index ee7c86d72..000000000 --- a/doc/news/version_3.20100610.mdwn +++ /dev/null @@ -1,18 +0,0 @@ -ikiwiki 3.20100610 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * creation\_day() etc use local time, not gmtime. To match calendars, which - use local time. - * img: Fill in missing height or width when scaling image. - * Remove example blog tag pages; allow autotag creation to create them - when used. - * Fix support for globbing in tagged() pagespecs. - * Fix display of sidebar when previewing page edit. (Thanks, privat) - * relativedate: Fix problem with localised dates not working. - * editpage: Avoid storing accidental state changes when previewing pages. - * page.tmpl: Add a div around the page content, and comments, to aide in - sidebar styling. - * style.css: Improvements to make floating sidebar fit much better on - pages with inlines. - * calendar: Shorten day names, and improve styling of month calendar. - * style.css: Reduced sidebar width back to 20ex from 30; the month calendar - will now fit in the smaller width, and 30 was feeling too large."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100623.mdwn b/doc/news/version_3.20100623.mdwn deleted file mode 100644 index 684217e26..000000000 --- a/doc/news/version_3.20100623.mdwn +++ /dev/null @@ -1,29 +0,0 @@ -ikiwiki 3.20100623 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * openid: Add openid\_realm and openid\_cgiurl configuration options, - useful in a few edge case setups. - * attachment: Show files from underlay in attachments list. - * img: Support hspace and vspace attributes. - * editpage: Rename "comments" field to avoid CSS conflict with the - comments div. - * edittemplate: Make silent mode not disable display when the template - page does not exist, so it can be easily created. - * edittemplate: Look for template pages under templates/ like everything - else (still looks in old location for backwards compatibility). - * attachment: When inserting links, insert img directives for images, - if that plugin is enabled. - * websetup: Allow enabling plugins listed in disable\_plugins. - * editpage, comments: Fix broken links in sidebar (due to forcebaseurl). - (Thanks, privat) - * calendar: Tune archive\_pagespec to only match pages, not other files. - * Fix issues with combining unicode srcdirs and source files. - (Workaround bug #586045) - * Make --gettime be honored after initial setup. - * git: Fix --gettime to properly support utf8 filenames. - * attachment: Support Windows paths when taking basename of client-supplied - file name. - * theme: New plugin, allows easily themeing a site via the underlay. - * Added actiontabs theme by Svend Sorensen. - * Added blueview theme by Bernd Zeimetz. - * mercurial: Fix buggy getctime code. Closes: #[586279](http://bugs.debian.org/586279) - * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)"""]] \ No newline at end of file diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn new file mode 100644 index 000000000..152e3c2f7 --- /dev/null +++ b/doc/news/version_3.20100831.mdwn @@ -0,0 +1,27 @@ +ikiwiki 3.20100831 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * filecheck: Fall back to using the file command if the freedesktop + magic file cannot identify a file. + * flattr: New plugin. (Thanks to jaywalk for the initial implementation + at a flattr plugin! This one is less configurable, but simpler.) + * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) + * openid: Syntax tweak to the javascript code to make it work with MSIE 7 + (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting + the bug and providing access to debug it. + * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. + * htmlscrubber: Do not scrub url anchors that contain colons. + * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673) + * highlight: Make location of highlight's files configurable in setup + file to allow for nonstandard installations. + * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. + * Run the preprocess hooks in scan mode *before* the scan hooks. + This allows the po plugin to register a scan hook that runs + last and rescans pages after all data from the first scan pass is + completed. This avoids the po plugin needing to rebuild some pages. + (intrigeri) + * po: Fix some bugs that affected l10n.ikiwiki.info's unusual + setup. (intrigeri) + * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure + bzr whoami before committing. + * httpauth: Avoid redirecting the user to the cgiauthurl if + they already have a login session."""]] \ No newline at end of file -- cgit v1.2.3 From 040e174b2c5e849cbfa256694813731e444ca4ae Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 31 Aug 2010 20:48:49 +0200 Subject: wishlist item: alias directive --- doc/todo/alias_directive.mdwn | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 doc/todo/alias_directive.mdwn diff --git a/doc/todo/alias_directive.mdwn b/doc/todo/alias_directive.mdwn new file mode 100644 index 000000000..4d7817694 --- /dev/null +++ b/doc/todo/alias_directive.mdwn @@ -0,0 +1,47 @@ +An alias directive could work like an inverse redirect, but in a more +maintainable way. Currently, a page might have several redirects leading to it, +without an easy way of enumerating them. Therefore, the following directive is +suggested for addition (possibly by means of a plugin): + +> The `alias` and `aliastext` directives implicitly create +> redirect pages to the page they are used on. If two or more pages claim a +> non-existing page to be an alias, a disambiguation page will automatically +> generated. If an existing page is claimed as an alias, it will be prefixed +> with a note that its topic is also an alias for other pages. +> +> All aliases to a page are automatically listed below the backlink and tag +> lists at the bottom of a page by default. This can be configured globally by +> setting the `alias_list` configuration option to `false`, or set explicitly +> per alias by specifying `list=true` or `list=false`. +> +> Similar to the `taglink` directive, `aliastext` produces the alias name as +> well as registering it. +> +> ## Usage example +> +> `Greece.mdwn`: +> +> > Greece, also known as \[[!aliastext Hellas]] and officially the +> > \[[!aliastext "Hellenic Republic"]], is a … +> > +> > +> > \[[!alias Grece list=false]] +> +> This page by itself will redirect from the "Hellas" and "Hellenic Republic" +> pages as if they both contained just: +> +> > \[[!meta redir="Greece"]] +> +> If, on the other hand, `Hellas Planitia` also claims `[[!alias Hellas]]`, the +> Hellas page will look like this: +> +> > **Hellas** is an alias for the following pages: +> > +> > * \[[Greece]] +> > * \[[Hellas Planitia]] + +The proposed plugin/directive could be extended, eg. by also including +old-style redirects in the alias list, but that might introduce unwanted +coupling with the meta directive. + +[[!tag wishlist]] -- cgit v1.2.3 From 4fbf2f9b6d5de95211b47f4b2f80e3479b3b6811 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmAN5tpw40_t2tPFDLkP35Fc4zIskJDEtQ" Date: Wed, 1 Sep 2010 00:27:16 +0000 Subject: --- doc/sandbox.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 06ce35835..7a10c8403 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -12,6 +12,13 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki > > Back to the first level. +1. Hot Items + 1. Daves Insanity Sauce + 2. Marie Sharps + 1. Blazing Inferno +1. Not so Hot Items + 1. Tabasco + Numbered list 1. First item. -- cgit v1.2.3 From 2a1077f8869ca65b49e09d99a76b595d90b28499 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Wed, 1 Sep 2010 10:09:44 +0000 Subject: YAML is YAML --- doc/plugins/contrib/ymlfront/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 0b58982ff..b122294bb 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -27,3 +27,5 @@ Any objections? >>>> support MMD-style metadata, which means (a) no start marker and (b) empty line >>>> to mark the end of the metadata block. Would this be supported by the plugin? >>>> --GB + +>>>>> Since I allow all legal YAML, the only way to check if it is legal YAML is to use the YAML parser, by which time one is already parsing the YAML, so it seems a bit pointless to check before one does so. -- KA -- cgit v1.2.3 From 704038db298c0f3a8039dcfe8d3a801c26fadf15 Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Thu, 2 Sep 2010 14:09:55 +0000 Subject: Use HTTPS version for [Wikimedia](https://secure.wikimedia.org/) and Google (noted by using DuckDuckGo.com which is directing there) --- doc/shortcuts.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 54dd0fdb1..cafe3f573 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -11,13 +11,13 @@ Some examples of using shortcuts include: This page controls what shortcut links the wiki supports. -* [[!shortcut name=google url="http://www.google.com/search?q=%s"]] +* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]] * [[!shortcut name=archive url="http://web.archive.org/*/%S"]] * [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]] * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]] -* [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]] -* [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]] -* [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]] +* [[!shortcut name=wikipedia url="https://secure.wikimedia.org/wikipedia/en/wiki/%s"]] +* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]] +* [[!shortcut name=wiktionary url="https://secure.wikimedia.org/wiktionary/en/wiki/%s"]] * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] -- cgit v1.2.3 From e3238ee21c8c9c346019f4747ab003801204934e Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Thu, 2 Sep 2010 14:26:49 +0000 Subject: shortcuts: Suggestions for multi-language links --- doc/shortcuts/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/shortcuts/discussion.mdwn diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn new file mode 100644 index 000000000..b48117b67 --- /dev/null +++ b/doc/shortcuts/discussion.mdwn @@ -0,0 +1,11 @@ +# Suggestions for multi-language links + +Sites like Wikipedia have different URLs for each language. The shortcut for Wikipedia `!wikipedia` points to `https://secure.wikimedia.org/wikipedia/en/wiki/%s` which is the English version. + +Do you have a suggestion on how to make that shortcut also be used to point to a different language. + +1. The option to just adapt the shortcut (`s/en/de/`) is quite cumbersome for non English speakers and also has the disadvantage of always updating the shortcut links manually after each modification in the upstream ikiwiki shortcut list to stay in sync. +1. Adding an extra shortcut for every language, e. g. `!wikipediade`, with for example the country TLD in it is an option but would make the shortcut list quite big. +1. Adding a `lang` parameter comes also to my mind, but I do not know how feasible that is. + +Thanks. --[[PaulePanter]] -- cgit v1.2.3 From f67574a82d08b1a21b06befba4e676e5ac55b5cd Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 2 Sep 2010 22:20:06 +0000 Subject: discussing Paul's HTTPS edit --- doc/shortcuts/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index b48117b67..6f762173a 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -9,3 +9,5 @@ Do you have a suggestion on how to make that shortcut also be used to point to a 1. Adding a `lang` parameter comes also to my mind, but I do not know how feasible that is. Thanks. --[[PaulePanter]] + +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they shuold be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] -- cgit v1.2.3 From e0bfb1ef5782530bc5ee0576551b531d7f869fe0 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 2 Sep 2010 22:22:05 +0000 Subject: spelling --- doc/shortcuts/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index 6f762173a..aac98457e 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -10,4 +10,4 @@ Do you have a suggestion on how to make that shortcut also be used to point to a Thanks. --[[PaulePanter]] -> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they shuold be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they should be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] -- cgit v1.2.3 From 23b80f63e718ea029ef8e6317fdb94c9676857e3 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:03:33 +0000 Subject: Manual install as plain user (only curl and build-essential required) on stable --- doc/install/discussion.mdwn | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 02cdb29c9..44152d80b 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -269,3 +269,52 @@ Any suggestions? Whew! perl Makefile.PL INSTALL_BASE=$HOME PREFIX= make make install + +--- + +03 September 2010, Report on successful manual install in Debian 5 (Lenny) AMD64: + +note: Maybe much more easy using backports, but using this tools you get a plain user cpan :) + +This where my steps: + +As root (#): + + # aptitude install build-essential curl libexpat1-dev + +As plain user ($): + + I use to install user perl modules using local::lib: + + http://github.com/poisonbit/sandbox/blob/master/bin/myperl.sh + + After that and relogin, you can install cpanm :) + + mkdir -p "$HOME/downloads" + cd "$HOME/downloads/" + curl -L http://cpanmin.us | perl - App::cpanminus + source "/home/$USER/.bashrc" + wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz + cpanm Text::Markdown + cpanm URI + cpanm HTML::Parser + cpanm HTML::Template + cpanm HTML::Scrubber + cpanm CGI::FormBuilder + cpanm CGI::Session + tar -zxf ikiwiki_3.20100831.tar.gz + cd ikiwiki/ + perl Makefile.PL PREFIX=/home/$USER/.perl5 INSTALL_BASE= + make + make install + make install INSTALL_BASE=/home/$USER/.perl5 + +Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) + +After all, here it's: + + ikiwiki --version + ikiwiki version 3.20100831 + +Hope this could be useful for someone some day. +Iñigo -- cgit v1.2.3 From 175ff176f5b5558a7928aea52692f268b65b3dff Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:04:52 +0000 Subject: deleting libexpat1-dev, only needed for perlbrew, not for local:lib --- doc/install/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 44152d80b..c2bb4ba2a 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,7 +280,7 @@ This where my steps: As root (#): - # aptitude install build-essential curl libexpat1-dev + # aptitude install build-essential curl As plain user ($): -- cgit v1.2.3 From eb2f54fb8ffd66df752d63676a843ae6f4ece8e3 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:39:56 +0000 Subject: Modified, retested all with a clean user (last edition was from a bash_history) --- doc/install/discussion.mdwn | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index c2bb4ba2a..69c2abddc 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,41 +280,45 @@ This where my steps: As root (#): - # aptitude install build-essential curl + # aptitude install build-essential curl perl As plain user ($): - I use to install user perl modules using local::lib: - - http://github.com/poisonbit/sandbox/blob/master/bin/myperl.sh - - After that and relogin, you can install cpanm :) + I use to install user perl modules using local::lib mkdir -p "$HOME/downloads" cd "$HOME/downloads/" + wget http://search.cpan.org/CPAN/authors/id/G/GE/GETTY/local-lib-1.006007.tar.gz + wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz + tar -zxf local-lib-1.006007.tar.gz + cd local-lib-1.006007/ + perl Makefile.PL --bootstrap=~/.perl5 + make test && make install + echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib)' >>~/.bashrc + . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus source "/home/$USER/.bashrc" - wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz - cpanm Text::Markdown - cpanm URI - cpanm HTML::Parser - cpanm HTML::Template - cpanm HTML::Scrubber cpanm CGI::FormBuilder cpanm CGI::Session + cpanm HTML::Parser + cpanm HTML::Template + cpanm -f HTML::Scrubber # tests failed + cpanm Text::Markdown + cpanm URI tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ - perl Makefile.PL PREFIX=/home/$USER/.perl5 INSTALL_BASE= + perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 + make tests # All tests successful make - make install make install INSTALL_BASE=/home/$USER/.perl5 + . ~/.bashrc Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) After all, here it's: - ikiwiki --version + ikiwiki -version ikiwiki version 3.20100831 -Hope this could be useful for someone some day. +Hope this can be useful for someone. Iñigo -- cgit v1.2.3 From 336d4884baee1c4f45e836a530520695b73b1b20 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:54:47 +0000 Subject: Minor fixes/cleanups on my addition --- doc/install/discussion.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 69c2abddc..42c56aa13 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -294,10 +294,10 @@ As plain user ($): cd local-lib-1.006007/ perl Makefile.PL --bootstrap=~/.perl5 make test && make install - echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib)' >>~/.bashrc + echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib=$HOME/.perl5)' >>~/.bashrc . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus - source "/home/$USER/.bashrc" + . ~/.bashrc cpanm CGI::FormBuilder cpanm CGI::Session cpanm HTML::Parser @@ -305,15 +305,15 @@ As plain user ($): cpanm -f HTML::Scrubber # tests failed cpanm Text::Markdown cpanm URI + cd .. tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 make tests # All tests successful - make make install INSTALL_BASE=/home/$USER/.perl5 . ~/.bashrc -Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) +Using cpan or cpanm with local::lib, you can install any other dependency, as plain user (in your home). XS modules may need -dev packages. After all, here it's: -- cgit v1.2.3 From 095b9f1ef5b630a8556247f75ec4e7fbcc7fbb4b Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:59:06 +0000 Subject: minor, delete a repited . ~/.bashrc --- doc/install/discussion.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 42c56aa13..3cefbd209 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -297,7 +297,6 @@ As plain user ($): echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib=$HOME/.perl5)' >>~/.bashrc . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus - . ~/.bashrc cpanm CGI::FormBuilder cpanm CGI::Session cpanm HTML::Parser -- cgit v1.2.3 From 538bf32181fc0506627535480c75f34a73c058bc Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:06:18 +0000 Subject: checking again instructions, HTML::Scrubber does not fail in tests with a clean install. --- doc/install/discussion.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 3cefbd209..a6ce1eee3 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -301,14 +301,14 @@ As plain user ($): cpanm CGI::Session cpanm HTML::Parser cpanm HTML::Template - cpanm -f HTML::Scrubber # tests failed + cpanm HTML::Scrubber cpanm Text::Markdown cpanm URI cd .. tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 - make tests # All tests successful + make test # All tests successful. make install INSTALL_BASE=/home/$USER/.perl5 . ~/.bashrc -- cgit v1.2.3 From 89d0d414bfe6f07bce51a31909cfa3bc761aa21c Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:12:23 +0000 Subject: problem with /etc files --- doc/install/discussion.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index a6ce1eee3..c21664c79 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -319,5 +319,9 @@ After all, here it's: ikiwiki -version ikiwiki version 3.20100831 -Hope this can be useful for someone. +But it seems like this installation looses the /etc files... + + $ find /home/ikiwiki/.perl5/ -iname '*.setup' + $ + Iñigo -- cgit v1.2.3 From bf16d3da43424c4b9cbd5d9c5fecd29ab551cf0a Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:17:34 +0000 Subject: Workaround for /etc files --- doc/install/discussion.mdwn | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index c21664c79..e37b2a785 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,11 +280,10 @@ This where my steps: As root (#): - # aptitude install build-essential curl perl + aptitude install build-essential curl perl -As plain user ($): - I use to install user perl modules using local::lib +As plain user ($), I use to install user perl modules using local::lib mkdir -p "$HOME/downloads" cd "$HOME/downloads/" @@ -319,9 +318,9 @@ After all, here it's: ikiwiki -version ikiwiki version 3.20100831 -But it seems like this installation looses the /etc files... +It seems like this installation looses the /etc files (we're as plain user), but this can be used as a workaround: + + ikiwiki -setup ~/downloads/ikiwiki/auto.setup - $ find /home/ikiwiki/.perl5/ -iname '*.setup' - $ Iñigo -- cgit v1.2.3 From 40b37861a4a77f2ab2ed069b3e20c770054abce5 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:25:36 +0000 Subject: update issue needing /etc as plain user --- doc/install/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index e37b2a785..c06893ec1 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -322,5 +322,12 @@ It seems like this installation looses the /etc files (we're as plain user), but ikiwiki -setup ~/downloads/ikiwiki/auto.setup +I've not investigated more the /etc files ussage, but does not seems like a good idea to be as plain user... + + /etc/ikiwiki/wikilist does not exist + ** Failed to add you to the system wikilist file. + ** (Probably ikiwiki-update-wikilist is not SUID root.) + ** Your wiki will not be automatically updated when ikiwiki is upgraded. + Iñigo -- cgit v1.2.3 From fe46c31a649872cd2a9afe29e5e0877249760e44 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Fri, 3 Sep 2010 11:17:43 -0700 Subject: Add forum post regarding "bad page name" error --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Forward_slashes_being_escaped_as_252F.mdwn diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn new file mode 100644 index 000000000..b9c5aca07 --- /dev/null +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -0,0 +1,9 @@ +When I try to edit a page that has a forward slash in the URL, I get "Error: +bad page name". I think the problem is because the forward slash is escaped as +`%252F` instead of `%2F`. + +For example, if I go to `http://ciffer.net/~svend/tech/hosts/` and click Edit, +I am sent to a page with the URL +`http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit`. + +I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. -- cgit v1.2.3 From 3f9244ccf4b7e85acf7816217db67c0b34650854 Mon Sep 17 00:00:00 2001 From: philippe Date: Sat, 4 Sep 2010 07:39:10 +0000 Subject: --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 6e12b51be..d893c71d9 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -10,3 +10,13 @@ When i click on "templates.fr", i get the po.file instead of html. > in any configuration. Unless, perhaps, it was just not configured to > support any languages at all, and so the po file was treated as a raw > file. --[[Joey]] + +>> I can reproduce the bug with: + # po plugin + # master language (non-PO files) + po_master_language => { + code => 'en', + name => 'English' + }, + # slave languages (PO files) + po_slave_languages => [qw{fr|Français}], -- cgit v1.2.3 From edb256d2d8c59754e074f71f24644d57442a24e9 Mon Sep 17 00:00:00 2001 From: Changaco Date: Sat, 4 Sep 2010 14:04:51 +0000 Subject: added a patch to make it more like MediaWiki --- doc/plugins/contrib/headinganchors/discussion.mdwn | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/doc/plugins/contrib/headinganchors/discussion.mdwn b/doc/plugins/contrib/headinganchors/discussion.mdwn index 91fe04a6d..151af8d92 100644 --- a/doc/plugins/contrib/headinganchors/discussion.mdwn +++ b/doc/plugins/contrib/headinganchors/discussion.mdwn @@ -1 +1,33 @@ Isn't this functionality a part of what [[plugins/toc]] needs and does? Then probably the [[plugins/toc]] plugin's code could be split into the part that implements the [[plugins/contrib/headinganchors]]'s functionality and the TOC generation itself. That will bring more order into the code and the set of available plugins. --Ivan Z. + +--- + +A patch to make it more like MediaWiki: + +
--- headinganchors.pm
++++ headinganchors.pm
+@@ -5,6 +5,7 @@
+ use warnings;
+ use strict;
+ use IkiWiki 2.00;
++use URI::Escape;
+ 
+ sub import {
+         hook(type => "sanitize", id => "headinganchors", call => \&headinganchors);
+@@ -14,9 +15,11 @@
+         my $str = shift;
+         $str =~ s/^\s+//;
+         $str =~ s/\s+$//;
+-        $str = lc($str);
+-        $str =~ s/[&\?"\'\.,\(\)!]//mig;
+-        $str =~ s/[^a-z]/_/mig;
++        $str =~ s/\s/_/g;
++        $str =~ s/"//g;
++        $str =~ s/^[^a-zA-Z]/z-/; # must start with an alphabetical character
++        $str = uri_escape_utf8($str);
++        $str =~ s/%/./g;
+         return $str;
+ }
+
+ +--Changaco -- cgit v1.2.3 From 306941954e53931626522ef1e7d56693a57dd203 Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Sun, 5 Sep 2010 14:34:16 +0000 Subject: .darcs --- doc/setup.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 83409228c..ac491baae 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -68,7 +68,7 @@ source. (Remember to replace "foo" with the real directory name.) cvs -d `pwd`/foo get -P ikiwiki bzr clone foo foo.src hg clone foo foo.src - darcs get foo foo.src + darcs get foo.darcs foo.src # TODO monotone, tla Now to edit pages by hand, go into the directory you checked out (ie, -- cgit v1.2.3 From 38fb7bd42d61d1433f5ccee0dd222ed40668eda7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" Date: Sun, 5 Sep 2010 18:31:16 +0000 Subject: --- doc/forum/404_-_not_found.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/404_-_not_found.mdwn diff --git a/doc/forum/404_-_not_found.mdwn b/doc/forum/404_-_not_found.mdwn new file mode 100644 index 000000000..ef471192b --- /dev/null +++ b/doc/forum/404_-_not_found.mdwn @@ -0,0 +1,13 @@ +Hi, + +I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu 10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can access the **http://ubuntu1004/index.lighttpd.html** page without any issues. + +But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as is mentioned at the end of the ikiwiki setup), I get the error message "**404 - not found**". + +I've also followed the "dot-cgi" trick, but with the same negative result. The web server I've installed, is lighttpd. + +What did I miss? + +Best rgds, + +--Geert -- cgit v1.2.3 From 0842297678e72819273cd3bfa52420958b36c7e2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkIl2-FajX9MSbbfcPYvzbmbsemGJJfXds" Date: Mon, 6 Sep 2010 14:13:49 +0000 Subject: --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/ikiwiki_ignores_PATH_environment.mdwn diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn new file mode 100644 index 000000000..63ac4bc31 --- /dev/null +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -0,0 +1,9 @@ +At the very top of the main ikiwiki executable script the `PATH` environment is set like this: + + $ENV{PATH}="/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; + +This makes it a little hard to specify which specific binaries should be used, especially if there is more than one of them available (see c.f. where the MacPorts-supplied, up-to-date subversion should be used and not an arcane one from the base distro / OS). Is there a specific reason why ikiwiki wipes out `$PATH` like this or could that line be improved to + + $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; + +? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :) -- cgit v1.2.3 From 7475f90be2c1941d4449791e9e9cd5f3dc3bbb71 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:01:20 -0400 Subject: add todo item about hooks not called during untrusted git push --- doc/todo/untrusted_git_push_hooks.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/todo/untrusted_git_push_hooks.mdwn diff --git a/doc/todo/untrusted_git_push_hooks.mdwn b/doc/todo/untrusted_git_push_hooks.mdwn new file mode 100644 index 000000000..313078ce5 --- /dev/null +++ b/doc/todo/untrusted_git_push_hooks.mdwn @@ -0,0 +1,12 @@ +Re the canrename, canremove, and canedit hooks: + +Of the three, only canremove is currently checked during an untrusted +git push (a normal git push is assumed to be from a trusted user and +bypasses all checks). + +It would probably make sense to add the canedit hook to the checks done +there. Calling the canrename hook is tricky, because after all, git does +not record explicit file moves. + +The checkcontent hook is another hook not currently called there, that +probably should be. -- cgit v1.2.3 From 8a6f4a7e50c247c061fd74b535d0f292aca6bda7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:08:59 -0400 Subject: needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) --- IkiWiki/Plugin/aggregate.pm | 2 ++ IkiWiki/Plugin/calendar.pm | 1 + IkiWiki/Plugin/edittemplate.pm | 2 ++ IkiWiki/Plugin/listdirectives.pm | 2 ++ IkiWiki/Plugin/meta.pm | 1 + IkiWiki/Plugin/pinger.pm | 1 + IkiWiki/Plugin/po.pm | 2 ++ IkiWiki/Plugin/skeleton.pm.example | 4 ++++ IkiWiki/Plugin/theme.pm | 1 + IkiWiki/Plugin/version.pm | 1 + IkiWiki/Render.pm | 5 ++++- debian/changelog | 8 ++++++++ doc/plugins/write.mdwn | 4 ++-- 13 files changed, 31 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 7789c4c2a..fe53d868d 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -210,6 +210,8 @@ sub needsbuild (@) { markunseen($feed->{sourcepage}); } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index bb995d499..c7d2b7c01 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -491,6 +491,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 226f83bb4..4f07866e4 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -41,6 +41,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index 8a67f7160..835e25388 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -64,6 +64,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index d18585d3d..5941e3f3f 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub scrub ($$) { diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm index c20ecb5d4..cc9f52d2b 100644 --- a/IkiWiki/Plugin/pinger.pm +++ b/IkiWiki/Plugin/pinger.pm @@ -45,6 +45,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index f3530faf3..7b62092e1 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -221,6 +221,8 @@ sub needsbuild () { foreach my $master (keys %translations) { map add_depends($_, $master), values %{otherlanguages_pages($master)}; } + + return $needsbuild; } sub scan (@) { diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index 341d67867..7974d5e53 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -73,7 +73,11 @@ sub refresh () { } sub needsbuild ($) { + my $needsbuild=shift; + debug("skeleton plugin needsbuild"); + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm index 03b0816ed..ee94547e9 100644 --- a/IkiWiki/Plugin/theme.pm +++ b/IkiWiki/Plugin/theme.pm @@ -60,6 +60,7 @@ sub needsbuild ($) { $wikistate{theme}{currenttheme}=$config{theme}; } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm index c13643478..fc265526c 100644 --- a/IkiWiki/Plugin/version.pm +++ b/IkiWiki/Plugin/version.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 9921915b4..0dbe9611a 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -759,7 +759,10 @@ sub refresh () { my ($new, $internal_new)=find_new_files($files); my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); - run_hooks(needsbuild => sub { shift->($changed) }); + run_hooks(needsbuild => sub { + my $ret=shift->($changed); + $changed=$ret if ref $ret eq 'ARRAY'; + }); my $oldlink_targets=calculate_old_links($changed, $del); foreach my $file (@$changed) { diff --git a/debian/changelog b/debian/changelog index 81bd99a71..430bd302c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20100832) UNRELEASED; urgency=low + + * needsbuild hook interface changed; the hooks should now return + the modified array of things that need built. (Backwards compatability + code keeps plugins using the old interface working.) + + -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 + ikiwiki (3.20100831) unstable; urgency=low * filecheck: Fall back to using the file command if the freedesktop diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 10b4df835..31bb64e68 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -179,8 +179,8 @@ function is passed no values. This allows a plugin to manipulate the list of files that need to be built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt, and can modify the array, either -adding or removing files from it. +array of files that will be rebuilt. It should return an array reference +that is a modified version of its input. It can add or remove files from it. ### scan -- cgit v1.2.3 From b3aadbf0bdb67fea1e9944dfa562f1ac020c16ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:38:40 -0400 Subject: response --- doc/forum/404_-_not_found.mdwn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/forum/404_-_not_found.mdwn b/doc/forum/404_-_not_found.mdwn index ef471192b..dc3318901 100644 --- a/doc/forum/404_-_not_found.mdwn +++ b/doc/forum/404_-_not_found.mdwn @@ -1,13 +1,22 @@ Hi, -I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu 10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can access the **http://ubuntu1004/index.lighttpd.html** page without any issues. +I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu +10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can +access the **http://ubuntu1004/index.lighttpd.html** page without any +issues. -But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as is mentioned at the end of the ikiwiki setup), I get the error message "**404 - not found**". +But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as +is mentioned at the end of the ikiwiki setup), I get the error message +"**404 - not found**". -I've also followed the "dot-cgi" trick, but with the same negative result. The web server I've installed, is lighttpd. +I've also followed the "dot-cgi" trick, but with the same negative result. +The web server I've installed, is lighttpd. What did I miss? Best rgds, --Geert + +> Perhaps your webserver is not exporting your `public_html` directory +> in `~geertvc`? Check its configuration. --[[Joey]] -- cgit v1.2.3 From 5f101ab1209e36c6e1a415a2e17677224025077c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 7 Sep 2010 19:18:24 +0200 Subject: Removing tag done as it seems to need some more care. --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index d893c71d9..8238f50df 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -3,7 +3,7 @@ At the bottom of this page, there is the "Links" line: Links: index index.fr templates templates.fr When i click on "templates.fr", i get the po.file instead of html. - Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]]. + Sorry for the noise! I set "po_master_language" to fr and all was ok. > Any chance you could be a bit more verbose about what the > misconfiguration was? I don't think the po plugin should behave like that -- cgit v1.2.3 From 5c6c0813ca8dff8c42ac32ed9702568228f8407b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 13:47:50 -0400 Subject: Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. --- debian/changelog | 2 ++ doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 9 +++++++++ ikiwiki.in | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 430bd302c..a9892938a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) + * Remove PATH overriding code in ikiwiki script that was present to make + perl taint checking happy, but taint checking is disabled. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 63ac4bc31..5097acaef 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -7,3 +7,12 @@ This makes it a little hard to specify which specific binaries should be used, e $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; ? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :) + +> You can use the ENV setting in your setup file to set any environment +> variables you like. Since ikiwiki.cgi is run by the web browser, that +> is the best way to ensure ikiwiki always runs with a given variable set. +> +> As a suid program, the ikiwiki wrappers have to sanitize the environment. +> The ikiwiki script's own sanitization of PATH was done to make perl taint +> checking happy, but as taint checking is disabled anyway, I have removed +> that. [[done]] --[[Joey]] diff --git a/ikiwiki.in b/ikiwiki.in index bcda2469b..339efd37c 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -1,7 +1,4 @@ #!/usr/bin/perl -$ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; -delete @ENV{qw{IFS CDPATH ENV BASH_ENV}}; - package IkiWiki; use warnings; -- cgit v1.2.3 From 3c16ca60794df8196e05cb45a31f8b8f36b4a613 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 15:59:57 -0400 Subject: web server is forcing a redirect --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn index b9c5aca07..cabb21b5c 100644 --- a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -7,3 +7,16 @@ I am sent to a page with the URL `http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit`. I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. + + +> But on your page, the Edit link is escaped normally and correctly (using %2F). +> Look at the page source! +> +> The problem is that your web server is forcing a hard (302) redirect +> to the doubly-escaped url. In wireshark I see your web server send back: + + HTTP/1.1 302 Found\r\n + Apache/2.2.9 (Debian) PHP/5.2.6-1+lenny9 with Suhosin-Patch + Location: http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit + +> You'll need to investigate why your web server is doing that... --[[Joey]] -- cgit v1.2.3 From c8cfeb9329d7cef7e26bec7bcafd0f72cf28c413 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Tue, 7 Sep 2010 15:54:04 -0700 Subject: Issue resolved. Thanks Joey! --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn index cabb21b5c..5df81e561 100644 --- a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -20,3 +20,14 @@ I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. Location: http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit > You'll need to investigate why your web server is doing that... --[[Joey]] + +>> Thanks for pointing me in the right direction. I have the following redirect +>> in my Apache config. + + RewriteEngine on + RewriteCond %{HTTP_HOST} ^www\.ciffer\.net$ + RewriteRule /(.*) http://ciffer.net/$1 [L,R] + +>> and my ikiwiki url setting contained `www.ciffer.net`, which was causing the +>> redirect. Correcting the url fixed the problem. I'm still not sure why +>> Apache was mangling the URL. --[[Svend]] -- cgit v1.2.3 From a27ab08b622c253a8545fa8f514e031275820a7d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Wed, 8 Sep 2010 21:24:52 +0000 Subject: --- doc/rcs/svn/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 426735182..7d683d050 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -11,3 +11,14 @@ can act upon them sequentially, or (2) optionally divorce the `ikiwiki I'm not aware of web servers, at least apache, killing cgi processes when the user stops a page load. If this is happening ikiwiki should be able to avoid it by blocking whatever signal is causing it to terminate. --[[Joey]] + +Just as an experiment, I tried running ikiwiki using a *remote* repository, +i.e. via "svn+ssh". After setting up the repo and relocating the working copy, +unfortunately, it doesn't work; editing a page gives the error: + +Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 + +I *think* this is because, despite a SetEnv directive in the apache configuration, +the CGI wrapper is expunging SVN_SSH from the environment (based on perusing +the source of Wrapper.pm and looking at "envsave" there at the top). +Is this the case? --Glenn -- cgit v1.2.3 From 3e0223b351872624921dbb177f38281bb51f2eac Mon Sep 17 00:00:00 2001 From: tschwinge Date: Thu, 9 Sep 2010 14:38:54 +0000 Subject: Tags now work as I'd expect them to. --- doc/users/tschwinge.mdwn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 414612aff..46c29a0d6 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -35,10 +35,6 @@ Markdown rendering, for example). -## Tags -- [[bugs/tagged__40____41___matching_wikilinks]] - -Tags should be a separate concept from wikilinks. - ### \[[!map]] behavior The \[[!map]] on, for example, -- cgit v1.2.3 From 62672f88cdae1fcc811d7fe99fbafc678d2a857a Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 9 Sep 2010 21:41:07 +0000 Subject: Added a comment --- .../comment_1_3dea2600474f77fb986767da4d507d62._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment diff --git a/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment b/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment new file mode 100644 index 000000000..453419cf3 --- /dev/null +++ b/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://jmtd.livejournal.com/" + ip="188.222.50.68" + subject="comment 1" + date="2010-09-09T21:41:07Z" + content=""" +You probably need to run \"lighttpd-enable-mod userdir\" +"""]] -- cgit v1.2.3 From 7415aee9cc1558316ab50d4e38e0408ae3fa53f5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 8 Sep 2010 15:34:41 +0200 Subject: teximg: Use Unicode UTF-8 encoding by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If I am not mistaking all source files in ikiwiki are encoded in Unicode UTF-8. Adding `\usepackage[utf8]{inputenc}` enables LaTeX to deal with the encoding. As a consequence some special characters like umlauts can be used in the source code which is useful for foreign languages. [[!teximg code="a = b \text{ für alle } b \neq 2"]] But for example »≠« cannot be used in LaTeX right now. One has to use other TeX systems like XeTeX or LuaTeX featuring native UTF-8 support or use additional nonstandard packages like uniinput [1]. I used the package `inputenc` (`texdoc inputenc`) and not `inputenx` (`texdoc inputenx`), because I have not used `inputenx` that much and using the option `math` is not supported in Debian (and I guess other distributions too) since `inpmath` is not included in CTAN. [1] http://wiki.neo-layout.org/browser/latex/Standard-LaTeX Signed-off-by: Paul Menzel --- IkiWiki/Plugin/teximg.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm index 521af499f..195792aca 100644 --- a/IkiWiki/Plugin/teximg.pm +++ b/IkiWiki/Plugin/teximg.pm @@ -13,6 +13,7 @@ use IkiWiki 3.00; my $default_prefix = < Date: Thu, 9 Sep 2010 18:23:31 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9892938a..a89485f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low code keeps plugins using the old interface working.) * Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. + * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 + Thanks, Paul Menzel. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From fb9019a9dab686a931bc5e9549bc08c672f202f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Sep 2010 18:24:49 -0400 Subject: response --- doc/rcs/svn/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 7d683d050..887b5c4a2 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -22,3 +22,6 @@ I *think* this is because, despite a SetEnv directive in the apache configuratio the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn + +> That seems likely. You can edit Wrapper.pm and add `SVN_SSH` to the +> `@envsave` list and rebuild your wrappers to test it. --[[Joey]] -- cgit v1.2.3 From 32a70b7c4859dfeb6f9fa91fb4bc0f4d709b8376 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:00:03 +0000 Subject: Move the svn+ssh discussion to the forum. --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/using_svn+ssh_with_ikiwiki.mdwn diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn new file mode 100644 index 000000000..b80e8e834 --- /dev/null +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -0,0 +1,9 @@ +Just as an experiment, I tried running ikiwiki using a remote repository, i.e. via "svn+ssh". After setting up the repo and relocating the working copy, unfortunately, it doesn't work; editing a page gives the error: + +Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 + +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn + +That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey + +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? -- cgit v1.2.3 From 807a75f6b6d95910deb68359873563b528e17d82 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:01:14 +0000 Subject: Move the discussion of svn+ssh to the forum for now. --- doc/rcs/svn/discussion.mdwn | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 887b5c4a2..426735182 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -11,17 +11,3 @@ can act upon them sequentially, or (2) optionally divorce the `ikiwiki I'm not aware of web servers, at least apache, killing cgi processes when the user stops a page load. If this is happening ikiwiki should be able to avoid it by blocking whatever signal is causing it to terminate. --[[Joey]] - -Just as an experiment, I tried running ikiwiki using a *remote* repository, -i.e. via "svn+ssh". After setting up the repo and relocating the working copy, -unfortunately, it doesn't work; editing a page gives the error: - -Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 - -I *think* this is because, despite a SetEnv directive in the apache configuration, -the CGI wrapper is expunging SVN_SSH from the environment (based on perusing -the source of Wrapper.pm and looking at "envsave" there at the top). -Is this the case? --Glenn - -> That seems likely. You can edit Wrapper.pm and add `SVN_SSH` to the -> `@envsave` list and rebuild your wrappers to test it. --[[Joey]] -- cgit v1.2.3 From 0754b92fde09951912f7846fcf05388632c8edc7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:02:13 +0000 Subject: --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index b80e8e834..a5da15b6a 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -1,9 +1,9 @@ Just as an experiment, I tried running ikiwiki using a remote repository, i.e. via "svn+ssh". After setting up the repo and relocating the working copy, unfortunately, it doesn't work; editing a page gives the error: -Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 +> Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 -I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com] -That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey +> That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey -A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com] -- cgit v1.2.3 From 5bee98156aaee2ea796703ecd5df2d4a25e9d9b8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:02:36 +0000 Subject: --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index a5da15b6a..ce271722c 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -2,8 +2,8 @@ Just as an experiment, I tried running ikiwiki using a remote repository, i.e. v > Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 -I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com] +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com]] > That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey -A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com] +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From 400aabe82d3d763ee700993c10985c8fb007c7b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 11:45:59 -0400 Subject: po: Allow enabling via web setup. The only unsafe thing should be that enabling it with some languages will generate po files. --- IkiWiki/Plugin/po.pm | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 7b62092e1..651c98ed7 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -89,7 +89,7 @@ sub import { sub getsetup () { return plugin => { - safe => 0, + safe => 1, rebuild => 1, # format plugin section => "format", }, @@ -110,7 +110,7 @@ sub getsetup () { 'es|Español', 'de|Deutsch' ], - description => "slave languages (PO files)", + description => "slave languages (translated via PO files) format: ll|Langname", safe => 1, rebuild => 1, }, diff --git a/debian/changelog b/debian/changelog index a89485f79..ebccf4698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low perl taint checking happy, but taint checking is disabled. * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 Thanks, Paul Menzel. + * po: Allow enabling via web setup. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From fbfda5ccfce40d3f0b5a6076ef02f07e9e5b8fd6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 13:13:00 -0400 Subject: po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web. --- IkiWiki/Plugin/po.pm | 81 ++++++++++++++++++++++++++++++++-------------------- debian/changelog | 2 ++ doc/plugins/po.mdwn | 2 +- 3 files changed, 53 insertions(+), 32 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 651c98ed7..a233fb5af 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -25,6 +25,7 @@ use File::Temp; use Memoize; use UNIVERSAL; +my ($master_language_code, $master_language_name); my %translations; my @origneedsbuild; my %origsubs; @@ -95,10 +96,7 @@ sub getsetup () { }, po_master_language => { type => "string", - example => { - 'code' => 'en', - 'name' => 'English' - }, + example => "en|English", description => "master language (non-PO files)", safe => 1, rebuild => 1, @@ -132,24 +130,31 @@ sub getsetup () { } sub checkconfig () { - foreach my $field (qw{po_master_language}) { - if (! exists $config{$field} || ! defined $config{$field}) { - error(sprintf(gettext("Must specify %s when using the %s plugin"), - $field, 'po')); + if (exists $config{po_master_language}) { + if (! ref $config{po_master_language}) { + ($master_language_code, $master_language_name)= + splitlangpair($config{po_master_language}); } + else { + $master_language_code=$config{po_master_language}{code}; + $master_language_name=$config{po_master_language}{name}; + } + } + if (! defined $master_language_code) { + $master_language_code='en'; + } + if (! defined $master_language_name) { + $master_language_name='English'; } if (ref $config{po_slave_languages} eq 'ARRAY') { my %slaves; foreach my $pair (@{$config{po_slave_languages}}) { - my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); - if (!defined $code || !defined $name) { - error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), - $pair)); + my ($code, $name)=splitlangpair($pair); + if (defined $code) { + push @slavelanguages, $code; + $slaves{$code} = $name; } - $slaves{$code} = $name; - push @slavelanguages, $code; - } $config{po_slave_languages} = \%slaves; } @@ -159,12 +164,12 @@ sub checkconfig () { } keys %{$config{po_slave_languages}}; } - delete $config{po_slave_languages}{$config{po_master_language}{code}};; + delete $config{po_slave_languages}{$master_language_code}; map { islanguagecode($_) or error(sprintf(gettext("%s is not a valid language code"), $_)); - } ($config{po_master_language}{code}, @slavelanguages); + } ($master_language_code, @slavelanguages); if (! exists $config{po_translatable_pages} || ! defined $config{po_translatable_pages}) { @@ -198,11 +203,11 @@ sub checkconfig () { if -d "$config{underlaydirbase}/po/$ll/$underlay"; } - if ($config{po_master_language}{code} ne 'en') { + if ($master_language_code ne 'en') { # Add underlay containing translated source files # for the master language. - add_underlay("locale/$config{po_master_language}{code}/$underlay") - if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay"; + add_underlay("locale/$master_language_code/$underlay") + if -d "$config{underlaydirbase}/locale/$master_language_code/$underlay"; } } } @@ -512,7 +517,7 @@ sub formbuilder_setup (@) { if ($form->field("do") eq "create") { # Warn the user: new pages must be written in master language. my $template=template("pocreatepage.tmpl"); - $template->param(LANG => $config{po_master_language}{name}); + $template->param(LANG => $master_language_name); $form->tmpl_param(message => $template->output); } elsif ($form->field("do") eq "edit") { @@ -601,7 +606,7 @@ sub mybeautify_urlpath ($) { my $res=$origsubs{'beautify_urlpath'}->($url); if (defined $config{po_link_to} && $config{po_link_to} eq "negotiated") { - $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!; + $res =~ s!/\Qindex.$master_language_code.$config{htmlext}\E$!/!; $res =~ s!/\Qindex.$config{htmlext}\E$!/!; map { $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!; @@ -824,7 +829,7 @@ sub lang ($) { if (1 < (my ($masterpage, $lang) = _istranslation($page))) { return $lang; } - return $config{po_master_language}{code}; + return $master_language_code; } sub islanguagecode ($) { @@ -837,7 +842,7 @@ sub otherlanguage_page ($$) { my $page=shift; my $code=shift; - return masterpage($page) if $code eq $config{po_master_language}{code}; + return masterpage($page) if $code eq $master_language_code; return masterpage($page) . '.' . $code; } @@ -851,9 +856,9 @@ sub otherlanguages_codes ($) { return \@ret unless istranslation($page) || istranslatable($page); my $curlang=lang($page); foreach my $lang - ($config{po_master_language}{code}, @slavelanguages) { + ($master_language_code, @slavelanguages) { next if $lang eq $curlang; - if ($lang eq $config{po_master_language}{code} || + if ($lang eq $master_language_code || istranslatedto(masterpage($page), $lang)) { push @ret, $lang; } @@ -1008,8 +1013,8 @@ sub percenttranslated ($) { sub languagename ($) { my $code=shift; - return $config{po_master_language}{name} - if $code eq $config{po_master_language}{code}; + return $master_language_name + if $code eq $master_language_code; return $config{po_slave_languages}{$code} if defined $config{po_slave_languages}{$code}; return; @@ -1022,13 +1027,13 @@ sub otherlanguagesloop ($) { if (istranslation($page)) { push @ret, { url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page), - code => $config{po_master_language}{code}, - language => $config{po_master_language}{name}, + code => $master_language_code, + language => $master_language_name, master => 1, }; } foreach my $lang (@{otherlanguages_codes($page)}) { - next if $lang eq $config{po_master_language}{code}; + next if $lang eq $master_language_code; my $otherpage = otherlanguage_page($page, $lang); push @ret, { url => urlto_with_orig_beautiful_urlpath($otherpage, $page), @@ -1233,6 +1238,20 @@ sub po4a_options($) { return %options; } +sub splitlangpair ($) { + my $pair=shift; + + my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); + if (! defined $code || ! defined $name || + ! length $code || ! length $name) { + # not a fatal error to avoid breaking if used with web setup + print STDERR sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), + $pair)."\n"; + } + + return $code, $name; +} + # ,---- # | PageSpecs # `---- diff --git a/debian/changelog b/debian/changelog index ebccf4698..72b220a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low perl taint checking happy, but taint checking is disabled. * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 Thanks, Paul Menzel. + * po: Make the po_master_language use a langpair like "en|English", + so it can be configured via the web. * po: Allow enabling via web setup. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index da58a9f49..2acbc366a 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -49,7 +49,7 @@ Supported languages `po_master_language` is used to set the "master" language in `ikiwiki.setup`, such as: - po_master_language => { 'code' => 'en', 'name' => 'English' } + po_master_language => 'en|English' `po_slave_languages` is used to set the list of supported "slave" languages, such as: -- cgit v1.2.3 From 23f88690092f4434335f0ae4df90fafbf58100eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 14:04:43 -0400 Subject: po: Auto-upgrade old format settings to new formats when writing setup file. --- IkiWiki/Plugin/po.pm | 27 +++++++++++++++++++-------- debian/changelog | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index a233fb5af..d920d3648 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -30,6 +30,7 @@ my %translations; my @origneedsbuild; my %origsubs; my @slavelanguages; # language codes ordered as in config po_slave_languages +my %slavelanguages; # language code to name lookup memoize("istranslatable"); memoize("_istranslation"); @@ -138,6 +139,7 @@ sub checkconfig () { else { $master_language_code=$config{po_master_language}{code}; $master_language_name=$config{po_master_language}{name}; + $config{po_master_language}=joinlangpair($master_language_code, $master_language_name); } } if (! defined $master_language_code) { @@ -148,23 +150,25 @@ sub checkconfig () { } if (ref $config{po_slave_languages} eq 'ARRAY') { - my %slaves; foreach my $pair (@{$config{po_slave_languages}}) { my ($code, $name)=splitlangpair($pair); if (defined $code) { push @slavelanguages, $code; - $slaves{$code} = $name; + $slavelanguages{$code} = $name; } } - $config{po_slave_languages} = \%slaves; } elsif (ref $config{po_slave_languages} eq 'HASH') { + %slavelanguages=%{$config{po_slave_languages}}; @slavelanguages = sort { $config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b}; - } keys %{$config{po_slave_languages}}; + } keys %slavelanguages; + $config{po_slave_languages}=[ + map { joinlangpair($_, $slavelanguages{$_}) } @slavelanguages + ] } - delete $config{po_slave_languages}{$master_language_code}; + delete $slavelanguages{$master_language_code}; map { islanguagecode($_) @@ -797,7 +801,7 @@ sub _istranslation ($) { return 0 unless defined $masterpage && defined $lang && length $masterpage && length $lang && defined $pagesources{$masterpage} - && defined $config{po_slave_languages}{$lang}; + && defined $slavelanguages{$lang}; return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang) if istranslatable($masterpage); @@ -1015,8 +1019,8 @@ sub languagename ($) { return $master_language_name if $code eq $master_language_code; - return $config{po_slave_languages}{$code} - if defined $config{po_slave_languages}{$code}; + return $slavelanguages{$code} + if defined $slavelanguages{$code}; return; } @@ -1252,6 +1256,13 @@ sub splitlangpair ($) { return $code, $name; } +sub joinlangpair ($$) { + my $code=shift; + my $name=shift; + + return "$code|$name"; +} + # ,---- # | PageSpecs # `---- diff --git a/debian/changelog b/debian/changelog index 72b220a4f..4b61a12b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web. * po: Allow enabling via web setup. + * po: Auto-upgrade old format settings to new formats when writing + setup file. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From 8c1a3595d49760ecedd7e56b6f2f2c5f2271b85d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 14:12:59 -0400 Subject: avoid dups getting into @slavelanguages This could happen if checkconfig was run twice, I think. --- IkiWiki/Plugin/po.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index d920d3648..ab39cca12 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -152,7 +152,7 @@ sub checkconfig () { if (ref $config{po_slave_languages} eq 'ARRAY') { foreach my $pair (@{$config{po_slave_languages}}) { my ($code, $name)=splitlangpair($pair); - if (defined $code) { + if (defined $code && ! exists $slavelanguages{$code}) { push @slavelanguages, $code; $slavelanguages{$code} = $name; } -- cgit v1.2.3 From 163fc34db7f29bc75a05c54b83c2a00c5ad899c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 14:20:53 -0400 Subject: use warn --- IkiWiki/Plugin/po.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index ab39cca12..a79e7d7f0 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -1249,8 +1249,8 @@ sub splitlangpair ($) { if (! defined $code || ! defined $name || ! length $code || ! length $name) { # not a fatal error to avoid breaking if used with web setup - print STDERR sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), - $pair)."\n"; + warn sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), + $pair); } return $code, $name; -- cgit v1.2.3 From a3ce17387c2af17a419114ef863afb6f06d4c816 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 20:50:05 +0000 Subject: --- doc/forum/recovering_original_title_with_meta_directive.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/recovering_original_title_with_meta_directive.mdwn diff --git a/doc/forum/recovering_original_title_with_meta_directive.mdwn b/doc/forum/recovering_original_title_with_meta_directive.mdwn new file mode 100644 index 000000000..ad0b02a9e --- /dev/null +++ b/doc/forum/recovering_original_title_with_meta_directive.mdwn @@ -0,0 +1 @@ +When using the \[[!meta title=""]] directive, the documentation states that a template variable is set when the title is overridden. However, how does one recover the original page title? --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From c4ebdd6f467f3361b1f444d9462e10acdbcf9322 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 17:17:08 -0400 Subject: Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. --- IkiWiki/Plugin/inline.pm | 5 +++-- IkiWiki/Render.pm | 2 +- debian/changelog | 3 +++ doc/plugins/write.mdwn | 13 +++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 715a3d652..20c5f3bdd 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -570,9 +570,9 @@ sub genfeed ($$$$$@) { } } + my $file=$pagesources{$p}; + my $type=pagetype($file); if ($itemtemplate->query(name => "enclosure")) { - my $file=$pagesources{$p}; - my $type=pagetype($file); if (defined $type) { $itemtemplate->param(content => $pcontent); } @@ -591,6 +591,7 @@ sub genfeed ($$$$$@) { } } else { + next unless defined $type; $itemtemplate->param(content => $pcontent); } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0dbe9611a..7ea919abc 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -760,7 +760,7 @@ sub refresh () { my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); run_hooks(needsbuild => sub { - my $ret=shift->($changed); + my $ret=shift->($changed, [@$del, @$internal_del]); $changed=$ret if ref $ret eq 'ARRAY'; }); my $oldlink_targets=calculate_old_links($changed, $del); diff --git a/debian/changelog b/debian/changelog index 4b61a12b0..bf294b6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * po: Allow enabling via web setup. * po: Auto-upgrade old format settings to new formats when writing setup file. + * Pass array of names of files that have been deleted to needsbuild hook + as second parameter, to allow for plugins that needs access to this + information earlier than the delete hook. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 31bb64e68..e60314485 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -177,10 +177,15 @@ function is passed no values. hook(type => "needsbuild", id => "foo", call => \&needsbuild); -This allows a plugin to manipulate the list of files that need to be -built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt. It should return an array reference -that is a modified version of its input. It can add or remove files from it. +This allows a plugin to observe or even manipulate the list of files that +need to be built when the wiki is refreshed. + +As its first parameter, the function is passed a reference to an array of +files that will be built. It should return an array reference that is a +modified version of its input. It can add or remove files from it. + +The second parameter passed to the function is a reference to an array of +files that have been deleted. ### scan -- cgit v1.2.3 From a68e98d9c26e6133624a3b4a54a6a67ce0d2fd86 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 13:06:45 -0400 Subject: bug report --- doc/bugs/po:_markdown_link_parse_bug.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/bugs/po:_markdown_link_parse_bug.mdwn diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn new file mode 100644 index 000000000..93400f4c0 --- /dev/null +++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn @@ -0,0 +1,14 @@ +Apparently this is legal markdown, though unusual syntax for a link: + + \[Branchable](http://www.branchable.com/ "Ikiwiki hosting") + +If that is put on a translatable page, the translations display it not as a +link, but in the escaped form that appears above. + +Probably a po4a bug, but I don't see the bug clearly in the gernerated po +file: + + "This was posted automatically by [Branchable](http://www.branchable.com/ " + "\"Ikiwiki hosting\") when I signed up." + +--[[Joey]] -- cgit v1.2.3 From 0ef8c10fe4a025ad13a8e5e1d3a4569489455ec4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 13:08:31 -0400 Subject: formatting --- doc/bugs/po:_markdown_link_parse_bug.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn index 93400f4c0..10715001c 100644 --- a/doc/bugs/po:_markdown_link_parse_bug.mdwn +++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn @@ -1,9 +1,9 @@ Apparently this is legal markdown, though unusual syntax for a link: - \[Branchable](http://www.branchable.com/ "Ikiwiki hosting") + [Branchable](http://www.branchable.com/ "Ikiwiki hosting") If that is put on a translatable page, the translations display it not as a -link, but in the escaped form that appears above. +link, but as plain text. Probably a po4a bug, but I don't see the bug clearly in the gernerated po file: -- cgit v1.2.3 From 41a10eb0b055467b2677295442480e40dfe3d277 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 14:31:34 -0400 Subject: actiontabs: Improve tab padding. --- debian/changelog | 1 + themes/actiontabs/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf294b6d4..7138824f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. + * actiontabs: Improve tab padding. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css index c5925cedd..13e9dc1a4 100644 --- a/themes/actiontabs/style.css +++ b/themes/actiontabs/style.css @@ -69,11 +69,11 @@ body { .pageheader .actions { position: absolute; - bottom: 5px; + bottom: 0; right: 2em; width: 100%; text-align: right; - padding: 0; + padding: 2px; } #content, #comments, #footer { -- cgit v1.2.3 From b5be85a611f83dd97f1f40daaf294b31d975b4a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 14:40:56 -0400 Subject: blueview: Fix display of links to translated pages in the page header. --- debian/changelog | 1 + themes/blueview/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7138824f9..3428aa6d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. * actiontabs: Improve tab padding. + * blueview: Fix display of links to translated pages in the page header. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/themes/blueview/style.css b/themes/blueview/style.css index 540cac415..c07d1cdfa 100644 --- a/themes/blueview/style.css +++ b/themes/blueview/style.css @@ -197,14 +197,14 @@ body { font-weight: bold; } -.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span { +.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li { padding: 0.25em 0.25em 0.25em 0.25em; background-image: url('background_darkness.png'); background-repeat: repeat; color: white; } -.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { +.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a { color: white; text-decoration: none; } -- cgit v1.2.3 From 46eb410220f0ad50c07693f746e0f38481aa194b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" Date: Sun, 12 Sep 2010 06:45:28 +0000 Subject: Added a comment --- ...ent_2_948e4678be6f82d9b541132405351a2c._comment | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment diff --git a/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment b/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment new file mode 100644 index 000000000..c3fb72db5 --- /dev/null +++ b/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment @@ -0,0 +1,31 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" + nickname="Geert" + subject="comment 2" + date="2010-09-12T06:45:27Z" + content=""" +After a re-installation of ikiwiki (first removed all old files), I get the following feedback: + + Successfully set up gwiki: + url: http://ubuntu1004/~geertvc/gwiki + srcdir: ~/gwiki + destdir: ~/public_html/gwiki + repository: ~/gwiki.git + To modify settings, edit ~/gwiki.setup and then run: + ikiwiki -setup ~/gwiki.setup + + +In the lighttpd config file (/etc/lighttpd/lighttpd.conf), I've now changed the item \"server.document-root\" from the default \"/var/www\" to (in my case) \"/home/geertvc/public_html/gwiki\". I've taken the destdir location (see above) as document root for lighttpd. + +When doing this, I can see the \"index.html\" page of ikiwiki (by typing the following URL in the address box of the browser: \"ubuntu1004/index.html\"). So, that seems to be the right modification, right? Or isn't it? + +Note: when I take the directory \"/home/geertvc/gwiki\" (= the URL given above), then things do not work. I can't see the content of \"index.html\", I get the error message I mentioned in my initial post (404 - not found). + +But when clicking, for instance, the \"Edit\" button, the link brings me to the following location: + + http://ubuntu1004/~geertvc/gwiki/ikiwiki.cgi?page=index&do=edit + +However, there's not at all a file called \"ikiwiki.cgi\" at that location. The location of the file \"ikiwiki.cgi\" is \"/home/geertvc/public_html/gwiki\", so why is the link \"Edit\" leading me to that (wrong?) location? + +Apparently, something is still wrong with my settings. Hope, with the above information, someone can put me on the right track... +"""]] -- cgit v1.2.3 From bf8991112089b6d6f77856fff02fd0496330469b Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Sep 2010 12:26:49 +0000 Subject: Added a comment: Follow instructions --- .../comment_3_4c7b1fa88776815bbc6aa286606214c2._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment diff --git a/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment b/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment new file mode 100644 index 000000000..9f606f04e --- /dev/null +++ b/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://jmtd.livejournal.com/" + ip="78.105.191.131" + subject="Follow instructions" + date="2010-09-12T12:26:49Z" + content=""" +Please re-read my comment. If you enable usersdirs then /~user corresponds to ~/public_html. The change you have made has / corresponding instead, which is why the links don't work. +"""]] -- cgit v1.2.3 From 75bf370d4c9aedaa039a93753ff093447c8f09fc Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 15:36:28 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn new file mode 100644 index 000000000..50047789e --- /dev/null +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -0,0 +1,3 @@ +The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. + +Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". -- cgit v1.2.3 From c2950540725db1dda7c02f567c7c26a0f86c98f3 Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 15:38:19 +0000 Subject: added signature --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 50047789e..137fc2398 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -1,3 +1,5 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". + +--[[blipvert]] -- cgit v1.2.3 From adfe73de439162ec3dca344573409fb89a8909ce Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 17:01:55 +0000 Subject: minor grammatical edit --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 137fc2398..4f42b082f 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -1,5 +1,5 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. -Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". +Pruning remote branches can be done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". --[[blipvert]] -- cgit v1.2.3 From f4392bc4dd3be5833b8a7b3c1b37515a7e3b3b1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Sep 2010 15:56:17 -0400 Subject: response --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 4f42b082f..bf68350e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -3,3 +3,7 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _ Pruning remote branches can be done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". --[[blipvert]] + +> I'll need more information than that before I add extra processing +> work to the current git commands it uses. I don't see any errors here +> from obsolete remote branches. --[[Joey]] -- cgit v1.2.3 From 827bd1d99027b845cb2fbc9f87200b5316f449c6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:48:49 +0000 Subject: --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 5097acaef..992ea0a2a 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -16,3 +16,5 @@ This makes it a little hard to specify which specific binaries should be used, e > The ikiwiki script's own sanitization of PATH was done to make perl taint > checking happy, but as taint checking is disabled anyway, I have removed > that. [[done]] --[[Joey]] + +Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From f6127eb9fa53d375f6ad3d079c75a279c268e9cd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:50:33 +0000 Subject: Add comment about this issue --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 992ea0a2a..1cf99d826 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -17,4 +17,4 @@ This makes it a little hard to specify which specific binaries should be used, e > checking happy, but as taint checking is disabled anyway, I have removed > that. [[done]] --[[Joey]] -Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] +Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] (Also the person who started this by filing an issue with MacPorts; I'm experimenting with ikiwiki for collaborative documentation.) -- cgit v1.2.3 From 62c2fdbb257720cdbb79415437a3a312e5277ce6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:53:01 +0000 Subject: Hopefully solve it myself, based on comments found elsewhere. --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index ce271722c..8d9c27e46 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -7,3 +7,5 @@ I think this is because, despite a SetEnv directive in the apache configuration, > That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com]] + +Actually, this probably doesn't need to be a plugin; setting SVN_SSH in ENV can probably be done through the setup file. (Right?) --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From a52ef8d746bacdf3137effe03393c0ef06cc7917 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Sep 2010 18:53:34 -0400 Subject: response --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 1cf99d826..6781d4b4b 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -18,3 +18,7 @@ This makes it a little hard to specify which specific binaries should be used, e > that. [[done]] --[[Joey]] Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] (Also the person who started this by filing an issue with MacPorts; I'm experimenting with ikiwiki for collaborative documentation.) + +> The suid wrappers remove all environment variables except for a few used +> for CGI. PATH is not propigated by them, so when they run ikiwiki it will +> get the system's default path now. --[[Joey]] -- cgit v1.2.3 From d2fbde0e814d873017ccc7d71eb585b9391dff9a Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sun, 12 Sep 2010 19:25:38 -0500 Subject: new version of the ikiwiki vim plugin. docs upgraded. new forum post --- doc/forum/ikiwiki_vim_integration.mdwn | 17 +++++++++++++++++ doc/forum/link_autocompletion_in_vim.mdwn | 7 ++++++- doc/plugins/contrib/headinganchors.mdwn | 1 + doc/tips/vim_and_ikiwiki.mdwn | 28 ++++++++++++++++++++++++++++ doc/tips/vim_syntax_highlighting.mdwn | 5 +++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 doc/forum/ikiwiki_vim_integration.mdwn create mode 100644 doc/tips/vim_and_ikiwiki.mdwn diff --git a/doc/forum/ikiwiki_vim_integration.mdwn b/doc/forum/ikiwiki_vim_integration.mdwn new file mode 100644 index 000000000..4724807e8 --- /dev/null +++ b/doc/forum/ikiwiki_vim_integration.mdwn @@ -0,0 +1,17 @@ +Hi all. I upgraded the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) +so that now it supports: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) + +I've also created a new page unifying all the hints available here to use vim +with ikiwiki files, in [[tips/vim_and_ikiwiki]] + + +--[[jerojasro]] + diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn index 7d3ed8b02..a46c7e4c1 100644 --- a/doc/forum/link_autocompletion_in_vim.mdwn +++ b/doc/forum/link_autocompletion_in_vim.mdwn @@ -1,5 +1,10 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content. + +------ + I extended the functionality of the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) -(see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of +(see [[here|tips/vim_ikiwiki_ftplugin]]) to allow completion of wikilinks from inside vim, through the omnicompletion mechanism. It still has some bugs, but is usable, and will not destroy your data. It can diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index becbf89a5..5ef054bce 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=headinganchors author="[[PaulWise]]"]] +[[ikiwiki/directive/cosa]] This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn new file mode 100644 index 000000000..eb22e353a --- /dev/null +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -0,0 +1,28 @@ +# Vim and ikiwiki + +## Syntax highlighting + +[ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim +syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights +directives and wikilinks. It only supports prefixed directives, i.e., +\[[!directive foo=bar baz]], not the old format with spaces. + +------ + +The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +it seems to not be [[maintained +anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], +and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. + +## Page creation and navigation + +The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) package +is a vim plugin that enables you to do the following from inside vim: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn index bf7104aec..8f2fdc1f0 100644 --- a/doc/tips/vim_syntax_highlighting.mdwn +++ b/doc/tips/vim_syntax_highlighting.mdwn @@ -1,3 +1,8 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content + +-------- + [ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights directives and wikilinks. It only supports prefixed directives, i.e., -- cgit v1.2.3 From 4c74a6c0925f16de1583e28fe11833ee0a93fdc9 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sun, 12 Sep 2010 19:27:44 -0500 Subject: reverted typo --- doc/plugins/contrib/headinganchors.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index 5ef054bce..becbf89a5 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,5 +1,4 @@ [[!template id=plugin name=headinganchors author="[[PaulWise]]"]] -[[ikiwiki/directive/cosa]] This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, -- cgit v1.2.3 From bed67815fb34ed8210e8cf9c53017f902e7439c5 Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:44:37 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index bf68350e3..5b7be1187 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -7,3 +7,5 @@ Pruning remote branches can be done automatically with the --prune option to "gi > I'll need more information than that before I add extra processing > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] + +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). -- cgit v1.2.3 From c647e12c92fe635e07734946e815db41ec44ddfd Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:45:13 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 5b7be1187..4c1e461e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -8,4 +8,4 @@ Pruning remote branches can be done automatically with the --prune option to "gi > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] -Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). --[[blipvert]] -- cgit v1.2.3 From 0586d52f1f8978e53e90df32a21ebd346eabaa1b Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:46:22 +0000 Subject: fix typo --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 4c1e461e3..01f3d1a28 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -8,4 +8,4 @@ Pruning remote branches can be done automatically with the --prune option to "gi > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] -Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). --[[blipvert]] +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resources (any commits they point to cannot be garbage collected). --[[blipvert]] -- cgit v1.2.3 From 24ff4a9e5f365854ebef59ca2ef99552fdc5b4a6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 12:49:31 -0400 Subject: revert accidentially committed change --- IkiWiki/Plugin/inline.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 20c5f3bdd..715a3d652 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -570,9 +570,9 @@ sub genfeed ($$$$$@) { } } - my $file=$pagesources{$p}; - my $type=pagetype($file); if ($itemtemplate->query(name => "enclosure")) { + my $file=$pagesources{$p}; + my $type=pagetype($file); if (defined $type) { $itemtemplate->param(content => $pcontent); } @@ -591,7 +591,6 @@ sub genfeed ($$$$$@) { } } else { - next unless defined $type; $itemtemplate->param(content => $pcontent); } -- cgit v1.2.3 From b9dfa39e9f6805f7c37252937224ac3f281cb6ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 15:11:46 -0400 Subject: further thought --- doc/todo/po:_rethink_pagespecs.mdwn | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index 50c10c5db..ada372b0e 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -9,3 +9,27 @@ default when locking pages.) --[[Joey]] > list must be restricted to pages in the master (or current?) > language, and the ones that should not. The only solution I can see > to this surprising behaviour is: documentation. --[[intrigeri]] + +>> Well, a sorting criteria might be that if a PageSpec is used +>> with a specified locaction, as happens whenever a PageSpec is +>> used on a page, then it should match only `currentlang()`. If it +>> is used without a location, as in the setup file, then no such limit. +>> +>> Note that +>> `match_currentlang` currently dies if called w/o a location -- if +>> it instead was always true w/o a location, this would just mean that +>> all pagespecs should have `and currentlang()` added to them. How to +>> implement that? All I can think of doing is wrapping +>> `pagespec_translate`. +>> +>> The only case I've found where it does make sense to match other +>> language pages is on `l10n.ikiwiki.info` when listing pages that +>> need translation. +>> +>> Otherwise, it can be documented, but that's not really enough; +>> a user who makes a site using auto-blog.setup and enables po will +>> get a really scred up blog that lists translations as separate posts +>> and needs significant work to fix. I have thought about making +>> `match_currentlang` a stub in IkiWiki, so I can use it in all +>> the PageSpecs in the example blog, but I can't say I love the idea. +>> --[[Joey]] -- cgit v1.2.3 From ddd987711fdb249245de408f503dad52d225f06a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 15:13:07 -0400 Subject: mention branch --- doc/todo/po:_rethink_pagespecs.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index ada372b0e..686f3e77d 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -28,8 +28,9 @@ default when locking pages.) --[[Joey]] >> >> Otherwise, it can be documented, but that's not really enough; >> a user who makes a site using auto-blog.setup and enables po will ->> get a really scred up blog that lists translations as separate posts +>> get a really screwed up blog that lists translations as separate posts >> and needs significant work to fix. I have thought about making ->> `match_currentlang` a stub in IkiWiki, so I can use it in all ->> the PageSpecs in the example blog, but I can't say I love the idea. +>> `match_currentlang` a stub in IkiWiki (done in my currentlang branch), +>> so I can use it in all the PageSpecs in the example blog etc, but I +>> can't say I love the idea. >> --[[Joey]] -- cgit v1.2.3 From 8e8b011c1a64cc15b08e0e61f1bb85eede1e3318 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Mon, 13 Sep 2010 19:37:50 +0000 Subject: mixing template vars into directive arguments --- ..._39__t_mix_template_vars_inside_directives.mdwn | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn new file mode 100644 index 000000000..0fa85effb --- /dev/null +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -0,0 +1,33 @@ +I often find myself wrapping the same boiler plate around [[ikiwiki/directives/img]] img directives, so I tried to encapsulate it using the following [[ikiwiki/directives/template]]: + + +
+ [\[!img + size="" + + + alt="" + + + alt="" + + alt="[pic]" + + + + ]] + +

+ +
+ +The result, even with htmlscrubber disabled, is mangled, something like + +
+ ?size + +
+ +Any suggestions gladly received. -- [[Jon]] -- cgit v1.2.3 From 20239007a73175ab9567a84339102b6085b02e31 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 15:44:08 -0400 Subject: update for changed data structure --- po/po2wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/po2wiki b/po/po2wiki index 6b84f7d54..116abbfec 100755 --- a/po/po2wiki +++ b/po/po2wiki @@ -22,7 +22,7 @@ foreach my $file (@$files) { $pagesources{$page}=$file; # used by po plugin functions } -foreach my $ll (keys %{$config{po_slave_languages}}) { +foreach my $ll (@{$config{po_slave_languages}}) { $config{destdir}="../underlays/locale/$ll"; foreach my $file (@$files) { -- cgit v1.2.3 From a4b4b464d27490d3868e8430a6f833b54a625cad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 16:48:12 -0400 Subject: further fixes for config data structure change --- po/po2wiki | 3 ++- po/underlay.setup | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/po/po2wiki b/po/po2wiki index 116abbfec..126aa8e17 100755 --- a/po/po2wiki +++ b/po/po2wiki @@ -22,7 +22,8 @@ foreach my $file (@$files) { $pagesources{$page}=$file; # used by po plugin functions } -foreach my $ll (@{$config{po_slave_languages}}) { +foreach my $lang (@{$config{po_slave_languages}}) { + my ($ll, $name)=IkiWiki::Plugin::po::splitlangpair($lang); $config{destdir}="../underlays/locale/$ll"; foreach my $file (@$files) { diff --git a/po/underlay.setup b/po/underlay.setup index 8d3516cff..ebe7251cf 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -6,14 +6,14 @@ use IkiWiki::Setup::Standard { # List here all languages that have translations. # Listing languages without active translations # will excessively bloat things. - po_slave_languages => { - 'es' => 'Español', - 'de' => 'Deutsch', - 'fr' => 'Français', - 'da' => 'Dansk', - 'cs' => 'česky', - }, - po_master_language => { 'code' => 'en', 'name' => 'English' }, + po_slave_languages => [ + 'es|Español', + 'de|Deutsch', + 'fr|Français', + 'da|Dansk', + 'cs|česky', + ], + po_master_language => 'en|English', po_translatable_pages => "*", add_plugins => [qw{po}], -- cgit v1.2.3 From 894d09ba9482dd53448986f487ca0f372083fee4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 12:40:40 -0400 Subject: Set isPermaLink="no" for guids in rss feeds. The rss spec says that unless the attribute is set, guid elements *are* permalinks. The problem with that is that if [[meta permalink=]] is used, as is done with aggregated posts, that goes into the link element, and apparently some rss readers prefer the not-really-permalink in the guid element when linking to the post. Without meta permalink, the link and guid elements have the same content, so it should be ok, in that case too for the guid to not be a permalink. (Checked and this does not flood aggregators.) --- debian/changelog | 1 + templates/rssitem.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3428aa6d3..8b127b574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low information earlier than the delete hook. * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. + * Set isPermaLink="no" for guids in rss feeds. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a64a4ebd7..272b340bb 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -8,7 +8,7 @@ - + -- cgit v1.2.3 From 16aad6825d2cdae2c1e06604f9d5652d376fca18 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Tue, 14 Sep 2010 17:04:14 +0000 Subject: corrected link --- doc/tips/vim_and_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn index eb22e353a..e4136aa5d 100644 --- a/doc/tips/vim_and_ikiwiki.mdwn +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -9,7 +9,7 @@ directives and wikilinks. It only supports prefixed directives, i.e., ------ -The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +The previous syntax definition for ikiwiki links is at [[vim_syntax_highlighting/ikiwiki.vim]]; however, it seems to not be [[maintained anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. -- cgit v1.2.3 From 382b0b349988d92f8571b38beb8be003e0b334a0 Mon Sep 17 00:00:00 2001 From: "http://k1024.org/~iusty/" Date: Tue, 14 Sep 2010 18:33:15 +0000 Subject: Add new bug about the comments/blogspam plugins --- .../blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn new file mode 100644 index 000000000..22242a97f --- /dev/null +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -0,0 +1,10 @@ +Hi, + +I'm trying to add a comment, and ikiwiki fails with this error message: + + Error: HTTP::Message content must be bytes at /usr/share/perl5/RPC/XML/Client.pm line 308 + +This seems to happen because I had a non-ASCII character in the comment (an ellipse, …). +The interesting part is that the comment preview works fine, just the save fails. Probably +this means that the blogspam plugin is the culprit (hence the error in RPC::XML::Client library). +I'm using version 3.20100815~bpo50+. Thanks! -- cgit v1.2.3 From e0898ae1a8e64a12c4e47b3f922d6cf1fad4f31c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:23:16 -0400 Subject: blogspam: Fix crash when content contained utf-8. I also tried setting RPC::XML::ENCODING but that did not prevent the crash, and it seems that blogspam.net doesn't like getting xml encoded in unicode, since it mis-flagged comments as spammy that way that are normally allowed through. --- IkiWiki/Plugin/blogspam.pm | 12 +++++++----- debian/changelog | 1 + .../blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index 8db3780e8..f0b6cb2a2 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::blogspam; use warnings; use strict; use IkiWiki 3.00; +use Encode; my $defaulturl='http://test.blogspam.net:8888/'; @@ -68,6 +69,7 @@ sub checkcontent (@) { my $url=$defaulturl; $url = $config{blogspam_server} if exists $config{blogspam_server}; + my $client = RPC::XML::Client->new($url); my @options = split(",", $config{blogspam_options}) @@ -90,12 +92,12 @@ sub checkcontent (@) { my %req=( ip => $session->remote_addr(), - comment => defined $params{diff} ? $params{diff} : $params{content}, - subject => defined $params{subject} ? $params{subject} : "", - name => defined $params{author} ? $params{author} : "", - link => exists $params{url} ? $params{url} : "", + comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}), + subject => encode_utf8(defined $params{subject} ? $params{subject} : ""), + name => encode_utf8(defined $params{author} ? $params{author} : ""), + link => encode_utf8(exists $params{url} ? $params{url} : ""), options => join(",", @options), - site => $config{url}, + site => encode_utf8($config{url}), version => "ikiwiki ".$IkiWiki::version, ); my $res = $client->send_request('testComment', \%req); diff --git a/debian/changelog b/debian/changelog index 8b127b574..0eb5810d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. + * blogspam: Fix crash when content contained utf-8. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn index 22242a97f..265040d67 100644 --- a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -8,3 +8,8 @@ This seems to happen because I had a non-ASCII character in the comment (an elli The interesting part is that the comment preview works fine, just the save fails. Probably this means that the blogspam plugin is the culprit (hence the error in RPC::XML::Client library). I'm using version 3.20100815~bpo50+. Thanks! + +> I've filed an upstream bug about this on RPC::XML: +> +> +> Worked around it in blogspam by decoding. --[[Joey]] -- cgit v1.2.3 From 0ff945ddf19010b890458face057505f7b48b572 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:37:45 -0400 Subject: external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. --- IkiWiki/Plugin/external.pm | 2 ++ debian/changelog | 3 +++ doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn | 3 +++ 3 files changed, 8 insertions(+) diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm index ec91c79db..a4cc1dd3c 100644 --- a/IkiWiki/Plugin/external.pm +++ b/IkiWiki/Plugin/external.pm @@ -28,7 +28,9 @@ sub import { $plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid, accum => ""}; + $RPC::XML::ENCODING="utf-8"; + $RPC::XML::FORCE_STRING_ENCODING="true"; rpc_call($plugins{$plugin}, "import"); } diff --git a/debian/changelog b/debian/changelog index 0eb5810d0..46401b58c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. * blogspam: Fix crash when content contained utf-8. + * external: Disable RPC::XML's "smart" encoding, which sent ints + for strings that contained only a number, fixing a longstanding crash + of the rst plugin. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn index dab3b7e5b..99e46aac9 100644 --- a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn +++ b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn @@ -24,3 +24,6 @@ throwing code..): > No, still the same failure. I think it's failing parsing the input data, > (which perl probably transmitted as an int due to perl internals) > not writing out its response. --[[Joey]] + +> On second thought, this was a bug in ikiwiki, it should be transmitting +> that as a string. Fixed in external.pm --[[Joey]] -- cgit v1.2.3 From 57d0ef239b1a153d3c2da50e23c95f43e9b56cc0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:39:30 -0400 Subject: update --- doc/plugins/write/external.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/plugins/write/external.mdwn b/doc/plugins/write/external.mdwn index e30bf2ff3..a3fbe8a2c 100644 --- a/doc/plugins/write/external.mdwn +++ b/doc/plugins/write/external.mdwn @@ -1,7 +1,7 @@ External plugins are standalone, executable programs, that can be written in any language. When ikiwiki starts up, it runs the program, and -communicates with it using [XML RPC][xmlrpc]. If you want to [[write]] an external -plugin, read on.. +communicates with it using [XML RPC][xmlrpc]. If you want to [[write]] an +external plugin, read on.. [xmlrpc]: http://www.xmlrpc.com/ @@ -85,8 +85,8 @@ language as part of their XML RPC interface. XML RPC has a limitation that it does not have a way to pass undef/NULL/None. There is an extension to the protocol that supports this, -but it is not yet available in the [[!cpan XML::RPC]] library used by -ikiwiki. +but it is not yet available in all versions of the [[!cpan XML::RPC]] library +used by ikiwiki. Until the extension is available, ikiwiki allows undef to be communicated over XML RPC by passing a sentinal value, a hash with a single key "null" -- cgit v1.2.3 From 8c8d2c2d2cd259f3e72fd0a4022d02e15e66104f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:44:52 -0400 Subject: close --- doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn index 265040d67..59bf93d14 100644 --- a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -12,4 +12,4 @@ I'm using version 3.20100815~bpo50+. Thanks! > I've filed an upstream bug about this on RPC::XML: > > -> Worked around it in blogspam by decoding. --[[Joey]] +> Worked around it in blogspam by decoding. [[done]] --[[Joey]] -- cgit v1.2.3 From cd794613b6f5140365e51f79023c882e8ea71197 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:45:38 -0400 Subject: git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. --- IkiWiki/Plugin/git.pm | 2 +- debian/changelog | 2 ++ doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index d342a7398..fd57ce1e4 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -462,7 +462,7 @@ sub rcs_update () { # Update working directory. if (length $config{gitorigin_branch}) { - run_or_cry('git', 'pull', $config{gitorigin_branch}); + run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch}); } } diff --git a/debian/changelog b/debian/changelog index 46401b58c..27e0fb103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 01f3d1a28..5dc4250e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -9,3 +9,6 @@ Pruning remote branches can be done automatically with the --prune option to "gi > from obsolete remote branches. --[[Joey]] Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resources (any commits they point to cannot be garbage collected). --[[blipvert]] + +> Ok, so git pull --prune can be used to do everything in one command. +> [[done]] --[[Joey]] -- cgit v1.2.3 From 953ff0e6de65f084f733e9506788c0c12bc1d187 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 15 Sep 2010 05:31:41 +0000 Subject: Report. --- ..._in_this_page_--_missing_page_dependencies.mdwn | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn new file mode 100644 index 000000000..356f9155a --- /dev/null +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -0,0 +1,26 @@ +That one has bitten me for some time; here is the minimal testcase. There is +also an equivalent (I suppose) problem when using another plugin, but I hope +it's enough to track it down for this one. + + $ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2) + $ cd bug-dep_order/ + $ ./render_locally + [...] + $ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied' + $ [no output] + $ touch news/2010-07-31.mdwn + $ ./render_locally + refreshing wiki.. + scanning news/2010-07-31.mdwn + building news/2010-07-31.mdwn + building news.mdwn, which depends on news/2010-07-31 + building index.mdwn, which depends on news/2010-07-31 + done + $ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied' + /home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:

[[!paste Error: no text was copied in this page]]

+ /home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:

[[!paste Error: no text was copied in this page]]

+ +This error shows up only for *news.html*, but not in *news/2010-07-31* or for +the aggregation in *index.html* or its RSS and atom files. + +--[[tschwinge]] -- cgit v1.2.3 From 3371ef20f6c9bcdd35b52f25427cd5d1c7826534 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 15 Sep 2010 05:34:11 +0000 Subject: bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies --- doc/users/tschwinge.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 46c29a0d6..944105349 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -138,6 +138,7 @@ discussed in *N-to-M Mapping of Input and Output Files* on ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions (refresh only, but not rebuild?). Perhaps missing to read in / parse some files? + [[Reported|bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies]]. * [[plugins/recentchanges]] -- cgit v1.2.3 From 852cc25f3b5d0f7b026e37a6231334edc92d367f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 15 Sep 2010 14:39:42 +0200 Subject: reply --- doc/todo/po:_rethink_pagespecs.mdwn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index 686f3e77d..98c7ff655 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -14,14 +14,18 @@ default when locking pages.) --[[Joey]] >> with a specified locaction, as happens whenever a PageSpec is >> used on a page, then it should match only `currentlang()`. If it >> is used without a location, as in the setup file, then no such limit. ->> + +>>> Ok. --[[intrigeri]] + >> Note that >> `match_currentlang` currently dies if called w/o a location -- if >> it instead was always true w/o a location, this would just mean that >> all pagespecs should have `and currentlang()` added to them. How to >> implement that? All I can think of doing is wrapping >> `pagespec_translate`. ->> + +>>> Seems doable. --[[intrigeri]] + >> The only case I've found where it does make sense to match other >> language pages is on `l10n.ikiwiki.info` when listing pages that >> need translation. -- cgit v1.2.3 From 78e89acf370cd456b64a163cc1963362c14ebe28 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 15:38:06 -0400 Subject: update test --- t/permalink.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/permalink.t b/t/permalink.t index adb8648b4..81d4d1820 100755 --- a/t/permalink.t +++ b/t/permalink.t @@ -8,6 +8,6 @@ ok(! system("make -s ikiwiki.out")); ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out")); # This guid should never, ever change, for any reason whatsoever! my $guid="http://example.com/post/"; -ok(length `grep '$guid' t/tmp/out/index.rss`); -ok(length `grep '$guid' t/tmp/out/index.atom`); +ok(length `egrep '$guid' t/tmp/out/index.rss`); +ok(length `egrep '$guid' t/tmp/out/index.atom`); ok(! system("rm -rf t/tmp t/tinyblog/.ikiwiki")); -- cgit v1.2.3 From 884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:24:50 -0400 Subject: cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. --- IkiWiki/Plugin/cutpaste.pm | 31 +++++++++++++++------- debian/changelog | 2 ++ ..._in_this_page_--_missing_page_dependencies.mdwn | 20 ++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm index 4a8817168..0f6ea0b1f 100644 --- a/IkiWiki/Plugin/cutpaste.pm +++ b/IkiWiki/Plugin/cutpaste.pm @@ -5,10 +5,9 @@ use warnings; use strict; use IkiWiki 3.00; -my %savedtext; - sub import { hook(type => "getsetup", id => "cutpaste", call => \&getsetup); + hook(type => "needsbuild", id => "cutpaste", call => \&needsbuild); hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1); hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1); hook(type => "preprocess", id => "paste", call => \&preprocess_paste); @@ -23,6 +22,22 @@ sub getsetup () { }, } +sub needsbuild (@) { + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{cutpaste}) { + if (exists $pagesources{$page} && + grep { $_ eq $pagesources{$page} } @$needsbuild) { + # remove state, will be re-added if + # the cut/copy directive is still present + # on rebuild. + delete $pagestate{$page}{cutpaste}; + } + } + } + return $needsbuild; +} + sub preprocess_cut (@) { my %params=@_; @@ -32,8 +47,7 @@ sub preprocess_cut (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return "" if defined wantarray; } @@ -47,8 +61,7 @@ sub preprocess_copy (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text}) if defined wantarray; @@ -63,15 +76,15 @@ sub preprocess_paste (@) { } } - if (! exists $savedtext{$params{page}}) { + if (! exists $pagestate{$params{page}}{cutpaste}) { error gettext('no text was copied in this page'); } - if (! exists $savedtext{$params{page}}->{$params{id}}) { + if (! exists $pagestate{$params{page}}{cutpaste}{$params{id}}) { error sprintf(gettext('no text was copied in this page with id %s'), $params{id}); } return IkiWiki::preprocess($params{page}, $params{destpage}, - $savedtext{$params{page}}->{$params{id}}); + $pagestate{$params{page}}{cutpaste}{$params{id}}); } 1; diff --git a/debian/changelog b/debian/changelog index 27e0fb103..d6eebea78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low of the rst plugin. * git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. + * cutpaste: Fix bug that occured in some cases involving inlines when + text was pasted on a page before being cut. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 356f9155a..4535cf35d 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -24,3 +24,23 @@ This error shows up only for *news.html*, but not in *news/2010-07-31* or for the aggregation in *index.html* or its RSS and atom files. --[[tschwinge]] + +> So the cutpaste plugin, in order to support pastes +> that come before the corresponding cut in the page, +> relies on the scan hook being called for the page +> before it is preprocessed. +> +> In the case of an inline, this doesn't happen, if +> the page in question has not changed. +> +> Really though it's not just inline, it's potentially anything +> that preprocesses content. None of those things guarantee that +> scan gets re-run on it first. +> +> I think cutpaste is going beyond the intended use of scan hooks, +> which is to gather link information, not do arbitrary data collection. +> Requiring scan be run repeatedly could be a lot more work. +> +> Using `%pagestate` to store the cut content when scanning would be +> one way to fix this bug. It would mean storing potentially big chunks +> of page content in the indexdb. --[[Joey]] -- cgit v1.2.3 From 3d4313f21d2b61ff323fb26805b29c9b59e1ace5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:40:26 -0400 Subject: releasing version 3.20100915 --- debian/changelog | 6 +-- debian/control | 2 +- ikiwiki.spec | 2 +- po/bg.po | 133 +++++++++++++++++++++++++++---------------------------- po/cs.po | 133 +++++++++++++++++++++++++++---------------------------- po/da.po | 133 +++++++++++++++++++++++++++---------------------------- po/de.po | 133 +++++++++++++++++++++++++++---------------------------- po/es.po | 133 +++++++++++++++++++++++++++---------------------------- po/fr.po | 133 +++++++++++++++++++++++++++---------------------------- po/gu.po | 133 +++++++++++++++++++++++++++---------------------------- po/ikiwiki.pot | 133 +++++++++++++++++++++++++++---------------------------- po/it.po | 133 +++++++++++++++++++++++++++---------------------------- po/pl.po | 133 +++++++++++++++++++++++++++---------------------------- po/sv.po | 133 +++++++++++++++++++++++++++---------------------------- po/tr.po | 133 +++++++++++++++++++++++++++---------------------------- po/vi.po | 133 +++++++++++++++++++++++++++---------------------------- 16 files changed, 863 insertions(+), 876 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6eebea78..8286b7887 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -ikiwiki (3.20100832) UNRELEASED; urgency=low +ikiwiki (3.20100915) unstable; urgency=low * needsbuild hook interface changed; the hooks should now return - the modified array of things that need built. (Backwards compatability + the modified array of things that need built. (Backwards compatibility code keeps plugins using the old interface working.) * Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. @@ -27,7 +27,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. - -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 + -- Joey Hess Wed, 15 Sep 2010 16:29:01 -0400 ikiwiki (3.20100831) unstable; urgency=low diff --git a/debian/control b/debian/control index 2c35ea356..71c9e18bb 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libfile-chdir-perl, Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki diff --git a/ikiwiki.spec b/ikiwiki.spec index 85d912da0..534c3a001 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100831 +Version: 3.20100915 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 845b3f7fa..4fb771b75 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -64,68 +64,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "нов източник" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "съобщения" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "готово" @@ -179,7 +179,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -282,18 +282,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -320,22 +320,22 @@ msgstr "създаване на %s" msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -384,8 +384,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" @@ -505,22 +504,22 @@ msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -594,21 +593,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -617,92 +616,92 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "гласуване" @@ -1006,11 +1005,11 @@ msgstr "липсващ параметър „id” на шаблона" msgid "%s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" @@ -1116,12 +1115,12 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1190,27 +1189,27 @@ msgstr "крешка при компилиране на файла %s" msgid "successfully generated %s" msgstr "успешно генериране на %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "формат: ikiwiki [опции] източник местоназначение" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." diff --git a/po/cs.po b/po/cs.po index 7f1775b7d..068327ecb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -64,67 +64,67 @@ msgstr "Agregace spuštěna přes web." msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nový kanál" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "příspěvky" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "poslední kontrola %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji kanál %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít kanál na %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "kanál nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(entity byly v kanálu zakódovány)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "kanál shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "hotovo" @@ -175,7 +175,7 @@ msgstr "příloha nahrána" msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -283,18 +283,18 @@ msgstr[1] "Komentáře" msgid "Comment" msgstr "Komentáře" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametr %s je povinný" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "na této stránce nebyl zkopírován žádný text" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "na této stránce nebyl zkopírován žádný text s id %s" @@ -321,20 +321,20 @@ msgstr "vytvářím %s" msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "nebyl zadán parametr template" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -381,8 +381,7 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" @@ -492,19 +491,19 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -579,21 +578,21 @@ msgstr "resetování hesla bylo zamítnuto" msgid "Ping received." msgstr "Obdrženo pinknutí." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "vyžaduje parametry „from“ a „to“" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Pinknu %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignoruji direktivu ping pro wiki %s (toto je wiki %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP nebyl nalezen, nepinkám" @@ -601,35 +600,30 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -637,7 +631,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -645,55 +639,60 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " "stránku" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "hlasovat" @@ -986,11 +985,11 @@ msgstr "chybí parametr id" msgid "%s not found" msgstr "%s nenalezen" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" @@ -1101,12 +1100,12 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1175,28 +1174,28 @@ msgstr "nelze zkompilovat %s" msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "použití: ikiwiki [volby] zdroj cíl" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup konfigurační.soubor" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "obnovuji wiki..." diff --git a/po/da.po b/po/da.po index 32a75ed0b..45cb8bab9 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -68,67 +68,67 @@ msgstr "Indsamling udløst via web." msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Intet at gøre lige nu, alle fødninger er tidssvarende!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "mangler parametren %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "ny fødning" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "indlæg" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "færdig" @@ -179,7 +179,7 @@ msgstr "vedhæftningsoplægning" msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -285,18 +285,18 @@ msgstr[1] "%i kommentarer" msgid "Comment" msgstr "Kommentér" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "ingen tekst blev kopieret i denne side" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "ingen tekst blev kopieret i denne side med id %s" @@ -323,20 +323,20 @@ msgstr "opretter %s" msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "skabelon %s ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "beandling af skabelon mislykkedes:" @@ -382,8 +382,7 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -497,19 +496,19 @@ msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -583,21 +582,21 @@ msgstr "adgangskodenulstilling afvist" msgid "Ping received." msgstr "Ping modtaget." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "kræver 'from'- og 'to'-parametre" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "vil pinge %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP ikke fundet, pinger ikke" @@ -605,17 +604,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -623,7 +617,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -631,11 +625,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -643,7 +637,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -651,54 +645,59 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "stem" @@ -991,11 +990,11 @@ msgstr "manglende id-parameter" msgid "%s not found" msgstr "%s ikke fundet" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" @@ -1106,12 +1105,12 @@ msgstr "danner %s, som afhænger af %s" msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1180,27 +1179,27 @@ msgstr "kompilering af %s mislykkedes" msgid "successfully generated %s" msgstr "Korrekt bygget %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "brug: ikiwiki [valg] kilde mål" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." diff --git a/po/de.po b/po/de.po index 586788bb1..07e702e5c 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -65,67 +65,67 @@ msgstr "Das Web löst die Zusammenstellung aus" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Es gibt nichts zu tun, alle Vorlagen (feeds) sind aktuell!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "Parameter %s fehlt" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "neue Vorlage (feed)" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "Beiträge" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "zuletzt geprüft %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Vorlage (feed) %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "konnte Vorlage (feed) unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(Einträge in der Vorlage (feed) wurden maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" @@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "fertig" @@ -177,7 +177,7 @@ msgstr "Anhang hochladen" msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -285,18 +285,18 @@ msgstr[1] "%i Kommentare" msgid "Comment" msgstr "Kommentieren" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "der Parameter %s wird benötigt" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "es wurde kein Text in diese Seite kopiert" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "es wurde kein Text in diese Seite mit der id %s kopiert" @@ -323,20 +323,20 @@ msgstr "erstelle %s" msgid "editing %s" msgstr "bearbeite %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "Vorlage nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" @@ -501,19 +500,19 @@ msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -589,21 +588,21 @@ msgstr "zurücksetzen des Passworts abgelehnt" msgid "Ping received." msgstr "Ping empfangen." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "erfordert die Parameter 'from' und 'to'" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "werde Ping an %s senden" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP nicht gefunden, führe Ping nicht aus" @@ -611,17 +610,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -629,7 +623,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -637,11 +631,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -649,7 +643,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -657,55 +651,60 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " "arbeiten" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "abstimmen" @@ -1000,11 +999,11 @@ msgstr "fehlender Parameter id" msgid "%s not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" @@ -1118,12 +1117,12 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1195,28 +1194,28 @@ msgstr "erzeugen von %s fehlgeschlagen" msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup Konfigurationsdatei" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." diff --git a/po/es.po b/po/es.po index dfdacf764..39c4797e7 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -70,67 +70,67 @@ msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "falta el parámetro %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nueva entrada" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "entradas" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -139,7 +139,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "completado" @@ -184,7 +184,7 @@ msgstr "enviado el adjunto" msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -292,18 +292,18 @@ msgstr[1] "Comentarios" msgid "Comment" msgstr "Comentarios" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "no se ha copiado ningún texto en esta página" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" @@ -330,20 +330,20 @@ msgstr "creando página %s" msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -391,8 +391,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" @@ -509,19 +508,19 @@ msgstr "" "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -601,21 +600,21 @@ msgstr "reinicio de contraseña denegado" msgid "Ping received." msgstr "Recibida una señal ping." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "los parámetros 'from' y 'to' son obligatorios" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "No he encontrado el componente LWP, no envío señal alguna" @@ -623,92 +622,92 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Votar" @@ -1005,11 +1004,11 @@ msgstr "falta el parámetro \"id\"" msgid "%s not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" @@ -1124,12 +1123,12 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1200,28 +1199,28 @@ msgstr "ha fallado la compilación del programa %s" msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "uso: ikiwiki [opciones] origen destino" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup archivo_de_configuración" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "actualizando el wiki.." diff --git a/po/fr.po b/po/fr.po index 221bff436..05ad086af 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -66,67 +66,67 @@ msgstr "Agrégation déclenchée par le web" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Rien à faire pour le moment, tous les flux sont à jour !" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -135,7 +135,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "Terminé" @@ -177,7 +177,7 @@ msgstr "Envoi de la pièce jointe" msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -284,18 +284,18 @@ msgstr[1] "%i commentaires" msgid "Comment" msgstr "poster un commentaire" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "Le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "Aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" @@ -322,20 +322,20 @@ msgstr "Création de %s" msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "modèle (« template ») non indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -382,8 +382,7 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." @@ -498,19 +497,19 @@ msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "les paramètres « from » et « to » sont nécessaires." @@ -588,21 +587,21 @@ msgstr "réinitialisation du mot de passe refusée" msgid "Ping received." msgstr "Ping reçu" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "les paramètres « from » et « to » sont nécessaires." -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "va envoyer un ping à %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP est introuvable. Pas de réponse au ping" @@ -612,17 +611,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -630,7 +624,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -638,11 +632,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -650,7 +644,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -658,55 +652,60 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " "des modifications." +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Voter" @@ -1001,11 +1000,11 @@ msgstr "Paramètre d'identification manquant" msgid "%s not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" @@ -1117,12 +1116,12 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1196,28 +1195,28 @@ msgstr "Échec de la compilation de %s" msgid "successfully generated %s" msgstr "%s a été créé avec succès" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup fichier de configuration" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." diff --git a/po/gu.po b/po/gu.po index baa8c8ee0..08107e5b4 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -63,67 +63,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "નવું ફીડ" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "પોસ્ટ" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "સંપૂર્ણ" @@ -177,7 +177,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -280,18 +280,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -318,22 +318,22 @@ msgstr "%s બનાવે છે" msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -382,8 +382,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" @@ -496,21 +495,21 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -584,21 +583,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -607,92 +606,92 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "મત" @@ -992,12 +991,12 @@ msgstr "ખોવાયેલ આઇડી વિકલ્પ" msgid "%s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -1103,12 +1102,12 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1177,27 +1176,27 @@ msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 62f2792e4..9edda3427 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,67 +64,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "" @@ -175,7 +175,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -278,18 +278,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -316,20 +316,20 @@ msgstr "" msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "" @@ -375,8 +375,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -485,19 +484,19 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -570,21 +569,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "" @@ -592,91 +591,91 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" @@ -969,11 +968,11 @@ msgstr "" msgid "%s not found" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "" @@ -1078,12 +1077,12 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1152,27 +1151,27 @@ msgstr "" msgid "successfully generated %s" msgstr "" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "" diff --git a/po/it.po b/po/it.po index e120681c4..4d6f1d887 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -63,67 +63,67 @@ msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "parametro %s mancante" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nuovo notiziario" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "articoli" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nuovo" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "in scadenza %s (vecchio di %s giorni)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "in scadenza %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "ultimo controllo %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "controllo notiziario %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "impossibile trovare il notiziario %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(entità del notiziario espanse con escape)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "il notiziario ha fatto andare in crash XML::Feed." -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "creazione nuova pagina %s" @@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "fatto" @@ -174,7 +174,7 @@ msgstr "carica allegato" msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -282,18 +282,18 @@ msgstr[1] "Commenti" msgid "Comment" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametro %s necessario" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "nessun testo è stato copiato in questa pagina" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "nessun testo è stato copiato in questa pagina con l'id %s" @@ -320,20 +320,20 @@ msgstr "creazione %s" msgid "editing %s" msgstr "modifica %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "modello non specificato" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -380,8 +380,7 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" @@ -495,19 +494,19 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -585,21 +584,21 @@ msgstr "reset della password non permesso" msgid "Ping received." msgstr "Ping ricevuto." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "sono richiesti i parametri \"to\" e \"from\"" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Verrà inviato un ping a %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignorata la richiesta di ping per il wiki %s (questo wiki è %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP non trovato, ping non inviato" @@ -609,24 +608,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -634,11 +628,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -646,7 +640,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -654,55 +648,60 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " "modifiche" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "voto" @@ -997,11 +996,11 @@ msgstr "parametro id mancante" msgid "%s not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" @@ -1112,12 +1111,12 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1187,28 +1186,28 @@ msgstr "errore nel compilare %s" msgid "successfully generated %s" msgstr "%s generato con successo" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup configfile" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." diff --git a/po/pl.po b/po/pl.po index f02444224..4bd07b5a6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -66,68 +66,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nowy kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "wpisy" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "gotowe" @@ -181,7 +181,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -284,18 +284,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -322,22 +322,22 @@ msgstr "tworzenie %s" msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -386,8 +386,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" @@ -508,22 +507,22 @@ msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -597,21 +596,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -620,92 +619,92 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "głosuj" @@ -1013,12 +1012,12 @@ msgstr "brakujący parametr id" msgid "%s not found" msgstr "nie znaleziono %s" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -1124,12 +1123,12 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1198,27 +1197,27 @@ msgstr "awaria w trakcie kompilowania %s" msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "użycie: ikiwiki [parametry] źródło cel" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." diff --git a/po/sv.po b/po/sv.po index d8c2cd70b..1dc8a5f49 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -63,68 +63,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "ny kanal" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "inlägg" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "klar" @@ -178,7 +178,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -281,18 +281,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -319,22 +319,22 @@ msgstr "skapar %s" msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" @@ -501,22 +500,22 @@ msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -590,21 +589,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -613,92 +612,92 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "röst" @@ -1001,11 +1000,11 @@ msgstr "mall saknar id-parameter" msgid "%s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" @@ -1111,12 +1110,12 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1185,27 +1184,27 @@ msgstr "misslyckades med att kompilera %s" msgid "successfully generated %s" msgstr "generering av %s lyckades" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "användning: ikiwiki [flaggor] källa mål" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." diff --git a/po/tr.po b/po/tr.po index 91dca8739..b94039191 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -60,67 +60,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "%s parametresi eksik" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "yeni özet akışı" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "gönderi" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "yeni" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s için zaman aşımı (%s gün eski)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s için zaman aşımı" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "son güncelleme: %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "%s özet akışı denetleniyor ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "%s özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(özet akışı girdileri işlendi)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" @@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "" @@ -171,7 +171,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -274,18 +274,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -312,20 +312,20 @@ msgstr "" msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "" @@ -371,8 +371,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -481,19 +480,19 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -566,21 +565,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "" @@ -588,91 +587,91 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" @@ -965,11 +964,11 @@ msgstr "" msgid "%s not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "" @@ -1074,12 +1073,12 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1148,27 +1147,27 @@ msgstr "" msgid "successfully generated %s" msgstr "" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "" diff --git a/po/vi.po b/po/vi.po index aa0503f46..1b0bab9b1 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -64,68 +64,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "xong" @@ -179,7 +179,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -281,18 +281,18 @@ msgstr[0] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -319,22 +319,22 @@ msgstr "đang tạo %s" msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" @@ -501,22 +500,22 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -590,21 +589,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -613,92 +612,92 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "bỏ phiếu" @@ -1001,11 +1000,11 @@ msgstr "mẫu thiếu tham số id" msgid "%s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" @@ -1111,12 +1110,12 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1185,27 +1184,27 @@ msgstr "lỗi biên dịch %s" msgid "successfully generated %s" msgstr "%s đã được tạo ra" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -- cgit v1.2.3 From 0780d989a91974604beb711325ee5ddba6bb207c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:40:53 -0400 Subject: add news item for ikiwiki 3.20100915 --- doc/news/version_3.20100704.mdwn | 26 -------------------------- doc/news/version_3.20100915.mdwn | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 doc/news/version_3.20100704.mdwn create mode 100644 doc/news/version_3.20100915.mdwn diff --git a/doc/news/version_3.20100704.mdwn b/doc/news/version_3.20100704.mdwn deleted file mode 100644 index 9d2792ce6..000000000 --- a/doc/news/version_3.20100704.mdwn +++ /dev/null @@ -1,26 +0,0 @@ -ikiwiki 3.20100704 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Changes to avoid display of ugly google openids, by displaying - a username taken from openid. - * API: Add new optional field nickname to rcs\_recentchanges. - * API: rcs\_commit and rcs\_commit\_staged are now passed named - parameters. - * openid: Store nickname based on username or email provided from - openid provider. - * git: Record the nickname from openid in the git author email. - * comment: Record the username from openid in the comment page. - * Fixed some confusion and bugginess about whether - rcs\_getctime/rcs\_getmtime were passed absolute or relative filenames. - (Make it relative like everything else.) - * hnb: Fixed broken use of mkstemp that had caused dangling temp files, - and prevented actually rendering hnb files. - * Use comment template on comments page of example blog. - * comment.tmpl: Fix up display when inline uses it to display a non-comment - page. (Such as a discussion page.) - * git: Added git\_wrapper\_background\_command option. Can be used to eg, - make the git wrapper push to github in the background after ikiwiki - runs. - * po: Added needstranslation() pagespec. (intrigeri) - * po: Added support for .html source pages. (intrigeri) - * comment: Fix problem moderating comments of certian pages with utf-8 - in their name."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100915.mdwn b/doc/news/version_3.20100915.mdwn new file mode 100644 index 000000000..90c5cc37a --- /dev/null +++ b/doc/news/version_3.20100915.mdwn @@ -0,0 +1,28 @@ +ikiwiki 3.20100915 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * needsbuild hook interface changed; the hooks should now return + the modified array of things that need built. (Backwards compatibility + code keeps plugins using the old interface working.) + * Remove PATH overriding code in ikiwiki script that was present to make + perl taint checking happy, but taint checking is disabled. + * teximg: Use Unicode UTF-8 encoding by default. Closes: #[596067](http://bugs.debian.org/596067) + Thanks, Paul Menzel. + * po: Make the po\_master\_language use a langpair like "en|English", + so it can be configured via the web. + * po: Allow enabling via web setup. + * po: Auto-upgrade old format settings to new formats when writing + setup file. + * Pass array of names of files that have been deleted to needsbuild hook + as second parameter, to allow for plugins that needs access to this + information earlier than the delete hook. + * actiontabs: Improve tab padding. + * blueview: Fix display of links to translated pages in the page header. + * Set isPermaLink="no" for guids in rss feeds. + * blogspam: Fix crash when content contained utf-8. + * external: Disable RPC::XML's "smart" encoding, which sent ints + for strings that contained only a number, fixing a longstanding crash + of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. + * cutpaste: Fix bug that occured in some cases involving inlines when + text was pasted on a page before being cut."""]] \ No newline at end of file -- cgit v1.2.3 From 9585968861d551fc43379053f8556a2fe44de7b8 Mon Sep 17 00:00:00 2001 From: privat Date: Fri, 17 Sep 2010 01:42:46 +0000 Subject: patch proposal: add option to capitalize pagetitles --- doc/todo/capitalize_title.mdwn | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/todo/capitalize_title.mdwn diff --git a/doc/todo/capitalize_title.mdwn b/doc/todo/capitalize_title.mdwn new file mode 100644 index 000000000..3e8366dd3 --- /dev/null +++ b/doc/todo/capitalize_title.mdwn @@ -0,0 +1,31 @@ +Here I propose an option (with a [[patch]]) to capitalize the first letter (ucfirst) of default titles : filenames and urls can be lowercase but title are displayed with a capital first character (filename = "foo.mdwn", pagetitle = "Foo"). Note that \[[!meta title]] are unaffected (no automatic capitalization). Comments please :) --[[JeanPrivat]] +

+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 6da2819..fd36ec4 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -281,6 +281,13 @@ sub getsetup () {
+                safe => 0,
+                rebuild => 1,
+        },
++       capitalize => {
++               type => "boolean",
++               default => undef,
++               description => "capitalize the first letter of page titles",
++               safe => 1,
++               rebuild => 1,
++       },
+        userdir => {
+                type => "string",
+                default => "",
+@@ -989,6 +996,10 @@ sub pagetitle ($;$) {
+                $page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : "&#$2;"/eg;
+        }
+ 
++       if ($config{capitalize}) {
++               $page = ucfirst $page;
++       }
++
+        return $page;
+ }
+
-- cgit v1.2.3 From 3f8ba63a9968b6fc670ea2b49b86ba62571ef15b Mon Sep 17 00:00:00 2001 From: tschwinge Date: Fri, 17 Sep 2010 11:48:29 +0000 Subject: Report. --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/bugs/cutpaste.pm:_missing_filter_call.mdwn diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn new file mode 100644 index 000000000..30bd52996 --- /dev/null +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -0,0 +1,23 @@ +Consider this: + + $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2 + $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch + + $ tar -xj < cutpaste_filter.tar.bz2 + $ cd cutpaste_filter/ + $ ./render_locally + $ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR' + [notice one FOO in there] + $ rm -rf .ikiwiki "$PWD".rendered + + $ cp /usr/share/perl5/IkiWiki/Plugin/cutpaste.pm .library/IkiWiki/Plugin/ + $ patch -p0 < ../cutpaste_filter.patch + $ ./render_locally + $ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR' + [correct; notice no more FOO] + +I guess this needs a general audit -- there are other places where `preprocess` +is being doing without `filter`ing first, for example in the same file, `copy` +function. + +--[[tschwinge]] -- cgit v1.2.3 From 65c5e24d364f491ace462beb06e2e3adb721b1e0 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Fri, 17 Sep 2010 20:08:49 -0500 Subject: idea about 'dynamic' forms --- doc/forum/field_and_forms.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/field_and_forms.mdwn diff --git a/doc/forum/field_and_forms.mdwn b/doc/forum/field_and_forms.mdwn new file mode 100644 index 000000000..97fda1856 --- /dev/null +++ b/doc/forum/field_and_forms.mdwn @@ -0,0 +1,13 @@ +Dear ikiwiki users, and specially [[users/KathrynAndersen]] ([[users/rubykat]]): +have you considered some way of extending ikiwiki to allow some kind of +on-the-fly generation of web forms to create new pages? these web forms should +offer as many fields as one has defined in some [[page +template|plugins/contrib/ftemplate]], and, once POSTed, should create a page +using that template, with those fields already filled with the values the user +provided. + +I see this a a generalization of the `postform` option of the +[[ikiwiki/directive/inline]] directive. That option tells ikiwiki to create a +form with one field already filled (title). + +What are your ideas about this? -- cgit v1.2.3 From 0b59b140071748b6bc0204ac2f367353a74c697e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 12:24:33 -0400 Subject: remove obsolete docs about DefaultLanguage I think this may have made sense when the master language was rendered to index.html, but with it at index.en.html, DefaultLanguage is not needed. --- doc/plugins/po.mdwn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2acbc366a..ca1775f6e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -120,10 +120,6 @@ Add 'Options MultiViews' to the wiki directory's configuration in Apache. When `usedirs` is enabled, one has to set `DirectoryIndex index` for the wiki context. -Setting `DefaultLanguage LL` (replace `LL` with your default MIME -language code) for the wiki context can help to ensure -`bla/page/index.en.html` is served as `Content-Language: LL`. - For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html). lighttpd -- cgit v1.2.3 From 96a8ea0ebbd93a8cc56222234d4a5815b30a3934 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 12:58:37 -0400 Subject: add --- ...:_apache_config_serves_index.rss_for_index.mdwn | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn new file mode 100644 index 000000000..e6e1b57a8 --- /dev/null +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -0,0 +1,28 @@ +The apache config documented in [[plugins/po]] has a subtle bug. It works +until a site gets an index.atom or index.rss file. (Acutally, with po +enabled, they're called index.en.atom or index.en.rss etc, but the result +is the same). + +Then, when wget, curl, or w3m is pointed at http://site/, apache serves +up the rss/atom file rather than the index page. + +Analysis: + +* /etc/mime.types gives mime types to .rss and .atom files +* `mod_negotiation`'s MultiViews allows any file with a mime type to be + served up via content negotiation, if the client requests that type. +* wget etc send "Accept: */*" to accept all content types. Compare + with firefox, which sends "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*" +* So apache has a tie between a html encoded Enlish file, and a rss encoded + English file and the client has no preference. In a tie, apache will serve up the + *smallest* file, which tends to be the rss file. (Apache's docs say it uses that + strange criteria to break ties; see ) + +The only way I have found to work around this problem is to remove +atom and rss from /etc/mime.types. Of course, that has other undesirable +results. + +I wonder if it would be worth making the po plugin generate apache +[type map files](http://httpd.apache.org/docs/2.0/mod/mod_negotiation.html#typemaps). +That should avoid this problem. +--[[Joey]] -- cgit v1.2.3 From 4079c06be22d0eb31bd0bead4b8f53a9831804e9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 13:03:33 -0400 Subject: format --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index e6e1b57a8..bf5973325 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -11,8 +11,8 @@ Analysis: * /etc/mime.types gives mime types to .rss and .atom files * `mod_negotiation`'s MultiViews allows any file with a mime type to be served up via content negotiation, if the client requests that type. -* wget etc send "Accept: */*" to accept all content types. Compare - with firefox, which sends "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*" +* wget etc send `Accept: */*` to accept all content types. Compare + with firefox, which sends `Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*` * So apache has a tie between a html encoded Enlish file, and a rss encoded English file and the client has no preference. In a tie, apache will serve up the *smallest* file, which tends to be the rss file. (Apache's docs say it uses that -- cgit v1.2.3 From b2b599dfb9d042da324480e03d3a55873ac336d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 13:36:29 -0400 Subject: response --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index 30bd52996..475880f0a 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -21,3 +21,21 @@ is being doing without `filter`ing first, for example in the same file, `copy` function. --[[tschwinge]] + +> So, in English, page text inside a cut directive will not be filtered. +> Because the cut directive takes the text during the scan pass, before +> filtering happens. +> +> Commit 192ce7a238af9021b0fd6dd571f22409af81ebaf and +> [[bugs/po_vs_templates]] has to do with this. +> There I decided that filter hooks should *only* act on the complete +> text of a page. +> +> I also suggested that anything that wants to reliably +> s/FOO/BAR/ should probably use a sanitize hook, not a filter hook. +> I think that would make sense in this example. +> +> I don't see any way to make cut text be filtered while satisfying these +> constraints, without removing cutpaste's ability to have forward pastes +> of text cut laster in the page. (That does seems like an increasingly +> bad idea..) --[[Joey]] -- cgit v1.2.3 From 26c38c8049e3e8794984079b3b6d4c22ba888d3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 15:09:14 -0400 Subject: better fix developed on #httpd channel --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index bf5973325..7acbfe82d 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -26,3 +26,11 @@ I wonder if it would be worth making the po plugin generate apache [type map files](http://httpd.apache.org/docs/2.0/mod/mod_negotiation.html#typemaps). That should avoid this problem. --[[Joey]] + +Update: A non-intrusive fix is to add this to apache configuration. +This tunes the "quality" of the rss and atom files, in an apparently currently +undocumented way (though someone on #httpd suggested it should get documented). +Result is that apache will prefer serving index.html. --[[Joey]] + + AddType application/rss+xml;qs=0.8 .rss + AddType application/atom+xml;qs=0.8 .atom -- cgit v1.2.3 From ea487472ed05f633e3cd9479b933656309c0d3c8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 18:48:46 -0400 Subject: document settings needed to fix bug --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 2 +- doc/plugins/po.mdwn | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index 7acbfe82d..a2b68c4b1 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -30,7 +30,7 @@ That should avoid this problem. Update: A non-intrusive fix is to add this to apache configuration. This tunes the "quality" of the rss and atom files, in an apparently currently undocumented way (though someone on #httpd suggested it should get documented). -Result is that apache will prefer serving index.html. --[[Joey]] +Result is that apache will prefer serving index.html. --[[Joey]] [[done]] AddType application/rss+xml;qs=0.8 .rss AddType application/atom+xml;qs=0.8 .atom diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index ca1775f6e..f91e44ea3 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -117,8 +117,13 @@ serve any page in the client's preferred language, if available. Add 'Options MultiViews' to the wiki directory's configuration in Apache. -When `usedirs` is enabled, one has to set `DirectoryIndex index` for -the wiki context. +When `usedirs` is enabled, you should also set `DirectoryIndex index`. + +These settings are also recommended, in order to avoid serving up rss files +as index pages: + + AddType application/rss+xml;qs=0.8 .rss + AddType application/atom+xml;qs=0.8 .atom For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html). -- cgit v1.2.3 From 8c8856601f76c16b2be51b16c095a276f9c9a9b5 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Sun, 19 Sep 2010 06:17:01 +0000 Subject: Back to Joey. --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index 475880f0a..f7138cba0 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -39,3 +39,17 @@ function. > constraints, without removing cutpaste's ability to have forward pastes > of text cut laster in the page. (That does seems like an increasingly > bad idea..) --[[Joey]] + +> > OK -- so the FOO/BAR thing was only a very stripped-down example, of +> > course, and the real thing is being observed with the +> > *[[plugins/contrib/getfield]]* plugin. This one needs to run *before* +> > `preprocess`ing, for its `{{$page#field}}` syntax is (a) meant to be usable +> > inside ikiwiki directives, and (b) the field values are meant to still be +> > `preprocess`ed before being embedded. That's why it's using the `filter` +> > hook instead of `sanitize`. + +> > Would adding another kind of hook be a way to fix this? My idea is that +> > *cut* (and others) would then take their data not during `scan`ning, but +> > *after* `filter`ing. + +> > --[[tschwinge]] -- cgit v1.2.3 From 2745dfee60fa890ed0ecb8f53528e8a8a0803066 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 19 Sep 2010 20:23:13 +0000 Subject: Add link to html5shiv. --- doc/tips/html5.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn index 945efc4bc..8fbbb2ebb 100644 --- a/doc/tips/html5.mdwn +++ b/doc/tips/html5.mdwn @@ -15,7 +15,8 @@ No care is taken to add backwards compatability hacks for browsers that are not html5 aware (like MSIE). If you want to include the javascript with those hacks, you can edit `page.tmpl` to do so. [Dive Into HTML5](http://diveintohtml5.org/) is a good reference for -current compatability issues and workarounds with html5. +current compatability issues and workarounds with html5. And a remotely-loadable +JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/). --- -- cgit v1.2.3 From 2ca4ff8ae6d2d528b8895f7907d74c2f8859dc8d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Sep 2010 20:04:31 -0400 Subject: add missing space --- IkiWiki/Plugin/meta.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 5941e3f3f..ae593555e 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -198,7 +198,7 @@ sub preprocess (@) { '" rel="openid2.local_id" />' if $delegate ne 1; } if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) { - push @{$metaheaders{$page}}, ''; } } -- cgit v1.2.3 From 8063b960ade41a089d859b655ff26fb61fb18d3f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Sep 2010 20:15:34 -0400 Subject: meta: Ensure that the url specified by xrds-location is absolute. With a relative xrds-location, the openid perl client module will fail. I haven't checked the specs to see if it needs to be absolute, but all examples I've seen are absolute, so it seems a very good idea. --- IkiWiki/Plugin/meta.pm | 6 +++++- debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index ae593555e..5cfa72833 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -198,8 +198,12 @@ sub preprocess (@) { '" rel="openid2.local_id" />' if $delegate ne 1; } if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) { + # force url absolute + eval q{use URI}; + error($@) if $@; + my $url=URI->new_abs($params{"xrds-location"}, $config{url}); push @{$metaheaders{$page}}, ''; + 'content="'.encode_entities($url).'" />'; } } elsif ($key eq 'redir') { diff --git a/debian/changelog b/debian/changelog index 8286b7887..24115c177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100916) UNRELEASED; urgency=low + + * meta: Ensure that the url specified by xrds-location is absolute. + + -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 + ikiwiki (3.20100915) unstable; urgency=low * needsbuild hook interface changed; the hooks should now return -- cgit v1.2.3 From 608d595dfdde90b8eed41de5c096157df0cdd494 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl_d5VW9AK4YSf-cJKz8vUONCihstBZU9o" Date: Mon, 20 Sep 2010 17:00:21 +0000 Subject: --- doc/setup/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn index 74f7740db..f0eeea8ee 100644 --- a/doc/setup/discussion.mdwn +++ b/doc/setup/discussion.mdwn @@ -258,3 +258,10 @@ precicely breaks without it? -- [[Jon]] > I don't remember what was the specific problem with perl 5.8.8. All I can > find is some taint checking bugs, which are currently worked around by > taint checking being disabled. --[[Joey]] + +--- + +Did anyone tried to install ikiwiki under a vhost setup ? +ikiwiki is installed under a debian lenny system. but without write acces to /etc/ikiwiki (obvious) i am coming not far. +Or do i miss something which is probably hidden deeper in the documentation ? + -- cgit v1.2.3 From 90bc68589e8c9e0243d563a9616701c946b2d3fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Sep 2010 15:33:42 -0400 Subject: attachment: Fix attachment file size display. --- IkiWiki/Plugin/attachment.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index f73e355ee..bd93d3718 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -242,7 +242,7 @@ sub attachment_list ($) { push @ret, { "field-select" => '', link => htmllink($page, $page, $f, noimageinline => 1), - size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]), + size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]), mtime => displaytime($IkiWiki::pagemtime{$f}), mtime_raw => $IkiWiki::pagemtime{$f}, }; diff --git a/debian/changelog b/debian/changelog index 24115c177..cae182f63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. + * attachment: Fix attachment file size display. -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 -- cgit v1.2.3 From 9aec1b02a4df223ad84c96a35f13e51fc2982f2e Mon Sep 17 00:00:00 2001 From: hb7 Date: Wed, 22 Sep 2010 07:55:50 +0000 Subject: --- doc/sandbox/Nur_so..mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/Nur_so..mdwn diff --git a/doc/sandbox/Nur_so..mdwn b/doc/sandbox/Nur_so..mdwn new file mode 100644 index 000000000..32c9f2397 --- /dev/null +++ b/doc/sandbox/Nur_so..mdwn @@ -0,0 +1 @@ +Das ist ein Test. -- cgit v1.2.3 From 7110b4964762df17142affde90075a0e9a5494f9 Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:33:19 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 4f1ee7bf7..c070c1e23 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 64 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 65 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] -- cgit v1.2.3 From 0ea5c4a241b9a0dff66c5bd232ead8a1b2d9ac4a Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:37:40 +0000 Subject: --- doc/news/openid/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index e611fa77b..1b2072bcc 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -80,3 +80,6 @@ which fails here? Or is something broken in Ikiwiki's implementation? > [[bugs/OpenID_delegation_fails_on_my_server]] --[[Joey]] Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. + +---- +I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert.myopenid.com]] -- cgit v1.2.3 From 6902f9850a1f1c6e7eca9fab29ec98d4e7d9df3a Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:38:32 +0000 Subject: --- doc/news/openid/discussion.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 1b2072bcc..fa8acb942 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -82,4 +82,5 @@ which fails here? Or is something broken in Ikiwiki's implementation? Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. ---- -I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert.myopenid.com]] +##Pretty Painless +I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] -- cgit v1.2.3 From a31d6ab1b9ca061b565d976f754c11b1bef7a325 Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 20:10:26 +0000 Subject: --- doc/news/openid/discussion.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index fa8acb942..a79a87989 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -82,5 +82,8 @@ which fails here? Or is something broken in Ikiwiki's implementation? Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. ---- -##Pretty Painless +###Pretty Painless I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] + +###LiveJournal openid +One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] -- cgit v1.2.3 From 4a5d68a139e946b64a89625919a5398fd5268a1f Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Wed, 22 Sep 2010 22:41:18 -0500 Subject: possible bug with img plugin --- doc/bugs/img_plugin_and_class_attr.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/img_plugin_and_class_attr.mdwn diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn new file mode 100644 index 000000000..7fd457c31 --- /dev/null +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -0,0 +1,25 @@ +The [[plugins/img]] plugin is not generating the proper `class` +attribute in its HTML output. + +The plugin receives something like the following: + + [[!img 129199047595759991.jpg class="centered"]] + +And is supossed to generate an HTML code like the following: + + + +But is generating the following + + + +This seems to be happening with all images inserted using the plugin (that use +the `class=yaddayadda` argument to the `img` directive.) I remember it didn't +happen before, and I suspect an ikiwiki upgrade is to blame. I tested with a +blog created from scratch, and a single post, and the problem appeared there +too. + +This is happening with version 3.20100815 of ikiwiki. + +[[jerojasro]] + -- cgit v1.2.3 From 7481329bdd11d81c4b3e85a446ab1e4bfcc298c8 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Wed, 22 Sep 2010 22:44:07 -0500 Subject: typo --- doc/bugs/img_plugin_and_class_attr.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn index 7fd457c31..4dd0df4ec 100644 --- a/doc/bugs/img_plugin_and_class_attr.mdwn +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -3,7 +3,7 @@ attribute in its HTML output. The plugin receives something like the following: - [[!img 129199047595759991.jpg class="centered"]] + \[[!img 129199047595759991.jpg class="centered"]] And is supossed to generate an HTML code like the following: -- cgit v1.2.3 From fc296d49a01377704443280d9ba2c04e6aff3de0 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 23 Sep 2010 10:15:19 +0000 Subject: b00g --- doc/ikiwiki/directive/table/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/ikiwiki/directive/table/discussion.mdwn diff --git a/doc/ikiwiki/directive/table/discussion.mdwn b/doc/ikiwiki/directive/table/discussion.mdwn new file mode 100644 index 000000000..87d2e0cd1 --- /dev/null +++ b/doc/ikiwiki/directive/table/discussion.mdwn @@ -0,0 +1 @@ +The problem I have in my tables, is that some fields contain example HTML that needs to be escaped. -- cgit v1.2.3 From abea37a67af78c9c9405d4f089b76199264d193f Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 23 Sep 2010 13:09:05 +0200 Subject: connection between alias direcive and autotag --- doc/todo/alias_directive.mdwn | 29 ++++++++++++++++++++-- ...o-create_tag_pages_according_to_a_template.mdwn | 13 ++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/doc/todo/alias_directive.mdwn b/doc/todo/alias_directive.mdwn index 4d7817694..71a2efc76 100644 --- a/doc/todo/alias_directive.mdwn +++ b/doc/todo/alias_directive.mdwn @@ -27,8 +27,8 @@ suggested for addition (possibly by means of a plugin): > > > > \[[!alias Grece list=false]] > -> This page by itself will redirect from the "Hellas" and "Hellenic Republic" -> pages as if they both contained just: +> This page by itself will redirect from the "Hellas", "Hellenic Republic" and +> "Grece" pages as if they both contained just: > > > \[[!meta redir="Greece"]] > @@ -44,4 +44,29 @@ The proposed plugin/directive could be extended, eg. by also including old-style redirects in the alias list, but that might introduce unwanted coupling with the meta directive. +----------------- + +On second thought, implementing this might have similarities with +[[todo/auto-create tag pages according to a template]] -- the auto-created +pages would, if the way of the alias directive is followed, not create physical +files, though, but be created just when someone edits them. + +If multiple plugins do such a trick, they would have to fight over who comes +first. If, for example, we have a setup where not yet created tag pages are +automatically generated as "\[[!inline pages="link()" +archive="yes"]]" and aliases are enabled, and a non-tag pages grabs a tag as an +alias (as to redirect all taglinks of the tag to itself), there are two +possibilities: + +* The autotag plugin comes first: + * autotag sees the missing tag and creates its "\[[!inline" stuff + * alias sees that there is already content and adds its prefix +* The alias plugin comes first (this is the prefered way): + * alias sees the empty page, sees it is not contested by other alias + directives and creates its "\[[!meta" redirect + * autotag sees there is already content and doesn't do anything + +That issue could be handled with "priority number" on the hook, with plugins +with a lower number being called first. + [[!tag wishlist]] diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 7eb404910..92c3b7695 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -248,4 +248,17 @@ I've tested it fairly thouroughly. --[[Joey]] [a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6) [981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691) +------------------- + +Even if this is already marked as done, I'd like to suggest an alternative +solution: + +Instead of creating a file that gets checked in into the RCS, the source files +could be left out and the output files be written as long as there is no +physical source file (think of a virtual underlay). Something similar would be +required to implement [[todo/alias directive]], which couldn't be easily done +by writing to the RCS as the page's contents can change depending on which +other pages claim it as an alias. --[[chrysn]] + + [[!tag done]] -- cgit v1.2.3 From b4471d44184a03180ad19a98673d52752ce73b46 Mon Sep 17 00:00:00 2001 From: "188.118.202.217" <188.118.202.217@web> Date: Thu, 23 Sep 2010 11:17:06 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c070c1e23..67bf10cb6 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 65 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] -- cgit v1.2.3 From aac1428491c850b74800f59926dcbc3c7bc6dd84 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Sep 2010 16:05:43 -0400 Subject: response --- doc/news/openid/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index a79a87989..c0447a13f 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -85,5 +85,8 @@ Yes. I'd only recently set up my server as a delegate under wordpress, so still ###Pretty Painless I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] +> I doubt I will. The new login interface basically makes password login +> and openid cooexist nicely. --[[Joey]] + ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] -- cgit v1.2.3 From 66e3a164223bc36d14c5b304f902f6d5413045c7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmlZJCPogIE74m6GSCmkbJoMZiWNOlXcjI" Date: Fri, 24 Sep 2010 19:01:08 +0000 Subject: Added a comment --- .../comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment new file mode 100644 index 000000000..597cab2e4 --- /dev/null +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmlZJCPogIE74m6GSCmkbJoMZiWNOlXcjI" + nickname="Ian" + subject="comment 1" + date="2010-09-24T19:01:08Z" + content=""" ++1 for a \"revert\" web plugin which at least handles the simple cases. -- Ian Osgood, The TOVA Company +"""]] -- cgit v1.2.3 From c9cceef939d83d0e3bb3793b2995ee5917da082e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:02:32 -0400 Subject: notabug --- doc/bugs/img_plugin_and_class_attr.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn index 4dd0df4ec..7e880b4fc 100644 --- a/doc/bugs/img_plugin_and_class_attr.mdwn +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -23,3 +23,5 @@ This is happening with version 3.20100815 of ikiwiki. [[jerojasro]] +> How is this a bug? It's perfectly legal html for a class attribute to +> put an element into multiple classes. [[notabug|done]] --[[Joey]] -- cgit v1.2.3 From 81d0871dd90166cfd41767b4dc3cfc2cb91c69c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:04:00 -0400 Subject: forgot to close this, was fixed using %pagestate --- ...r:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 4535cf35d..6996a9fbf 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -43,4 +43,4 @@ the aggregation in *index.html* or its RSS and atom files. > > Using `%pagestate` to store the cut content when scanning would be > one way to fix this bug. It would mean storing potentially big chunks -> of page content in the indexdb. --[[Joey]] +> of page content in the indexdb. [[done]] --[[Joey]] -- cgit v1.2.3 From 5d201da7188e39787fe08485113300d8e590ba58 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:20:41 -0400 Subject: pebak? --- .../can__39__t_mix_template_vars_inside_directives.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 0fa85effb..462852ef8 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -31,3 +31,17 @@ The result, even with htmlscrubber disabled, is mangled, something like
Any suggestions gladly received. -- [[Jon]] + +> Well, you *should* be able to do things like this, and in my testing, I +> *can*. I used your exact example above (removing the backslash escape) +> and invoked it as: +> \[[!template id=test href=himom.png size=100x]] +> +> And got just what you would expect. +> +> I don't know what went wrong for you, but I don't see a bug here. +> My guess, at the moment, is that you didn't specify the required href +> and size parameters when using the template. If I leave those off, +> I of course reproduce what you reported, since the img directive gets +> called with no filename, and so assumes the size parameter is the image +> to display.. [[done]]? --[[Joey]] -- cgit v1.2.3 From 4846b4472ec69e95dd2cc0a792aaf7668367263d Mon Sep 17 00:00:00 2001 From: "98.66.223.132" <98.66.223.132@web> Date: Sun, 26 Sep 2010 04:16:56 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 67bf10cb6..32325559e 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] -- cgit v1.2.3 From 954b6353b029062418b911114baa9f86b216e44e Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Sun, 26 Sep 2010 04:18:15 +0000 Subject: --- doc/news/openid/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index c0447a13f..fdd5eecd1 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -90,3 +90,5 @@ I just tried logging it with OpenID and it Just Worked. Pretty painless. If yo ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] +---- +Submitting bugs in the OpenID components will be difficult if OpenID must be working first... -- cgit v1.2.3 From 896adeafda0b81227ca54f058b18f7c3aadd318c Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Sun, 26 Sep 2010 04:19:29 +0000 Subject: (fixing silly formatting issue) --- doc/news/openid/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index fdd5eecd1..bc9856ad9 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -90,5 +90,7 @@ I just tried logging it with OpenID and it Just Worked. Pretty painless. If yo ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] + ---- + Submitting bugs in the OpenID components will be difficult if OpenID must be working first... -- cgit v1.2.3 From 5876968fa1ff1225542d2afd836d1027276bab44 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 26 Sep 2010 22:12:10 +0100 Subject: htmlbalance: be compatible with HTML::Tree 4.0 The HTML::Tree changelog says: [THINGS THAT MAY BREAK YOUR CODE OR TESTS] ... * Attribute names are now validated in as_XML and invalid names will cause an error. and indeed the regression tests do get an error. --- IkiWiki/Plugin/htmlbalance.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm index 26f8e494b..da450eea7 100644 --- a/IkiWiki/Plugin/htmlbalance.pm +++ b/IkiWiki/Plugin/htmlbalance.pm @@ -43,7 +43,7 @@ sub sanitize (@) { my @nodes = $tree->disembowel(); foreach my $node (@nodes) { if (ref $node) { - $ret .= $node->as_XML(); + $ret .= $node->as_HTML(undef, '', {}); chomp $ret; $node->delete(); } -- cgit v1.2.3 From fd7062959a6c2d301cfc091795e9989d0df94b23 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:39:07 +0000 Subject: HTML::Tree v4 is not entirely backwards-compatible --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn new file mode 100644 index 000000000..c02ec114f --- /dev/null +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -0,0 +1,13 @@ +[[!template id=gitbranch branch=smcv/ready/htmlbalance author="[[smcv]]"]] + +My one-patch htmlbalance branch fixes incompatibility with HTML::Tree 4.0. +From the git commit: + + The HTML::Tree changelog says: + + [THINGS THAT MAY BREAK YOUR CODE OR TESTS] + ... + * Attribute names are now validated in as_XML and invalid names will + cause an error. + + and indeed the regression tests do get an error. -- cgit v1.2.3 From 82d751cf32d14acfaf09edad70e387c28a946145 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:39:47 +0000 Subject: +patch --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index c02ec114f..e608e1b3d 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -11,3 +11,5 @@ From the git commit: cause an error. and indeed the regression tests do get an error. + +[[!tag patch]] -- cgit v1.2.3 From 58c80f8ed1d0dea5e03bc566769522c558353ab8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:53:00 +0000 Subject: +patch --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 63fd3d11d..d59bf15f0 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -56,3 +56,27 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] > absolute urls that have been fixed since Brian filed the bug. --[[Joey]] [[wishlist]] + +---- + +[[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] +[[!tag patch]] + +For a while I've been using a configuration where each wiki has a HTTP and +a HTTPS mirror, and updating one automatically updates the other, but +that seems unnecessarily complicated. My `https` branch adds `https_url` +and `https_cgiurl` config options which can be used to provide a HTTPS +variant of an existing site; the CGI script automatically detects whether +it was accessed over HTTPS and switches to the other one. + +This required some refactoring, which might be worth merging even if +you don't like my approach: + +* change `IkiWiki::cgiurl` to return the equivalent of `$config{cgiurl}` if + called with no parameters, and change all plugins to indirect through it + (then I only need to change that one function for the HTTPS hack) + +* `IkiWiki::baseurl` already has similar behaviour, so change nearly all + references to the `$config{url}` to call `baseurl` (a couple of references + specifically wanted the top-level public URL for Google or Blogspam rather + than a URL for the user's browser, so I left those alone) -- cgit v1.2.3 From 9d634e97d2f359db65883aadfb941309a53a0bc8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:53:54 +0000 Subject: sign my change --- ...avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index d59bf15f0..112112284 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -80,3 +80,5 @@ you don't like my approach: references to the `$config{url}` to call `baseurl` (a couple of references specifically wanted the top-level public URL for Google or Blogspam rather than a URL for the user's browser, so I left those alone) + +--[[smcv]] -- cgit v1.2.3 From 759260f7c836f3491d4250e77aea2c14ad9369b5 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:54:32 +0000 Subject: sign --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index e608e1b3d..2613224cf 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -1,4 +1,5 @@ [[!template id=gitbranch branch=smcv/ready/htmlbalance author="[[smcv]]"]] +[[!tag patch]] My one-patch htmlbalance branch fixes incompatibility with HTML::Tree 4.0. From the git commit: @@ -12,4 +13,4 @@ From the git commit: and indeed the regression tests do get an error. -[[!tag patch]] +--[[smcv]] -- cgit v1.2.3 From 1883e31de2044eba87035c7bbb4b34c45fefa432 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 22:27:46 -0400 Subject: Propigate PATH into wrapper. In the last version, the ikiwiki script stopped setting PATH. But that leads to gcc failing when run from websetup. See http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/ --- IkiWiki/Wrapper.pm | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 927368fae..5eb96f4ae 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -128,7 +128,7 @@ EOF #include extern char **environ; -char *newenviron[$#envsave+6]; +char *newenviron[$#envsave+7]; int i=0; void addenv(char *var, char *val) { @@ -147,6 +147,7 @@ $check_commit_hook @wrapper_hooks $envsave newenviron[i++]="HOME=$ENV{HOME}"; + newenviron[i++]="PATH=$ENV{PATH}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; #ifdef __TINYC__ diff --git a/debian/changelog b/debian/changelog index cae182f63..97f9d3c79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. + * Propigate PATH into wrapper. -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 -- cgit v1.2.3 From 43c99f907674de2207a7b411ee1b0c2996ce79d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 22:37:18 -0400 Subject: htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) --- debian/changelog | 1 + doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 97f9d3c79..a71a08ea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. * Propigate PATH into wrapper. + * htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index 2613224cf..92427065d 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -14,3 +14,5 @@ From the git commit: and indeed the regression tests do get an error. --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From e7b772e65b5cedb6773a6ecc52cde6fb0bacdd79 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 23:01:01 -0400 Subject: review --- ...g_http_or_https_in_urls_to_allow_serving_both.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 112112284..1547c39eb 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -82,3 +82,22 @@ you don't like my approach: than a URL for the user's browser, so I left those alone) --[[smcv]] + +> The justification for your patch seems to be wanting to use a different +> domain, like secure.foo.com, for https? Can you really not just configure +> both url and cgiurl to use `https://secure.foo.com/...` and rely on +> relative links to keep users of `http://insecure.foo.com/` on http until +> they need to use the cgi? +> +> I'm unconvinced. +> +> `Ikiwiki::baseurl()."foo"` just seems to be asking for trouble, +> ie being accidentially written as `IkiWiki::baseurl("foo")`, +> which will fail when foo is not a page, but some file. +> +> I see multiple places (inline.pm, meta.pm, poll.pm, recentchanges.pm) +> where it will now put the https url into a static page if the build +> happens to be done by the cgi accessed via https, but not otherwise. +> I would rather not have to audit for such problems going forward. +> +> --[[Joey]] -- cgit v1.2.3 From 3dfc7ea4dc49208681dfa753ae1001c57fd3d873 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 00:56:03 -0400 Subject: releasing version 3.20100926 --- debian/changelog | 6 +++--- ikiwiki.spec | 2 +- po/ikiwiki.pot | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index a71a08ea2..a26a35617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -ikiwiki (3.20100916) UNRELEASED; urgency=low +ikiwiki (3.20100926) unstable; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. * Propigate PATH into wrapper. - * htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) + * htmlbalance: Fix compatibility with HTML::Tree 4.0. (smcv) - -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 + -- Joey Hess Sun, 26 Sep 2010 23:02:54 -0400 ikiwiki (3.20100915) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 534c3a001..5cd072750 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100915 +Version: 3.20100926 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 9edda3427..17c313ba8 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-09-26 23:04-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -488,15 +488,15 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -1140,13 +1140,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "" -- cgit v1.2.3 From 06fe3dadae90c143eea80129e47d7dd1bc81282c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 00:56:26 -0400 Subject: add news item for ikiwiki 3.20100926 --- doc/news/version_3.20100722.mdwn | 25 ------------------------- doc/news/version_3.20100926.mdwn | 6 ++++++ 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 doc/news/version_3.20100722.mdwn create mode 100644 doc/news/version_3.20100926.mdwn diff --git a/doc/news/version_3.20100722.mdwn b/doc/news/version_3.20100722.mdwn deleted file mode 100644 index 27ed1fd4d..000000000 --- a/doc/news/version_3.20100722.mdwn +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/doc/news/version_3.20100926.mdwn b/doc/news/version_3.20100926.mdwn new file mode 100644 index 000000000..b56e5770b --- /dev/null +++ b/doc/news/version_3.20100926.mdwn @@ -0,0 +1,6 @@ +ikiwiki 3.20100926 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * meta: Ensure that the url specified by xrds-location is absolute. + * attachment: Fix attachment file size display. + * Propigate PATH into wrapper. + * htmlbalance: Fix compatibility with HTML::Tree 4.0. (smcv)"""]] \ No newline at end of file -- cgit v1.2.3 From e05099d5cf70b3637c57b6584df3bdfddbb5e513 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 27 Sep 2010 18:48:58 +0000 Subject: yay https --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 37 +++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 1547c39eb..cbd8c4da7 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -88,16 +88,45 @@ you don't like my approach: > both url and cgiurl to use `https://secure.foo.com/...` and rely on > relative links to keep users of `http://insecure.foo.com/` on http until > they need to use the cgi? -> + +>> My problem with that is that uses of the CGI aren't all equal (and that +>> the CA model is broken). You could put CGI uses in two classes: +>> +>> - websetup and other "serious" things (for the sites I'm running, which +>> aren't very wiki-like, editing pages is also in this class). +>> I'd like to be able to let privileged users log in over +>> https with httpauth (or possibly even a client certificate), and I don't +>> mind teaching these few people how to do the necessary contortions to +>> enable something like CACert. +>> +>> - Random users making limited use of the CGI: do=goto, do=404, and +>> commenting with an OpenID. I don't think it's realistic to expect +>> users to jump through all the CA hoops to get CACert installed for that, +>> which leaves their browsers being actively obstructive, unless I either +>> pay the CA tax (per subdomain) to get "real" certificates, or use plain +>> http. +>> +>> On a more wiki-like wiki, the second group would include normal page edits. +>> +>> Perhaps I'm doing this backwards, and instead of having the master +>> `url`/`cgiurl` be the HTTP version and providing tweakables to override +>> these with HTTPS, I should be overriding particular uses to plain HTTP... +>> +>> --[[smcv]] + > I'm unconvinced. > > `Ikiwiki::baseurl()."foo"` just seems to be asking for trouble, > ie being accidentially written as `IkiWiki::baseurl("foo")`, > which will fail when foo is not a page, but some file. -> + +>> That's a good point. --s + > I see multiple places (inline.pm, meta.pm, poll.pm, recentchanges.pm) > where it will now put the https url into a static page if the build > happens to be done by the cgi accessed via https, but not otherwise. > I would rather not have to audit for such problems going forward. -> -> --[[Joey]] + +>> Yes, that's a problem with this approach (either way round). Perhaps +>> making it easier to run two mostly-synched copies like I was previously +>> doing is the only solution... --s -- cgit v1.2.3 From 3d3af6983d32b41143d5e64ac90c44d1bc829d07 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 15:36:05 -0400 Subject: response --- ...wiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index cbd8c4da7..bb0a87183 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -108,11 +108,21 @@ you don't like my approach: >> >> On a more wiki-like wiki, the second group would include normal page edits. >> +>>> I see your use case. It still seems to me that for the more common +>>> case where CA tax has been paid (getting a cert that is valid for +>>> multiple subdomains should be doable?), having anything going through the +>>> cgiurl upgrade to https would be ok. In that case, http is just an +>>> optimisation for low-value, high-aggregate-bandwidth type uses, so a +>>> little extra https on the side is not a big deal. --[[Joey]] +>> >> Perhaps I'm doing this backwards, and instead of having the master >> `url`/`cgiurl` be the HTTP version and providing tweakables to override >> these with HTTPS, I should be overriding particular uses to plain HTTP... >> >> --[[smcv]] +>>> +>>> Maybe, or I wonder if you could just use RewriteEngine for such selective +>>> up/downgrading. Match on `do=(edit|create|prefs)`. --[[Joey]] > I'm unconvinced. > -- cgit v1.2.3 From 00595b62be624b2b105a7b137d0502d235e55f87 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 15:44:04 -0400 Subject: avoid fatal error if aggregate page template could not be found That template is user-controlled. --- IkiWiki/Plugin/aggregate.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index fe53d868d..9b70e5df0 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -644,7 +644,14 @@ sub add_page (@) { $guid->{md5}=$digest; # Create the page. - my $template=template($feed->{template}, blind_cache => 1); + my $template; + eval { + $template=template($feed->{template}, blind_cache => 1); + }; + if ($@) { + print STDERR gettext("failed to process template:")." $@"; + return; + } $template->param(title => $params{title}) if defined $params{title} && length($params{title}); $template->param(content => wikiescape(htmlabs($params{content}, -- cgit v1.2.3 From e22b18aabcb46e3c0eafeb466b51bb3eb18cf1e1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 15:47:14 -0400 Subject: template_depends: throw nice error message when template cannot be found plovs reported a crash when templates were not installed properly, with a non-useful error about the template object not being defined. I've audited all uses of template_depends(), and template(), and it makes sense for them to throw an error if the template cannot be found. All code with a user-supplied template catches errors already, to handle template parse failures. It did not make sense for template_file to throw errors, as some code uses it to probe if a template file is available. --- IkiWiki.pm | 8 +++++--- IkiWiki/Plugin/edittemplate.pm | 3 --- IkiWiki/Plugin/inline.pm | 5 +---- IkiWiki/Plugin/template.pm | 7 ++----- doc/plugins/write.mdwn | 2 ++ 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 6da281999..66ae86809 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1769,12 +1769,14 @@ sub template_depends ($$;@) { my $page=shift; my ($filename, $tpage, $untrusted)=template_file($name); + if (! defined $filename) { + error(sprintf(gettext("template %s not found"), $name)) + } + if (defined $page && defined $tpage) { add_depends($page, $tpage); } - - return unless defined $filename; - + my @opts=( filter => sub { my $text_ref = shift; diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 4f07866e4..576c94be4 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -132,9 +132,6 @@ sub filltemplate ($$) { # up a template that doesn't work. return "[[!pagetemplate ".gettext("failed to process template:")." $@]]"; } - if (! defined $template) { - return; - } $template->param(name => $page); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 715a3d652..c00aed299 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -336,10 +336,7 @@ sub preprocess_inline (@) { blind_cache => 1); }; if ($@) { - error gettext("failed to process template:")." $@"; - } - if (! $template) { - error sprintf(gettext("template %s not found"), $params{template}.".tmpl"); + error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@"; } } my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content')); diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index db26bfe31..3df06e652 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -41,12 +41,9 @@ sub preprocess (@) { blind_cache => 1); }; if ($@) { - error gettext("failed to process template:")." $@"; - } - if (! $template) { - error sprintf(gettext("%s not found"), + error sprintf(gettext("failed to process template %s"), htmllink($params{page}, $params{destpage}, - "/templates/$params{id}")) + "/templates/$params{id}"))." $@"; } $params{basename}=IkiWiki::basename($params{page}); diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index e60314485..d5bd1dd76 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -740,6 +740,8 @@ with no ".tmpl" extension. Template pages are normally looked for in the templates/ directory. If the page name starts with "/", a page elsewhere in the wiki can be used. +If the template is not found, or contains a syntax error, an error is thrown. + ### `template_depends($$;@)` Use this instead of `template()` if the content of a template is being -- cgit v1.2.3 From 16dd9c4fc64b54887645612ce9e9503861ea2f5f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 16:10:13 -0400 Subject: parameterize FIND and SED --- Makefile.PL | 40 ++++++++++++++++++++++------------------ README | 4 ++++ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 4b2e28544..b28968417 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -13,6 +13,18 @@ pure_install:: extra_install VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/' $@ chmod +x $@ @@ -46,7 +50,7 @@ extra_build: $(outprogs) ikiwiki.setup docwiki ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man $(MAKE) -C po - sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/';print m/\((.*?)\)/'/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ @@ -95,26 +99,26 @@ underlay_install: extra_install: underlay_install # Install example sites. - for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \ + for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*\.svn.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done - for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \ + for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*\.svn.*'`; do \ cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done - for dir in `find templates -follow -type d ! -regex '.*\.svn.*'`; do \ + for dir in `$(FIND) templates -follow -type d ! -regex '.*\.svn.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - for file in `find $$dir -follow -maxdepth 1 -type f`; do \ + for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins - for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \ + for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \ install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done - for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \ + for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \ install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -136,7 +140,7 @@ extra_install: underlay_install install -d $(DESTDIR)$(PREFIX)/bin for prog in $(outprogs) $(scripts); do \ - install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | sed 's/\.out//'); \ + install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | $(SED) 's/\.out//'); \ done $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) diff --git a/README b/README index 7efc59a51..611b9a45b 100644 --- a/README +++ b/README @@ -14,6 +14,10 @@ A few special variables you can set while using the Makefile.PL: unless your perl is less buggy than mine -- see http://bugs.debian.org/411786) + MAKE, FIND, and SED can be used to specify where you have the GNU + versions of those tools installed, if the normal make, find, and sed + are not GNU. + There are also other variables supported by MakeMaker, including PREFIX, INSTALL_BASE, and DESTDIR. See ExtUtils::MakeMaker(3). -- cgit v1.2.3 From 142c77ff6f0f08cc486aa12f4e52eb32ec9f1c71 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Mon, 27 Sep 2010 22:17:29 +0000 Subject: probably PEBKAC (but still haven't figured it out) --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 462852ef8..7bb39470f 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -45,3 +45,5 @@ Any suggestions gladly received. -- [[Jon]] > I of course reproduce what you reported, since the img directive gets > called with no filename, and so assumes the size parameter is the image > to display.. [[done]]? --[[Joey]] + +>> Hmm, eek. Just double-checked, and done a full rebuild. No dice! Version 3.20100831. Feel free to leave this marked done, It probably *is* PEBKAC. I shall look again in day time. -- [[Jon]] -- cgit v1.2.3 From a70f8dad67a2abe09e451ffefb96be3f7ef67176 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 18:47:13 -0400 Subject: test case --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 7bb39470f..72bd1cfa2 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -47,3 +47,6 @@ Any suggestions gladly received. -- [[Jon]] > to display.. [[done]]? --[[Joey]] >> Hmm, eek. Just double-checked, and done a full rebuild. No dice! Version 3.20100831. Feel free to leave this marked done, It probably *is* PEBKAC. I shall look again in day time. -- [[Jon]] + +>>> As always, if you'd like to mail me a larger test case that reproduces a +>>> problem for you, I can take a look at it. --[[Joey]] -- cgit v1.2.3 From 9a0d1862f4ffc6c6958d2133881b3984224a11c7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Tue, 28 Sep 2010 19:01:50 +0000 Subject: initial page --- doc/plugins/contrib/imailhide.mdwn | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 doc/plugins/contrib/imailhide.mdwn diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn new file mode 100644 index 000000000..7e9a3f995 --- /dev/null +++ b/doc/plugins/contrib/imailhide.mdwn @@ -0,0 +1,60 @@ +[[!template id=plugin name=imailhide author="Peter Vizi"]] +[[!tag mailhide]] + +# Mailhide plugin for Ikiwiki + +This plugin provides the directive mailhide, that uses the [Mailhide +API][1] to protect email addresses from spammers. + +## Dependencies + +The [Captcha::reCAPTCHA::Mailhide][2] perl module is required for this +plugin. + +## Download + +You can get the source code from [github][3]. + +## Installation + +Copy `imailhide.pm` to `/usr/share/perl/5.10.0/IkiWiki/Plugin` or +`~/.ikiwiki/IkiWiki/Plugin`, and enable it in your `.setup` file + + add_plugins => [qw{goodstuff imailhide ....}], + mailhide_public_key => "8s99vSA99fF11mao193LWdpa==", + mailhide_private_key => "6b5e4545326b5e4545326b5e45453223", + mailhide_default_style => "short", + +## Configuration + +### `mailhide_public_key` + +This is your personal public key that you can get at [Google][4]. + +### `mailhide_private_key` + +This is your personal private key that you can get at [Google][4]. + +### `mailhide_default_style` + +As per the recommendation of the [Mailhide API documentation][5], you +can define this as `short` or `long`. The `short` parameter will +result in `john` links, while the `long` parameter +will result in `joh...@example.com`. + +## Parameters + +### `email` + +*Required.* This is the email addres that you want to hide. + +### `style` + +*Optional.* You can set the style parameter individually for each + `mailhide` call. See `mailhide_default_style` for details. + +[1]: http://www.google.com/recaptcha/mailhide/ +[2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide +[3]: http://github.com/petervizi/imailhide +[4]: http://www.google.com/recaptcha/mailhide/apikey +[5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html -- cgit v1.2.3 From 219f057e5857c952289fcacd14cf0da91c5262b2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Tue, 28 Sep 2010 19:24:07 +0000 Subject: better tags --- doc/plugins/contrib/imailhide.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 7e9a3f995..3aacef57a 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=imailhide author="Peter Vizi"]] -[[!tag mailhide]] +[[!tag type/widget type/html]] # Mailhide plugin for Ikiwiki -- cgit v1.2.3 From 11f4a42884c1d4c72a438e715e84da7cc3e2175a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Sep 2010 16:34:43 -0400 Subject: add reference to peteg's revert code --- doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 7686a7a08..dc2b7ca4a 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -33,3 +33,9 @@ Puzzled a bit :-/ >>>> had its own history browser (somewhere down my todo list). --[[schmonz]] >>>> Yup, having a possibility to revert a single file would suffice. + +--- + +There is some work in progress on this by Peter Gammie. --[[Joey]] + +[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] -- cgit v1.2.3 From 8571f1e38db474e9fe7616937f8cc896e38813a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Sep 2010 17:07:01 -0400 Subject: add todo page for web reversion, with code review of patch --- ...ow_do_I_revert_edits_in_the_web_mode__63__.mdwn | 5 +- doc/todo/web_reversion.mdwn | 56 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 doc/todo/web_reversion.mdwn diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index dc2b7ca4a..4998c1a75 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -36,6 +36,5 @@ Puzzled a bit :-/ --- -There is some work in progress on this by Peter Gammie. --[[Joey]] - -[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] +Perer Gammie and I are working on reversion over at [[todo/web_reversion]]. +--[[Joey]] diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn new file mode 100644 index 000000000..50cb13fad --- /dev/null +++ b/doc/todo/web_reversion.mdwn @@ -0,0 +1,56 @@ +Goal: Web interface to allow reverting of changes. + +Interface: + +At least at first, it will be exposed via the recentchanges +page, with revert icons next to each change. We may want a dynamic +per-page interface that goes back more than 100 changes later. + +Limiting assumptions: + +* No support for resolving conflicts in reverts; such a revert would just + fail and not happen. +* No support for reset-to-this-point; initially the interface would only + revert a single commit, and if a bunch needed to go, the user would have + to drive that one at a time. + +Implementation plan: + +* `rcs_revert` hook that takes a revision to revert. +* CGI: `do=revert&rev=foo` +* recentchanges plugin adds above to recentchanges page +* prompt user to confirm (to avoid spiders doing reverts), + check that user is allowed to make the change, commit reversion, + and refresh site. + +Peter Gammie has done an initial implementation of the above. +[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] + +> Review: --[[Joey]] +> +> The revert commit will not currently say what web user did the revert. +> This could be fixed by doing a --no-commit revert first and then using +> rcs_commit_staged. +> +> So I see one thing I completly forgot about is `check_canedit`. Avoiding users +> using reverting to make changes they would normally not be allowed to do is +> tricky. I guess that a easy first pass would be to only let admins do it. +> That would be enough to get the feature out there.. +> +> I'm thinking about having a `rcs_preprevert`. It would take a rev and look +> at what changes reverting it would entail, and return the same data +> structure that `rcs_recieve` does. This could be done by using `git revert +> --no-commit`, and then examining the changes, and then `git reset` to drop +> them. +> +> Then the code that is currently in IkiWiki/Receive.pm, that calls +> `check_canedit` and `check_canremove` to test the change, can be +> straightforwardly refactored out, and used for checking reverts too. +> +> (The data from `rcs_preprevert` could also be used for a confirmation +> prompt -- it doesn't currently include enough info for diffs, but at +> least could have a list of changed files.) +> +> Note that it's possible for a git repo to have commits that modify wiki +> files in a subdir, and code files elsewhere. `rcs_preprevert` should +> detect changes outside the wiki dir, and fail, like `rcs_receive` does. -- cgit v1.2.3 From 388dd74c96fdcd18141081b8ec0ae68dd128b89d Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 29 Sep 2010 00:28:14 +0000 Subject: alternative approach with untested branch --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 32 +++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index bb0a87183..e2d9a5993 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -60,7 +60,6 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] ---- [[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] -[[!tag patch]] For a while I've been using a configuration where each wiki has a HTTP and a HTTPS mirror, and updating one automatically updates the other, but @@ -140,3 +139,34 @@ you don't like my approach: >> Yes, that's a problem with this approach (either way round). Perhaps >> making it easier to run two mostly-synched copies like I was previously >> doing is the only solution... --s + +---- + +**warning: untested branch ** [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] + +OK, here's an alternative approach, closer in spirit to what was initially +requested. I haven't tested this at all (it's getting rather late in UK time) +and it will probably be rebased later, but I've referenced it here as a proof of +concept. + +The idea is that in the common case, the CGI and the pages will reside on the +same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, +`/bugs/done`) to refer to each other. My branch adds config options which +could be set as follows for ikiwiki.info or any branchable.com site: + +* local_url: / +* local_cgiurl: /ikiwiki.cgi + +Most redirects, form actions, links etc. can safely use this form rather than +the fully-absolute URL. If not configured, these options default to the +corresponding absolute URL, which is would also be correct for unusual sites +where the CGI and the pages aren't on the same server. + +(In theory you could use things like `//static.example.com/wiki/` and +`//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https +while switching server, but I don't know how consistently browsers +suppot that.) + +"local" here is short for "locally valid", because these URLs are neither +fully relative nor fully absolute, and there doesn't seem to be a good name +for them... -- cgit v1.2.3 From 589aabeebe50c8ee95cd7c60c2128204264dd634 Mon Sep 17 00:00:00 2001 From: PeteG Date: Wed, 29 Sep 2010 04:22:10 +0000 Subject: --- doc/todo/web_reversion.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 50cb13fad..92052eb26 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -24,14 +24,17 @@ Implementation plan: and refresh site. Peter Gammie has done an initial implementation of the above. -[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] +[[!template id=gitbranch branch=peteg/revert author="[[peteg]]"]] + +>> It is on a separate branch now. --[[peteg]] > Review: --[[Joey]] > > The revert commit will not currently say what web user did the revert. > This could be fixed by doing a --no-commit revert first and then using > rcs_commit_staged. -> +>> Fixed, I think. --[[peteg]] +> > So I see one thing I completly forgot about is `check_canedit`. Avoiding users > using reverting to make changes they would normally not be allowed to do is > tricky. I guess that a easy first pass would be to only let admins do it. -- cgit v1.2.3 From acecbad0ff4a8c441da520522710dd5357ab31e0 Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Wed, 29 Sep 2010 15:14:19 +1000 Subject: First cut at the revert plugin. --- IkiWiki.pm | 12 ++++++++ IkiWiki/Plugin/git.pm | 35 +++++++++++++++++++++ IkiWiki/Plugin/recentchanges.pm | 66 ++++++++++++++++++++++++++++++++++++++++ doc/templates.mdwn | 2 +- doc/wikiicons/revert.png | Bin 0 -> 840 bytes templates/revert.tmpl | 13 ++++++++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 doc/wikiicons/revert.png create mode 100644 templates/revert.tmpl diff --git a/IkiWiki.pm b/IkiWiki.pm index 66ae86809..e2b2ceda3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,6 +1941,18 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } +sub rcs_preprevert ($) { + $hooks{rcs}{rcs_preprevert}{call}->(@_); +} + +sub rcs_revert (@) { + $hooks{rcs}{rcs_revert}{call}->(@_); +} + +sub rcs_showpatch ($) { + $hooks{rcs}{rcs_showpatch}{call}->(@_); +} + sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index fd57ce1e4..a68bd0b0e 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -27,6 +27,10 @@ sub import { hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); + hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); + hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); + hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); + hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); } sub checkconfig () { @@ -811,4 +815,35 @@ sub rcs_receive () { return reverse @rets; } +sub rcs_preprevert ($) { + # FIXME implement +} + +sub rcs_revert (@) { + # Try to revert the given patch; returns undef on _success_. + # Same parameters as rcs_commit_staged + 'rev', the patch ID to be + # reverted. + my %params = @_; + my $rev = $params{rev}; + + if(run_or_non('git', 'revert', '--no-commit', $rev)) { + debug "Committing revert for patch '$rev'."; + rcs_commit_staged(message => "This reverts commit $rev", @_); + } else { + # No idea what is actually getting reverted, so all we can do is say we failed. + run_or_die('git', 'reset', '--hard'); + return "Failed to revert patch $rev."; + } +} + +sub rcs_showpatch ($) { + # Show the patch with the given revision id. + my ($rev) = @_; + + # FIXME check + my @r = run_or_die('git', 'show', $rev); + + return join "\n", @r; +} + 1 diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 758b98348..2a78566e1 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -60,6 +60,72 @@ sub refresh ($) { } } +sub confirmation_form { + my ($q, $session, $rev) = @_; + + eval q{use CGI::FormBuilder}; + error($@) if $@; + my $f = CGI::FormBuilder->new( + name => "revert", + header => 0, + charset => "utf-8", + method => 'POST', + javascript => 0, + params => $q, + action => $config{cgiurl}, + stylesheet => 1, + template => { template('revert.tmpl') }, + ); + + $f->field(name => "sid", type => "hidden", value => $session->id, + force => 1); + $f->field(name => "do", type => "hidden", value => "revert", force => 1); + $f->field(name => "rev", type => "hidden", value => $rev, force => 1); + + return $f, ["Revert", "Cancel"]; +} + +sub sessioncgi ($$) { + my ($q, $session) = @_; + my $do = $q->param('do'); + my $rev = $q->param('rev'); + + return unless $do eq 'revert' && $rev; + + # FIXME rcs_preprevert ?? + IkiWiki::check_canedit('FIXME', $q, $session); + + my ($form, $buttons) = confirmation_form($q, $session); + IkiWiki::decode_form_utf8($form); + + if($form->submitted eq 'Revert' && $form->validate) { + IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + + IkiWiki::disable_commit_hook(); + my $r = IkiWiki::rcs_revert( + session => $session, + rev => $rev); + IkiWiki::enable_commit_hook(); + + if($r) { + die "FIXME revert '$rev' failed."; + } else { + IkiWiki::refresh(); + IkiWiki::saveindex(); + # FIXME indicate success. + } + } else { + $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); + my $patch_contents = IkiWiki::rcs_showpatch($rev); + $form->tmpl_param(patch_contents => encode_entities($patch_contents)); + IkiWiki::showform($form, $buttons, $session, $q); + exit 0; + } + + IkiWiki::redirect($q, urlto($config{recentchangespage}, '')); + exit 0; +} + # Enable the recentchanges link. sub pagetemplate (@) { my %params=@_; diff --git a/doc/templates.mdwn b/doc/templates.mdwn index bfb6a439a..4fd2bf501 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -74,7 +74,7 @@ html out of ikiwiki and in the templates. * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user + `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need to be customised. [[!meta robots="noindex, follow"]] diff --git a/doc/wikiicons/revert.png b/doc/wikiicons/revert.png new file mode 100644 index 000000000..9036046e9 Binary files /dev/null and b/doc/wikiicons/revert.png differ diff --git a/templates/revert.tmpl b/templates/revert.tmpl new file mode 100644 index 000000000..3cf069dca --- /dev/null +++ b/templates/revert.tmpl @@ -0,0 +1,13 @@ +
+
+
+ +
+ + +
+
+ + +
+ -- cgit v1.2.3 From 941755e46661b65f29aeebcf38f8410f9c8cfc2e Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Wed, 29 Sep 2010 15:43:44 +1000 Subject: Get things right after moving to a branch. --- IkiWiki/Plugin/recentchanges.pm | 11 ++++++++++- templates/change.tmpl | 2 ++ templates/revert.tmpl | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 2a78566e1..79d175328 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -13,6 +13,7 @@ sub import { hook(type => "refresh", id => "recentchanges", call => \&refresh); hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate); hook(type => "htmlize", id => "_change", call => \&htmlize); + hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi); # Load goto to fix up links from recentchanges IkiWiki::loadplugin("goto"); } @@ -80,7 +81,6 @@ sub confirmation_form { $f->field(name => "sid", type => "hidden", value => $session->id, force => 1); $f->field(name => "do", type => "hidden", value => "revert", force => 1); - $f->field(name => "rev", type => "hidden", value => $rev, force => 1); return $f, ["Revert", "Cancel"]; } @@ -110,6 +110,7 @@ sub sessioncgi ($$) { if($r) { die "FIXME revert '$rev' failed."; } else { + require IkiWiki::Render; IkiWiki::refresh(); IkiWiki::saveindex(); # FIXME indicate success. @@ -118,6 +119,7 @@ sub sessioncgi ($$) { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); my $patch_contents = IkiWiki::rcs_showpatch($rev); $form->tmpl_param(patch_contents => encode_entities($patch_contents)); + $form->field(name => "rev", type => "hidden", value => $rev, force => 1); IkiWiki::showform($form, $buttons, $session, $q); exit 0; } @@ -180,6 +182,13 @@ sub store ($$$) { ]; push @{$change->{pages}}, { link => '...' } if $is_excess; + if (length $config{cgiurl}) { + $change->{reverturl} = IkiWiki::cgiurl( + do => "revert", + rev => $change->{rev} + ); + } + $change->{author}=$change->{user}; my $oiduser=eval { IkiWiki::openiduser($change->{user}) }; if (defined $oiduser) { diff --git a/templates/change.tmpl b/templates/change.tmpl index 671b9e483..148b4376e 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -28,6 +28,8 @@
Date: +
 +[[diff|wikiicons/revert.png]]
diff --git a/templates/revert.tmpl b/templates/revert.tmpl index 3cf069dca..03cd0838d 100644 --- a/templates/revert.tmpl +++ b/templates/revert.tmpl @@ -5,6 +5,7 @@
+
-- cgit v1.2.3 From 64c3c0d0deb80c5af69154d0bc06419a2232fb8f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Wed, 29 Sep 2010 10:12:52 +0000 Subject: --- doc/plugins/contrib/imailhide.mdwn | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 3aacef57a..3247f57bf 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,7 +1,4 @@ -[[!template id=plugin name=imailhide author="Peter Vizi"]] -[[!tag type/widget type/html]] - -# Mailhide plugin for Ikiwiki +# Mailhide Plugin for Ikiwiki This plugin provides the directive mailhide, that uses the [Mailhide API][1] to protect email addresses from spammers. @@ -53,8 +50,13 @@ will result in `joh...@example.com`. *Optional.* You can set the style parameter individually for each `mailhide` call. See `mailhide_default_style` for details. +## Known Issues + +1. [opening new window when displaying email address][6] + [1]: http://www.google.com/recaptcha/mailhide/ [2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide [3]: http://github.com/petervizi/imailhide [4]: http://www.google.com/recaptcha/mailhide/apikey [5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html +[6]: http://github.com/petervizi/imailhide/issues#issue/1 -- cgit v1.2.3 From b0483974f5f71bc75f5a4df3e636af246371cbf6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Wed, 29 Sep 2010 10:15:04 +0000 Subject: --- doc/plugins/contrib/imailhide.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 3247f57bf..6009aa012 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,3 +1,6 @@ +[[!template id=plugin name=imailhide author="Peter_Vizi"]] +[[!tag type/widget type/html]] + # Mailhide Plugin for Ikiwiki This plugin provides the directive mailhide, that uses the [Mailhide -- cgit v1.2.3 From 2df92a956af2ed6b4ac3c2c3de01c56bb08e2368 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Sep 2010 11:58:45 -0400 Subject: Fix test suite failure on other side of date line. --- debian/changelog | 6 ++++++ t/pagespec_match.t | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a26a35617..527dd7884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100927) UNRELEASED; urgency=low + + * Fix test suite failure on other side of date line. + + -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 + ikiwiki (3.20100926) unstable; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. diff --git a/t/pagespec_match.t b/t/pagespec_match.t index fe9624370..a37b06e8e 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -101,6 +101,7 @@ ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success"); ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success"); +$ENV{TZ}="GMT"; $IkiWiki::pagectime{foo}=1154532692; # Wed Aug 2 11:26 EDT 2006 $IkiWiki::pagectime{bar}=1154532695; # after ok(pagespec_match("foo", "created_before(bar)")); -- cgit v1.2.3 From 0d03e639003f1b9e640d0da4c82cb6f26f1e437b Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:55:04 +0000 Subject: code and lists --- doc/sandbox/bullet_list_and_code_test.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/sandbox/bullet_list_and_code_test.mdwn diff --git a/doc/sandbox/bullet_list_and_code_test.mdwn b/doc/sandbox/bullet_list_and_code_test.mdwn new file mode 100644 index 000000000..a17729c90 --- /dev/null +++ b/doc/sandbox/bullet_list_and_code_test.mdwn @@ -0,0 +1,12 @@ +paragraph. + + code + + * bullet list + * bullet list + + more code + + * bullet list continued + + tailing code -- cgit v1.2.3 From 19c1b202a4f94f4d627f030161bac45055ac22ec Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:57:56 +0000 Subject: +branchable link, demo of actiontabs --- doc/css_market.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn index 0e5a68740..c167388a7 100644 --- a/doc/css_market.mdwn +++ b/doc/css_market.mdwn @@ -47,7 +47,7 @@ included in the [[theme_plugin|plugins/theme]]. * **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6]. * **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays - the action list (Edit, RecentChanges, etc.) as tabs. + the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/). [[!meta stylesheet="actiontabs"]] * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. -- cgit v1.2.3 From 0f2f769229459effdb4dfaff9e7f617670b3d519 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:59:12 +0000 Subject: lists and bullets --- ...rkdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn diff --git a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn new file mode 100644 index 000000000..4accaa1de --- /dev/null +++ b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn @@ -0,0 +1,10 @@ +Consider: + + * one bullet + * another + + end of bullet list, this should be a code block + + * later on bullets + + tailing code block -- cgit v1.2.3 From 13945890c3292020bc0a9bb54668557115f5ad48 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 09:00:39 +0000 Subject: removed --- ...rkdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn diff --git a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn deleted file mode 100644 index 4accaa1de..000000000 --- a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn +++ /dev/null @@ -1,10 +0,0 @@ -Consider: - - * one bullet - * another - - end of bullet list, this should be a code block - - * later on bullets - - tailing code block -- cgit v1.2.3 From 408ee89fd7c1dc70510385a7cf263a05862dda97 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 30 Sep 2010 07:53:37 -0400 Subject: Make tidy command line configurable for the htmltidy plugin. --- IkiWiki/Plugin/htmltidy.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index e6d377f8a..8a0e8f428 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -23,6 +23,13 @@ sub getsetup () { safe => 1, rebuild => undef, }, + htmltidy => { + type => "string", + example => "tidy --show-body-only yes --show-warnings no --tidy-mark no --markup yes -quiet -asxhtml -utf8", + description => "tidy command line", + safe => 0, # path + rebuild => 0, + }, } sub sanitize (@) { @@ -31,7 +38,7 @@ sub sanitize (@) { my $pid; my $sigpipe=0; $SIG{PIPE}=sub { $sigpipe=1 }; - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null'); + $pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null"); # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); -- cgit v1.2.3 From 278821b6b611c0885977f3b2431b5384a9fd660f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Thu, 30 Sep 2010 12:17:14 +0000 Subject: Created "configurable tidy" todo item. --- doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/todo/configurable_tidy_command_for_htmltidy.mdwn diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn new file mode 100644 index 000000000..51991393e --- /dev/null +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -0,0 +1,6 @@ +[[!tag patch patch]] + +I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line. This seemed like a generally useful thing, so I've published my [patch][] as a Git branch. + +[play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html +[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 -- cgit v1.2.3 From dfbb57aa8dd3de920773aa5765f18b23ec620ea0 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Thu, 30 Sep 2010 13:49:37 +0000 Subject: Point to my updated mdwn_itex plugin. --- doc/todo/latex.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn index 4363003c1..76bb69c9e 100644 --- a/doc/todo/latex.mdwn +++ b/doc/todo/latex.mdwn @@ -9,6 +9,8 @@ of the ikiwiki [[/logo]]. > [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z. +>> I've [updated](http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/) Jason's plugin for ikiwiki 3.x. --W. Trevor King + ---- ikiwiki could also support LaTeX as a document type, again rendering to HTML. -- cgit v1.2.3 From b9b505210457f5a8f6c19b60295b2a657d23f244 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 21:49:55 +0000 Subject: gah --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 72bd1cfa2..5fc50c22b 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -50,3 +50,6 @@ Any suggestions gladly received. -- [[Jon]] >>> As always, if you'd like to mail me a larger test case that reproduces a >>> problem for you, I can take a look at it. --[[Joey]] + +>>>> Thank you for the offer. I might still take you up on it. I've just proven that this +>>>> does work for a clean repo / bare bones test case. -- [[Jon]] -- cgit v1.2.3 From e46f15f371fdb2a904f65e2772a941c9f24f1611 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 21:57:39 +0000 Subject: done, PEBKAC. Thank you for your time :) --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 5fc50c22b..e91a8923d 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -51,5 +51,11 @@ Any suggestions gladly received. -- [[Jon]] >>> As always, if you'd like to mail me a larger test case that reproduces a >>> problem for you, I can take a look at it. --[[Joey]] ->>>> Thank you for the offer. I might still take you up on it. I've just proven that this ->>>> does work for a clean repo / bare bones test case. -- [[Jon]] +>>>> Thank you for the offer. I might still take you up on it. I've just proven that this +>>>> does work for a clean repo / bare bones test case. -- [[Jon]] Figured it out. The +>>>> problem was I'd copied a page (old_new) which had two images embedded in it to test. +>>>> I'd stored the images under a subdir "old_new". The new page was called "old_new_test" +>>>> and the images thus could not be found by a pagespec "some-image.jpg". Adjusting the +>>>> href argument to the template (consequently the src argument to img) to +>>>> "old_new/some-image.jpg" fixed it all. [[done]], PEBKAC. Thank you for your time :) +>>>> -- [[Jon]] -- cgit v1.2.3 From 8024a2636feb60026a79715430a66bb572b9eae8 Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Fri, 1 Oct 2010 14:06:00 +1000 Subject: Complete rcs_preprevert and lightly test. --- IkiWiki.pm | 4 +- IkiWiki/Plugin/git.pm | 188 +++++++++++++++++++++++----------------- IkiWiki/Plugin/recentchanges.pm | 5 +- IkiWiki/Receive.pm | 32 +++++-- 4 files changed, 136 insertions(+), 93 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index e2b2ceda3..aa4dccac3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,7 +1941,7 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub rcs_preprevert ($) { +sub rcs_preprevert (@) { $hooks{rcs}{rcs_preprevert}{call}->(@_); } @@ -1949,7 +1949,7 @@ sub rcs_revert (@) { $hooks{rcs}{rcs_revert}{call}->(@_); } -sub rcs_showpatch ($) { +sub rcs_showpatch (@) { $hooks{rcs}{rcs_showpatch}{call}->(@_); } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index a68bd0b0e..46fa7d2e0 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -722,101 +722,130 @@ sub rcs_getmtime ($) { return findtimes($file, 0); } -sub rcs_receive () { - # The wiki may not be the only thing in the git repo. - # Determine if it is in a subdirectory by examining the srcdir, - # and its parents, looking for the .git directory. - my $subdir=""; - my $dir=$config{srcdir}; - while (! -d "$dir/.git") { - $subdir=IkiWiki::basename($dir)."/".$subdir; - $dir=IkiWiki::dirname($dir); - if (! length $dir) { - error("cannot determine root of git repo"); - } - } +{ +my $git_root; +sub git_find_root { + # The wiki may not be the only thing in the git repo. + # Determine if it is in a subdirectory by examining the srcdir, + # and its parents, looking for the .git directory. + + return $git_root if $git_root; + + my $subdir=""; + my $dir=$config{srcdir}; + while (! -d "$dir/.git") { + $subdir=IkiWiki::basename($dir)."/".$subdir; + $dir=IkiWiki::dirname($dir); + if (! length $dir) { + error("cannot determine root of git repo"); + } + } + + return $subdir; +} +} + +sub git_parse_changes { + my @changes = @_; + + my $subdir = git_find_root(); + my @rets; + foreach my $ci (@changes) { + foreach my $detail (@{ $ci->{'details'} }) { + my $file = $detail->{'file'}; + + # check that all changed files are in the + # subdir + if (length $subdir && + ! ($file =~ s/^\Q$subdir\E//)) { + error sprintf(gettext("you are not allowed to change %s"), $file); + } + + my ($action, $mode, $path); + if ($detail->{'status'} =~ /^[M]+\d*$/) { + $action="change"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { + $action="add"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { + $action="remove"; + $mode=$detail->{'mode_from'}; + } + else { + error "unknown status ".$detail->{'status'}; + } + + # test that the file mode is ok + if ($mode !~ /^100[64][64][64]$/) { + error sprintf(gettext("you cannot act on a file with mode %s"), $mode); + } + if ($action eq "change") { + if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { + error gettext("you are not allowed to change file modes"); + } + } + + # extract attachment to temp file + if (($action eq 'add' || $action eq 'change') && + ! pagetype($file)) { + + eval q{use File::Temp}; + die $@ if $@; + my $fh; + ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); + # Ensure we run this in the right place, see comments in rcs_receive. + my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") + . "git show $detail->{sha1_to} > '$path'"; + if (system($cmd) != 0) { + error("failed writing temp file '$path'."); + } + } + + push @rets, { + file => $file, + action => $action, + path => $path, + }; + } + } + + return @rets; +} +sub rcs_receive () { my @rets; while (<>) { chomp; my ($oldrev, $newrev, $refname) = split(' ', $_, 3); - + # only allow changes to gitmaster_branch if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) { error sprintf(gettext("you are not allowed to change %s"), $refname); } - + # Avoid chdir when running git here, because the changes # are in the master git repo, not the srcdir repo. - # The pre-recieve hook already puts us in the right place. + # The pre-receive hook already puts us in the right place. $no_chdir=1; - my @changes=git_commit_info($oldrev."..".$newrev); + push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); $no_chdir=0; - - foreach my $ci (@changes) { - foreach my $detail (@{ $ci->{'details'} }) { - my $file = $detail->{'file'}; - - # check that all changed files are in the - # subdir - if (length $subdir && - ! ($file =~ s/^\Q$subdir\E//)) { - error sprintf(gettext("you are not allowed to change %s"), $file); - } - - my ($action, $mode, $path); - if ($detail->{'status'} =~ /^[M]+\d*$/) { - $action="change"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { - $action="add"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { - $action="remove"; - $mode=$detail->{'mode_from'}; - } - else { - error "unknown status ".$detail->{'status'}; - } - - # test that the file mode is ok - if ($mode !~ /^100[64][64][64]$/) { - error sprintf(gettext("you cannot act on a file with mode %s"), $mode); - } - if ($action eq "change") { - if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { - error gettext("you are not allowed to change file modes"); - } - } - - # extract attachment to temp file - if (($action eq 'add' || $action eq 'change') && - ! pagetype($file)) { - eval q{use File::Temp}; - die $@ if $@; - my $fh; - ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) { - error("failed writing temp file"); - } - } - - push @rets, { - file => $file, - action => $action, - path => $path, - }; - } - } } return reverse @rets; } -sub rcs_preprevert ($) { - # FIXME implement +sub rcs_preprevert (@) { + # Determine what the effects are of reverting the patch with the + # ID given by 'rev'. Returns the same structure as rcs_receive. + # FIXME note test_changes expects 'cgi' and 'session' parameters. + my %params = @_; + my $rev = $params{rev}; + + require IkiWiki::Receive; + IkiWiki::Receive::test_changes(%params, changes => [git_parse_changes(git_commit_info($rev, 1))]); } sub rcs_revert (@) { @@ -836,9 +865,10 @@ sub rcs_revert (@) { } } -sub rcs_showpatch ($) { +sub rcs_showpatch (@) { # Show the patch with the given revision id. - my ($rev) = @_; + my %params = @_; + my $rev = $params{rev}; # FIXME check my @r = run_or_die('git', 'show', $rev); diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 79d175328..4a8d1bf80 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -92,8 +92,7 @@ sub sessioncgi ($$) { return unless $do eq 'revert' && $rev; - # FIXME rcs_preprevert ?? - IkiWiki::check_canedit('FIXME', $q, $session); + IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev); my ($form, $buttons) = confirmation_form($q, $session); IkiWiki::decode_form_utf8($form); @@ -117,7 +116,7 @@ sub sessioncgi ($$) { } } else { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); - my $patch_contents = IkiWiki::rcs_showpatch($rev); + my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev); $form->tmpl_param(patch_contents => encode_entities($patch_contents)); $form->field(name => "rev", type => "hidden", value => $rev, force => 1); IkiWiki::showform($form, $buttons, $session, $q); diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index e77c477a9..48228e5f0 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -48,10 +48,10 @@ EOF sub test () { exit 0 if trusted(); - + IkiWiki::lockwiki(); IkiWiki::loadindex(); - + # Dummy up a cgi environment to use when calling check_canedit # and friends. eval q{use CGI}; @@ -72,10 +72,22 @@ sub test () { regdate => time, }) || error("failed adding user"); } - - my %newfiles; - foreach my $change (IkiWiki::rcs_receive()) { + test_changes(cgi => $cgi, + session => $session, + changes => [IkiWiki::rcs_receive()] + ); + exit 0; +} + +sub test_changes { + my %params = @_; + my $cgi = $params{cgi}; + my $session = $params{session}; + my @changes = @{$params{changes}}; + + my %newfiles; + foreach my $change (@changes) { # This untaint is safe because we check file_pruned and # wiki_file_regexp. my ($file)=$change->{file}=~/$config{wiki_file_regexp}/; @@ -87,7 +99,7 @@ sub test () { my $type=pagetype($file); my $page=pagename($file) if defined $type; - + if ($change->{action} eq 'add') { $newfiles{$file}=1; } @@ -104,6 +116,10 @@ sub test () { IkiWiki::check_canedit($file, $cgi, $session); next; } + else { + use Data::Dumper; + die "fall through test_changes add: " . Data::Dumper::Dumper($change); + } } } elsif ($change->{action} eq 'remove') { @@ -125,11 +141,9 @@ sub test () { else { error "unknown action ".$change->{action}; } - + error sprintf(gettext("you are not allowed to change %s"), $file); } - - exit 0; } 1 -- cgit v1.2.3 From 7d1c3aa1cb42f4306535481c009367ffa42c7223 Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Fri, 1 Oct 2010 14:08:07 +1000 Subject: Minor tidy-ups. --- IkiWiki/Plugin/git.pm | 7 ++----- IkiWiki/Plugin/recentchanges.pm | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 46fa7d2e0..457975d95 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -840,7 +840,7 @@ sub rcs_receive () { sub rcs_preprevert (@) { # Determine what the effects are of reverting the patch with the # ID given by 'rev'. Returns the same structure as rcs_receive. - # FIXME note test_changes expects 'cgi' and 'session' parameters. + # Note test_changes expects 'cgi' and 'session' parameters. my %params = @_; my $rev = $params{rev}; @@ -870,10 +870,7 @@ sub rcs_showpatch (@) { my %params = @_; my $rev = $params{rev}; - # FIXME check - my @r = run_or_die('git', 'show', $rev); - - return join "\n", @r; + return join "\n", run_or_die('git', 'show', $rev); } 1 diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 4a8d1bf80..9a62cb243 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -107,12 +107,11 @@ sub sessioncgi ($$) { IkiWiki::enable_commit_hook(); if($r) { - die "FIXME revert '$rev' failed."; + die "Revert '$rev' failed."; } else { require IkiWiki::Render; IkiWiki::refresh(); IkiWiki::saveindex(); - # FIXME indicate success. } } else { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); -- cgit v1.2.3 From 922e149de93844561160c2978d71531f3c08345e Mon Sep 17 00:00:00 2001 From: PeteG Date: Fri, 1 Oct 2010 04:20:03 +0000 Subject: Continuing discussion about reverting via the web interface. --- doc/todo/web_reversion.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 92052eb26..34947b710 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -45,15 +45,23 @@ Peter Gammie has done an initial implementation of the above. > structure that `rcs_recieve` does. This could be done by using `git revert > --no-commit`, and then examining the changes, and then `git reset` to drop > them. +>> We can use the existing `git_commit_info` with the patch ID - no need to touch the working directory. -- [[peteg]] > > Then the code that is currently in IkiWiki/Receive.pm, that calls > `check_canedit` and `check_canremove` to test the change, can be > straightforwardly refactored out, and used for checking reverts too. +>> Wow, that was easy. :-) -- [[peteg]] > > (The data from `rcs_preprevert` could also be used for a confirmation > prompt -- it doesn't currently include enough info for diffs, but at > least could have a list of changed files.) -> +>> I added `rcs_showpatch` which simply yields the output of `git show `. -- [[peteg]] +> > Note that it's possible for a git repo to have commits that modify wiki > files in a subdir, and code files elsewhere. `rcs_preprevert` should > detect changes outside the wiki dir, and fail, like `rcs_receive` does. +>> Taken care of by refactoring `rcs_receive` in `git.pm` +>> I've tested it lightly in my single-user setup. It's a little nasty that the `attachment` plugin +>> gets used to check whether attachments are allowed -- there really should be a hook for that. +>> +>> Please look it over and tell me what else needs fixing... -- [[peteg]] -- cgit v1.2.3 From 1620e2dc4f0a25620fe243d1556722e6b2d2618d Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Fri, 1 Oct 2010 14:53:00 +1000 Subject: Correct 'alt' text for the revert image. --- templates/change.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/change.tmpl b/templates/change.tmpl index 148b4376e..9cf40777b 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -29,7 +29,7 @@
Date:
-[[diff|wikiicons/revert.png]] +[[revert|wikiicons/revert.png]]
-- cgit v1.2.3 From 3740f787571b0dff26d0b01cc63a22d9816c2896 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:43:52 +0000 Subject: updated branch; fold discussion of rejected version into a toggleable --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 67 ++++++++++++++++------ 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index e2d9a5993..f95b7af4b 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -59,6 +59,9 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] ---- +[[!toggle id="smcv-https" text="Some discussion of a rejected implementation, smcv/https."]] +[[!toggleable id="smcv-https" text=""" + [[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] For a while I've been using a configuration where each wiki has a HTTP and @@ -140,33 +143,61 @@ you don't like my approach: >> making it easier to run two mostly-synched copies like I was previously >> doing is the only solution... --s +"""]] + ---- -**warning: untested branch ** [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] OK, here's an alternative approach, closer in spirit to what was initially -requested. I haven't tested this at all (it's getting rather late in UK time) -and it will probably be rebased later, but I've referenced it here as a proof of -concept. +requested. I haven't tested this on a full website with the CGI yet. The idea is that in the common case, the CGI and the pages will reside on the same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, -`/bugs/done`) to refer to each other. My branch adds config options which -could be set as follows for ikiwiki.info or any branchable.com site: - -* local_url: / -* local_cgiurl: /ikiwiki.cgi - -Most redirects, form actions, links etc. can safely use this form rather than -the fully-absolute URL. If not configured, these options default to the -corresponding absolute URL, which is would also be correct for unusual sites -where the CGI and the pages aren't on the same server. - -(In theory you could use things like `//static.example.com/wiki/` and -`//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https +`/bugs/done`) to refer to each other. Most redirects, form actions, links etc. +can safely use this form rather than the fully-absolute URL. + +The initial version of the branch had config options `local_url` and +`local_cgiurl`, but they're now automatically computed by checking +whether `url` and `cgiurl` are on the same server with the the same URL +scheme. In theory you could use things like `//static.example.com/wiki/` +and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https while switching server, but I don't know how consistently browsers -suppot that.) +suppot that. "local" here is short for "locally valid", because these URLs are neither fully relative nor fully absolute, and there doesn't seem to be a good name for them... + +New API added by this branch: + +* `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` + +* `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + +* `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + +* `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters + except `cgiurl` and/or `local_cgiurl` + +Bugs: + +* I don't think anything except `openid` calls `cgiurl` without also + passing in `local_cgiurl => 1`, so perhaps that should be the default; + `openid` uses `cgiurl` anyway, so there doesn't even necessarily need + to be a way to force absolute URLs? Any other module that really needs + an absolute URL could use `cgiurl(cgiurl => $config{cgiurl}, ...)`, + although that does look a bit strange + +* It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + +* Or, to reduce use of the unexported `baseurl` function, it might make + sense to give `urlto` a special case that references the root of the wiki, + with a trailing slash ready to append stuff: perhaps `urlto('/')`, + with usage like this? + + do_something(baseurl => urlto('/', undef, local)`); + do_something_else(urlto('/').'style.css'); + IkiWiki::redirect(urlto('/', undef, 1)); -- cgit v1.2.3 From 681b968ab9f728b5b548d27b42fc788ff39de14c Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:46:50 +0000 Subject: how much indentation does a code block in a bullet point need? we just don't know --- ...d_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index f95b7af4b..969b17fa2 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -198,6 +198,6 @@ Bugs: with a trailing slash ready to append stuff: perhaps `urlto('/')`, with usage like this? - do_something(baseurl => urlto('/', undef, local)`); - do_something_else(urlto('/').'style.css'); - IkiWiki::redirect(urlto('/', undef, 1)); + do_something(baseurl => urlto('/', undef, local)`); + do_something_else(urlto('/').'style.css'); + IkiWiki::redirect(urlto('/', undef, 1)); -- cgit v1.2.3 From f768b6bf16e043b41d4503f3ab0758d975994b12 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 1 Oct 2010 22:48:29 +0000 Subject: --- doc/forum/Asciidoc_plugin.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Asciidoc_plugin.mdwn diff --git a/doc/forum/Asciidoc_plugin.mdwn b/doc/forum/Asciidoc_plugin.mdwn new file mode 100644 index 000000000..57d6fd91e --- /dev/null +++ b/doc/forum/Asciidoc_plugin.mdwn @@ -0,0 +1,14 @@ +I have completely overhauled the Asciidoc plugin for ikiwiki that was created by [[Karl Mowson|http://www.mowson.org/karl/colophon/]]. The source can be downloaded from my [[Dropbox|http://dl.dropbox.com/u/11256359/asciidoc.pm]]. + +### Features + +* Uses a filter hook to escape WikiLinks and Directives using Asciidoc `+++` passthrough macros, to avoid them being processed by Asciidoc. This behavior is configurable in the wiki setup file. +* Adds a preprocessor directive 'asciidoc' which allows extra Asciidoc command-line options to be passed on a per-page basis. Each parameter name is the option name (the leading `--` will be inserted automatically), and the parameter value is the option value. Currently, only 'conf-file' and 'doctype' are allowed (or even useful). +* Sets the page title from the first line in the Asciidoc file using a meta directive. This behavior is configurable in the wiki setup file. +* Searches for an Asciidoc configuration file named the same as the wiki if none is specified in the setup file. +* Asciidoc configuration files are stored in the wiki. They should be named `._conf` to avoid publishing them. + +### Problems + +* Escaping Directives is not optimal. It prevents markup from being used in Directives, and the passthrough macros have to include extra spaces to avoid having directives that return an empty string collapse to `++++++`. In addition, I had to borrow the regexps from the Ikiwiki source code; it would be nice if this were available as part of the API. +* Handling of Asciidoc errors is suboptimal; they are simply inserted into the returned page. This could be fixed in Perl 5.12 by using the run_forked() in IPC::Cmd. -- cgit v1.2.3 From 28c9f7dbcfa152957e15de3bd3fd91502e94635a Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:50:26 +0000 Subject: clarification: too many things called cgiurl --- ..._ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 969b17fa2..262d5c22d 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -185,9 +185,10 @@ Bugs: * I don't think anything except `openid` calls `cgiurl` without also passing in `local_cgiurl => 1`, so perhaps that should be the default; - `openid` uses `cgiurl` anyway, so there doesn't even necessarily need - to be a way to force absolute URLs? Any other module that really needs - an absolute URL could use `cgiurl(cgiurl => $config{cgiurl}, ...)`, + `openid` uses the `cgiurl` named parameter anyway, so there doesn't even + necessarily need to be a way to force absolute URLs? Any other module + that really needs an absolute URL could use + `cgiurl(cgiurl => $config{cgiurl}, ...)`, although that does look a bit strange * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being -- cgit v1.2.3 From 0b0ce854d0cfa716ed5af7830884ca04358b230b Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 23:01:36 +0000 Subject: workaround --- doc/bugs/404_plugin_and_lighttpd.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn index e478d98c3..8508d0dcd 100644 --- a/doc/bugs/404_plugin_and_lighttpd.mdwn +++ b/doc/bugs/404_plugin_and_lighttpd.mdwn @@ -1,5 +1,15 @@ Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the [[plugins/404]] plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL. +> For what it's worth, the first half is . +> One workaround would be to make this script your 404 handler: +> +> #!/bin/sh +> REDIRECT_STATUS=404; export REDIRECT_STATUS +> REDIRECT_URL="$SERVER_NAME$REQUEST_URI"; export REDIRECT_URL +> exec /path/to/your/ikiwiki.cgi "$@" +> +> --[[smcv]] + I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache. This is with lighttpd 1.4.19 on Debian. -- cgit v1.2.3 From 3fd58fc71bb47636036299a26ce85fa02c4d9b77 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 1 Oct 2010 23:14:28 +0000 Subject: --- doc/forum/Dump_plugin.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/forum/Dump_plugin.mdwn diff --git a/doc/forum/Dump_plugin.mdwn b/doc/forum/Dump_plugin.mdwn new file mode 100644 index 000000000..ff3bfea90 --- /dev/null +++ b/doc/forum/Dump_plugin.mdwn @@ -0,0 +1,4 @@ +I have a second plugin that adds a directive 'dump', and dumps all sorts of information (env variables and template variables) about a page into the end of the page. It's cheesy, but it's available in my [[Dropbox|http://dl.dropbox.com/u/11256359/dump.pm]] as well as the Asciidoc plugin. + +### Issues +* It really ought to use some kind of template instead of HTML. In fact, it ought to embed its information in template variables of some kind rather than stuffing it into the end of the page. -- cgit v1.2.3 From 01c893e843c3f5351580adba2741df347232d328 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 2 Oct 2010 13:56:15 +0100 Subject: fix typo spotted by lintian --- doc/usage.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 840d105d2..2325b6502 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -350,7 +350,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup - Completly (re)build the wiki using the specified setup file. + Completely (re)build the wiki using the specified setup file. * ikiwiki --setup my.setup --refresh -- cgit v1.2.3 From a7d12113ea97735e66811bb1fb498d87a9c3bbe6 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 2 Oct 2010 13:52:45 +0000 Subject: tested and seems to work --- ...kiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 262d5c22d..39dd42b87 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -150,7 +150,8 @@ you don't like my approach: [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] OK, here's an alternative approach, closer in spirit to what was initially -requested. I haven't tested this on a full website with the CGI yet. +requested. I included a regression test for `urlto`, `baseurl` and `cgiurl`, +now that they have slightly more complex behaviour. The idea is that in the common case, the CGI and the pages will reside on the same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, @@ -169,6 +170,12 @@ suppot that. fully relative nor fully absolute, and there doesn't seem to be a good name for them... +I've tested this on a demo website with the CGI enabled, and it seems to +work nicely (there might be bugs in some plugins, I didn't try all of them). +The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable +`httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log +in via that, links all end up in the HTTPS version. + New API added by this branch: * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` -- cgit v1.2.3 From 43cdf3f22fdc22e0b93e245f68b330b50d4fb292 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 2 Oct 2010 13:57:03 +0000 Subject: tag as patch, I think this version is ready for review --- ...void_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 39dd42b87..20d22b9ab 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -147,7 +147,8 @@ you don't like my approach: ---- -[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] +[[!tag patch]] OK, here's an alternative approach, closer in spirit to what was initially requested. I included a regression test for `urlto`, `baseurl` and `cgiurl`, -- cgit v1.2.3 From bd48ff734a0e01a6f2c097932f728ccb680702a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Oct 2010 12:02:34 -0400 Subject: fixups tidy change Need checkconfig hook; examples don't become default values. --- IkiWiki/Plugin/htmltidy.pm | 9 +++++++-- debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 8a0e8f428..185d01dd6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -25,13 +25,18 @@ sub getsetup () { }, htmltidy => { type => "string", - example => "tidy --show-body-only yes --show-warnings no --tidy-mark no --markup yes -quiet -asxhtml -utf8", description => "tidy command line", safe => 0, # path - rebuild => 0, + rebuild => undef, }, } +sub checkconfig () { + if (! defined $config{htmltidy}) { + $config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes"; + } +} + sub sanitize (@) { my %params=@_; diff --git a/debian/changelog b/debian/changelog index 527dd7884..c59c19af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From d21087205caa025a23bd424618bc78ecc5533902 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Oct 2010 12:03:33 -0400 Subject: close --- doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn index 51991393e..e317184b5 100644 --- a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -4,3 +4,5 @@ I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, [play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html [patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 + +> Thanks, [[done]] --[[Joey]] -- cgit v1.2.3 From 01fd6aa3b74ae77c7252e6944774076e6fe40690 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 3 Oct 2010 00:45:47 +0000 Subject: Added a comment: New dump plugin --- .../comment_1_bfce80b3f5be78ec28692330843d4ae1._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment diff --git a/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment new file mode 100644 index 000000000..855b72bbb --- /dev/null +++ b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" + nickname="Glenn" + subject="New dump plugin" + date="2010-10-03T00:45:47Z" + content=""" +I took my own advice and rewrote the dump plugin so that it uses a template. A sample template has been added to my [[Dropbox|http://dl.dropbox.com/u/11256359/dump.tmpl]]. + +### Issues: + +* Dumps appear at the end of the page rather than where the directive occurs. +* For some reason I haven't yet figured out, dumps don't appear in page previews. +* I haven't tested inlined content and the dump plugin. +"""]] -- cgit v1.2.3 From 5c514706e43e8e4bff7b4620db4add6eed9a5bca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Oct 2010 12:34:58 -0400 Subject: Updated French program translation. Closes: #598918 --- debian/changelog | 1 + po/fr.po | 61 ++++++++++++++++++++++++++------------------------------ 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index c59c19af7..1d12d0558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) + * Updated French program translation. Closes: #598918 -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/po/fr.po b/po/fr.po index 05ad086af..ae2b9f411 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-15 16:30-0400\n" -"PO-Revision-Date: 2010-07-17 18:13+0200\n" +"PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "Language: fr\n" @@ -146,15 +146,15 @@ msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " -msgstr "Impossible de créer un compartiment S3 :" +msgstr "Impossible de créer un compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " -msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" +msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " -msgstr "Échec lors de la suppression du fichier sur S3 :" +msgstr "Échec lors de la suppression du fichier sur S3 : " #: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format @@ -195,14 +195,13 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" #: ../IkiWiki/Plugin/comments.pm:113 -#, fuzzy, perl-format +#, perl-format msgid "this comment needs %s" -msgstr "Faire un commentaire sur %s" +msgstr "Ce commentaire demande %s" #: ../IkiWiki/Plugin/comments.pm:116 -#, fuzzy msgid "moderation" -msgstr "Modération du commentaire" +msgstr "Modération" #: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format @@ -218,7 +217,6 @@ msgid "Anonymous" msgstr "Anonyme" #: ../IkiWiki/Plugin/comments.pm:256 -#, fuzzy msgid "Comment Moderation" msgstr "Modération du commentaire" @@ -337,9 +335,8 @@ msgstr "edittemplate %s enregistré pour %s" #: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy msgid "failed to process template:" -msgstr "Échec du traitement :" +msgstr "Échec du traitementdu modèle :" #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" @@ -510,9 +507,8 @@ msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" #: ../IkiWiki/Plugin/meta.pm:396 -#, fuzzy msgid "sort=meta requires a parameter" -msgstr "les paramètres « from » et « to » sont nécessaires." +msgstr "sort=meta demande un paramètre." #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" @@ -531,9 +527,9 @@ msgid "more" msgstr "lire la suite" #: ../IkiWiki/Plugin/openid.pm:70 -#, fuzzy, perl-format +#, perl-format msgid "failed to load openid module: " -msgstr "Échec de la compilation de %s" +msgstr "Impossible de charger le module openid" #: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." @@ -704,7 +700,7 @@ msgstr "" #: ../IkiWiki/Plugin/po.pm:1252 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" +msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM" #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" @@ -899,7 +895,7 @@ msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" #: ../IkiWiki/Plugin/search.pm:195 -#, fuzzy, perl-format +#, perl-format msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" @@ -925,9 +921,9 @@ msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" #: ../IkiWiki/Plugin/smiley.pm:30 -#, fuzzy, perl-format +#, perl-format msgid "smiley plugin will not work without %s" -msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" +msgstr "Le module smiley ne fonctionne pas sans %s" #: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" @@ -987,7 +983,7 @@ msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" #: ../IkiWiki/Plugin/tag.pm:83 -#, fuzzy, perl-format +#, perl-format msgid "creating tag page %s" msgstr "Création de la nouvelle page %s" @@ -996,9 +992,9 @@ msgid "missing id parameter" msgstr "Paramètre d'identification manquant" #: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "%s not found" -msgstr "Flux introuvable " +msgstr "%s introuvable" #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" @@ -1089,12 +1085,12 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "" +msgstr "recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 -#, fuzzy, perl-format +#, perl-format msgid "removing obsolete %s" -msgstr "Suppression de l'ancienne page %s" +msgstr "Suppression de %s obsolète" #: ../IkiWiki/Render.pm:520 #, perl-format @@ -1134,14 +1130,14 @@ msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" #: ../IkiWiki/Setup.pm:34 -#, fuzzy, perl-format +#, perl-format msgid "cannot load %s in safe mode" -msgstr "Lecture impossible de %s : %s" +msgstr "Impossible de charger %s de façon sécurisée" #: ../IkiWiki/Setup.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "failed to parse %s" -msgstr "Impossible de mettre à jour %s" +msgstr "Impossible d'analyser %s" #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" @@ -1208,9 +1204,8 @@ msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" #: ../ikiwiki.in:109 -#, fuzzy msgid "usage: --set-yaml var=value" -msgstr "Syntaxe : -- set var=valeur" +msgstr "Syntaxe : --set-yaml var=valeur" #: ../ikiwiki.in:215 msgid "rebuilding wiki.." @@ -1248,7 +1243,7 @@ msgid "yes" msgstr "oui" #: ../IkiWiki.pm:2130 -#, fuzzy, perl-format +#, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" @@ -1260,7 +1255,7 @@ msgstr "Type de tri %s inconnu" #: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" -msgstr "Impossible de trouver les pages %s" +msgstr "Impossible de trouver les pages : %s" #: ../auto.setup:16 msgid "What will the wiki be named?" -- cgit v1.2.3 From ed2071802f3f637e191eaefbf264f4439b2b3e2d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 14:34:35 +0000 Subject: Adding apache2 dependencies to enable CGI --- doc/tips/dot_cgi.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index da55c1f1c..42a0aa7bf 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -26,6 +26,8 @@ configuration changes should work anywhere. Or, if you've put it in a `~/public_html`, edit `/etc/apache2/mods-available/userdir.conf`. + You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. + * You may also want to enable the [[plugins/404]] plugin. To make apache use it, the apache config file will need a further modification to make it use ikiwiki's CGI as the apache 404 handler. -- cgit v1.2.3 From d441c6b76df4f840b37292d869146e9e53f92315 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 16:20:13 +0000 Subject: Adding blog dependencies --- doc/setup.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ac491baae..206f4b664 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -22,6 +22,8 @@ Or, set up a blog with ikiwiki, run this command instead. % ikiwiki -setup /etc/ikiwiki/auto-blog.setup +`librpc-xml-perl` and `python-docutils` dependencies are needed. + Either way, it will ask you a couple of questions. What will the wiki be named? foo -- cgit v1.2.3 From 1e294917fd7d50b32c5e91430619e5c5e52c3ddf Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 17:13:25 +0000 Subject: fix a little typo --- doc/setup.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 206f4b664..40581eb72 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -132,7 +132,7 @@ old location won't work, and the easiest way to deal with this is to delete them and re-checkout from the new repository location. % rm -rf foo - % git clone /src/git/foo.git + % git clone /srv/git/foo.git Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`, `url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where -- cgit v1.2.3 From 49ef98505aa7ada6b1de81860c7e69b600b6c953 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:01:21 -0400 Subject: fix bug if git_root is "0" --- IkiWiki/Plugin/git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 457975d95..b6ed61428 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -729,7 +729,7 @@ sub git_find_root { # Determine if it is in a subdirectory by examining the srcdir, # and its parents, looking for the .git directory. - return $git_root if $git_root; + return $git_root if defined $git_root; my $subdir=""; my $dir=$config{srcdir}; -- cgit v1.2.3 From 68670cad823def2bbd4f8ed294a5e2ba21bac41c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:03:00 -0400 Subject: indentation --- IkiWiki/Plugin/git.pm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index b6ed61428..a0f9b15a7 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -724,25 +724,27 @@ sub rcs_getmtime ($) { { my $git_root; + sub git_find_root { - # The wiki may not be the only thing in the git repo. - # Determine if it is in a subdirectory by examining the srcdir, - # and its parents, looking for the .git directory. - - return $git_root if defined $git_root; - - my $subdir=""; - my $dir=$config{srcdir}; - while (! -d "$dir/.git") { - $subdir=IkiWiki::basename($dir)."/".$subdir; - $dir=IkiWiki::dirname($dir); - if (! length $dir) { - error("cannot determine root of git repo"); - } - } + # The wiki may not be the only thing in the git repo. + # Determine if it is in a subdirectory by examining the srcdir, + # and its parents, looking for the .git directory. + + return $git_root if defined $git_root; + + my $subdir=""; + my $dir=$config{srcdir}; + while (! -d "$dir/.git") { + $subdir=IkiWiki::basename($dir)."/".$subdir; + $dir=IkiWiki::dirname($dir); + if (! length $dir) { + error("cannot determine root of git repo"); + } + } - return $subdir; + return $subdir; } + } sub git_parse_changes { -- cgit v1.2.3 From 3f3aab3793fb471f8a99ed12df1bbad7abdc3455 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:22:50 -0400 Subject: document new rcs reversion support functions --- IkiWiki/Plugin/git.pm | 175 ++++++++++++++++++++++---------------------- doc/plugins/write.mdwn | 33 ++++++++- doc/todo/web_reversion.mdwn | 6 ++ 3 files changed, 123 insertions(+), 91 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index a0f9b15a7..33ec00d8a 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -748,73 +748,72 @@ sub git_find_root { } sub git_parse_changes { - my @changes = @_; - - my $subdir = git_find_root(); - my @rets; - foreach my $ci (@changes) { - foreach my $detail (@{ $ci->{'details'} }) { - my $file = $detail->{'file'}; - - # check that all changed files are in the - # subdir - if (length $subdir && - ! ($file =~ s/^\Q$subdir\E//)) { - error sprintf(gettext("you are not allowed to change %s"), $file); - } - - my ($action, $mode, $path); - if ($detail->{'status'} =~ /^[M]+\d*$/) { - $action="change"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { - $action="add"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { - $action="remove"; - $mode=$detail->{'mode_from'}; - } - else { - error "unknown status ".$detail->{'status'}; - } - - # test that the file mode is ok - if ($mode !~ /^100[64][64][64]$/) { - error sprintf(gettext("you cannot act on a file with mode %s"), $mode); - } - if ($action eq "change") { - if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { - error gettext("you are not allowed to change file modes"); - } - } - - # extract attachment to temp file - if (($action eq 'add' || $action eq 'change') && - ! pagetype($file)) { - - eval q{use File::Temp}; - die $@ if $@; - my $fh; - ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - # Ensure we run this in the right place, see comments in rcs_receive. - my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") - . "git show $detail->{sha1_to} > '$path'"; - if (system($cmd) != 0) { - error("failed writing temp file '$path'."); - } - } - - push @rets, { - file => $file, - action => $action, - path => $path, - }; - } - } - - return @rets; + my @changes = @_; + + my $subdir = git_find_root(); + my @rets; + foreach my $ci (@changes) { + foreach my $detail (@{ $ci->{'details'} }) { + my $file = $detail->{'file'}; + + # check that all changed files are in the subdir + if (length $subdir && + ! ($file =~ s/^\Q$subdir\E//)) { + error sprintf(gettext("you are not allowed to change %s"), $file); + } + + my ($action, $mode, $path); + if ($detail->{'status'} =~ /^[M]+\d*$/) { + $action="change"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { + $action="add"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { + $action="remove"; + $mode=$detail->{'mode_from'}; + } + else { + error "unknown status ".$detail->{'status'}; + } + + # test that the file mode is ok + if ($mode !~ /^100[64][64][64]$/) { + error sprintf(gettext("you cannot act on a file with mode %s"), $mode); + } + if ($action eq "change") { + if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { + error gettext("you are not allowed to change file modes"); + } + } + + # extract attachment to temp file + if (($action eq 'add' || $action eq 'change') && + ! pagetype($file)) { + eval q{use File::Temp}; + die $@ if $@; + my $fh; + ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); + # Ensure we run this in the right place, + # see comments in rcs_receive. + my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") + . "git show $detail->{sha1_to} > '$path'"; + if (system($cmd) != 0) { + error("failed writing temp file '$path'."); + } + } + + push @rets, { + file => $file, + action => $action, + path => $path, + }; + } + } + + return @rets; } sub rcs_receive () { @@ -832,7 +831,7 @@ sub rcs_receive () { # are in the master git repo, not the srcdir repo. # The pre-receive hook already puts us in the right place. $no_chdir=1; - push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); + push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); $no_chdir=0; } @@ -840,31 +839,31 @@ sub rcs_receive () { } sub rcs_preprevert (@) { - # Determine what the effects are of reverting the patch with the - # ID given by 'rev'. Returns the same structure as rcs_receive. - # Note test_changes expects 'cgi' and 'session' parameters. - my %params = @_; - my $rev = $params{rev}; + my %params = @_; + my $rev = $params{rev}; - require IkiWiki::Receive; - IkiWiki::Receive::test_changes(%params, changes => [git_parse_changes(git_commit_info($rev, 1))]); + # Note test_changes expects 'cgi' and 'session' parameters. + require IkiWiki::Receive; + IkiWiki::Receive::test_changes(%params, changes => + [git_parse_changes(git_commit_info($rev, 1))]); } sub rcs_revert (@) { - # Try to revert the given patch; returns undef on _success_. - # Same parameters as rcs_commit_staged + 'rev', the patch ID to be - # reverted. - my %params = @_; - my $rev = $params{rev}; + # Try to revert the given patch; returns undef on _success_. + my %params = @_; + my $rev = $params{rev}; - if(run_or_non('git', 'revert', '--no-commit', $rev)) { - debug "Committing revert for patch '$rev'."; - rcs_commit_staged(message => "This reverts commit $rev", @_); - } else { - # No idea what is actually getting reverted, so all we can do is say we failed. - run_or_die('git', 'reset', '--hard'); - return "Failed to revert patch $rev."; - } + if (run_or_non('git', 'revert', '--no-commit', $rev)) { + debug "Committing revert for patch '$rev'."; + rcs_commit_staged(message => + sprintf(gettext("This reverts commit %s"), $rev), @_); + } + else { + # No idea what is actually getting reverted, so all we can + # do is say we failed. + run_or_die('git', 'reset', '--hard'); + return sprintf(gettext("Failed to revert commit %s"), $rev); + } } sub rcs_showpatch (@) { diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index d5bd1dd76..1bd3b0f87 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1176,9 +1176,9 @@ sense to implement for all RCSs. It should examine the incoming changes, and do any sanity checks that are appropriate for the RCS to limit changes to safe file adds, -removes, and changes. If something bad is found, it should exit -nonzero, to abort the push. Otherwise, it should return a list of -files that were changed, in the form: +removes, and changes. If something bad is found, it should die, to abort +the push. Otherwise, it should return a list of files that were changed, +in the form: { file => # name of file that was changed @@ -1191,6 +1191,33 @@ files that were changed, in the form: The list will then be checked to make sure that each change is one that is allowed to be made via the web interface. +#### `rcs_preprevert($)` + +This is called by the revert web interface. It is passed a RCS-specific +change ID, and should determine what the effects would be of reverting +that change, and return the same data structure as `rcs_receive`. + +Like `rcs_receive`, it should do whatever sanity checks are appropriate +for the RCS to limit changes to safe changes, and die if a change would +be unsafe to revert. + +#### `rcs_revert(@)` + +This is called by the revert web interface. It is passed a named +parameter rev that is the RCS-specific change ID to revert. + +Addition named parameters: `message`, and `session` (optional). + +It should try to revert the specified rev, which includes committing +the reversion, and returns undef on _success_ and an error message +on failure. + +#### `rcs_showpatch(@)` + +This is passed a named parameter rev that is a RCS-specific +change ID. It should generate a diff-style patch showing the changes +made and return it. + ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 34947b710..9e5880558 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -65,3 +65,9 @@ Peter Gammie has done an initial implementation of the above. >> gets used to check whether attachments are allowed -- there really should be a hook for that. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] + +>>> I have made my own revert branch and put a few fixes in there. Issues +>>> I noticed but have not gotten to: +>>> +>>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>> * -- cgit v1.2.3 From f025923d146adc83dd67265b4ae58a7f3e5cb8ab Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:33:36 -0400 Subject: fix indentation --- IkiWiki/Plugin/git.pm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 33ec00d8a..794afb740 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -27,10 +27,9 @@ sub import { hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); - hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); - hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); - hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); + hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); + hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); } sub checkconfig () { @@ -867,11 +866,11 @@ sub rcs_revert (@) { } sub rcs_showpatch (@) { - # Show the patch with the given revision id. - my %params = @_; - my $rev = $params{rev}; + # Show the patch with the given revision id. + my %params = @_; + my $rev = $params{rev}; - return join "\n", run_or_die('git', 'show', $rev); + return join "\n", run_or_die('git', 'show', $rev); } 1 -- cgit v1.2.3 From a29f169b1e51feeee83d93fa5713c71e61f2b85c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:34:33 -0400 Subject: indentation --- IkiWiki.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index aa4dccac3..466907c9d 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -717,7 +717,7 @@ sub pagename ($) { my $type=pagetype($file); my $page=$file; - $page=~s/\Q.$type\E*$// + $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension} && !$hooks{htmlize}{$type}{noextension}; if ($config{indexpages} && $page=~/(.*)\/index$/) { @@ -1124,7 +1124,7 @@ sub isselflink ($$) { my $page=shift; my $link=shift; - return $page eq $link; + return $page eq $link; } sub htmllink ($$$;@) { -- cgit v1.2.3 From 80da2b28403a7b2c9dd797e8acecdbe8088ec279 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:35:17 -0400 Subject: fix $git_root caching --- IkiWiki/Plugin/git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 794afb740..5922494bc 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -741,7 +741,7 @@ sub git_find_root { } } - return $subdir; + return $git_root=$subdir; } } -- cgit v1.2.3 From 3dce3cc1be0141bd0d9df65a7049df454fee5137 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:52:52 -0400 Subject: indentation and layout --- IkiWiki/Plugin/recentchanges.pm | 110 ++++++++++++++++++++-------------------- IkiWiki/Receive.pm | 24 ++++----- 2 files changed, 68 insertions(+), 66 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 9a62cb243..7e71d4fc3 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -62,11 +62,11 @@ sub refresh ($) { } sub confirmation_form { - my ($q, $session, $rev) = @_; + my ($q, $session, $rev) = @_; - eval q{use CGI::FormBuilder}; - error($@) if $@; - my $f = CGI::FormBuilder->new( + eval q{use CGI::FormBuilder}; + error($@) if $@; + my $f = CGI::FormBuilder->new( name => "revert", header => 0, charset => "utf-8", @@ -75,55 +75,57 @@ sub confirmation_form { params => $q, action => $config{cgiurl}, stylesheet => 1, - template => { template('revert.tmpl') }, + template => { template('revert.tmpl') }, ); - $f->field(name => "sid", type => "hidden", value => $session->id, - force => 1); - $f->field(name => "do", type => "hidden", value => "revert", force => 1); + $f->field(name => "sid", type => "hidden", value => $session->id, + force => 1); + $f->field(name => "do", type => "hidden", value => "revert", + force => 1); - return $f, ["Revert", "Cancel"]; + return $f, ["Revert", "Cancel"]; } sub sessioncgi ($$) { - my ($q, $session) = @_; - my $do = $q->param('do'); - my $rev = $q->param('rev'); - - return unless $do eq 'revert' && $rev; - - IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev); - - my ($form, $buttons) = confirmation_form($q, $session); - IkiWiki::decode_form_utf8($form); - - if($form->submitted eq 'Revert' && $form->validate) { - IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); - - IkiWiki::disable_commit_hook(); - my $r = IkiWiki::rcs_revert( - session => $session, - rev => $rev); - IkiWiki::enable_commit_hook(); - - if($r) { - die "Revert '$rev' failed."; - } else { - require IkiWiki::Render; - IkiWiki::refresh(); - IkiWiki::saveindex(); - } - } else { - $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); - my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev); - $form->tmpl_param(patch_contents => encode_entities($patch_contents)); - $form->field(name => "rev", type => "hidden", value => $rev, force => 1); - IkiWiki::showform($form, $buttons, $session, $q); - exit 0; - } - - IkiWiki::redirect($q, urlto($config{recentchangespage}, '')); - exit 0; + my ($q, $session) = @_; + my $do = $q->param('do'); + my $rev = $q->param('rev'); + + return unless $do eq 'revert' && $rev; + + IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev); + + my ($form, $buttons) = confirmation_form($q, $session); + IkiWiki::decode_form_utf8($form); + + if ($form->submitted eq 'Revert' && $form->validate) { + IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + IkiWiki::disable_commit_hook(); + my $r = IkiWiki::rcs_revert( + session => $session, + rev => $rev); + IkiWiki::enable_commit_hook(); + + if ($r) { + die "Revert '$rev' failed."; + } + else { + require IkiWiki::Render; + IkiWiki::refresh(); + IkiWiki::saveindex(); + } + } + else { + $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); + my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev); + $form->tmpl_param(patch_contents => encode_entities($patch_contents)); + $form->field(name => "rev", type => "hidden", value => $rev, force => 1); + IkiWiki::showform($form, $buttons, $session, $q); + exit 0; + } + + IkiWiki::redirect($q, urlto($config{recentchangespage}, '')); + exit 0; } # Enable the recentchanges link. @@ -179,13 +181,13 @@ sub store ($$$) { } @{$change->{pages}} ]; push @{$change->{pages}}, { link => '...' } if $is_excess; - - if (length $config{cgiurl}) { - $change->{reverturl} = IkiWiki::cgiurl( - do => "revert", - rev => $change->{rev} - ); - } + + if (length $config{cgiurl}) { + $change->{reverturl} = IkiWiki::cgiurl( + do => "revert", + rev => $change->{rev} + ); + } $change->{author}=$change->{user}; my $oiduser=eval { IkiWiki::openiduser($change->{user}) }; diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 48228e5f0..2b02da8a3 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -73,18 +73,18 @@ sub test () { }) || error("failed adding user"); } - test_changes(cgi => $cgi, - session => $session, - changes => [IkiWiki::rcs_receive()] - ); + test_changes(cgi => $cgi, + session => $session, + changes => [IkiWiki::rcs_receive()] + ); exit 0; } sub test_changes { - my %params = @_; - my $cgi = $params{cgi}; - my $session = $params{session}; - my @changes = @{$params{changes}}; + my %params = @_; + my $cgi = $params{cgi}; + my $session = $params{session}; + my @changes = @{$params{changes}}; my %newfiles; foreach my $change (@changes) { @@ -116,10 +116,10 @@ sub test_changes { IkiWiki::check_canedit($file, $cgi, $session); next; } - else { - use Data::Dumper; - die "fall through test_changes add: " . Data::Dumper::Dumper($change); - } + else { + use Data::Dumper; + die "fall through test_changes add: " . Data::Dumper::Dumper($change); + } } } elsif ($change->{action} eq 'remove') { -- cgit v1.2.3 From fe582418d21f8b619db872b84bc718459325bd15 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:56:21 -0400 Subject: remove debugging dumper code --- IkiWiki/Receive.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 2b02da8a3..88fb49725 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -116,10 +116,6 @@ sub test_changes { IkiWiki::check_canedit($file, $cgi, $session); next; } - else { - use Data::Dumper; - die "fall through test_changes add: " . Data::Dumper::Dumper($change); - } } } elsif ($change->{action} eq 'remove') { -- cgit v1.2.3 From a99790e5ec38afe4d591ba27d984b367c098d5d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:58:55 -0400 Subject: second review pass and I have a revert branch now --- doc/todo/web_reversion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 34947b710..e0c6ebdf1 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -65,3 +65,20 @@ Peter Gammie has done an initial implementation of the above. >> gets used to check whether attachments are allowed -- there really should be a hook for that. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] + +>>> I have made my own revert branch and put a few fixes in there +>>> (and fixed all the indention..). Issues I noticed but have not gotten +>>> to: --[[Joey]] +>>> +>>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>> * Would it be better for `rcs_revert` to not commit, and +>>> `rcs_commit_staged` to then be used? This would work for git, but +>>> maybe other RCSs would be problimatic. It would simplifiy the +>>> interface and allow for future mulitple-revert interfaces. +>>> * I quite don't understand why one caller of `git_parse_changes` +>>> needs it to chdir, and not the other one. It's running +>>> in the same git repo either way, and git doesn't need +>>> `git show` to run in a subdir at all.. +>>> * Probably needs to untaint the revs passed in. +>>> * Seems backwards for `rcs_preprevert` to import and +>>> use `IkiWiki::Receive`. -- cgit v1.2.3 From 380a80adfa8df712876095d684e8a564b8a86aea Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Tue, 5 Oct 2010 01:09:42 +0000 Subject: Bug: UTF-16 and UTF-32 are unhandled: New --- doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn diff --git a/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn b/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn new file mode 100644 index 000000000..21df334a8 --- /dev/null +++ b/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn @@ -0,0 +1,20 @@ +Wide characters should probably be supported, or, at the very least, warned about. + +Test case: + + mkdir -p ikiwiki-utf-test/raw ikiwiki-utf-test/rendered + for page in txt mdwn; do + echo hello > ikiwiki-utf-test/raw/$page.$page + for text in 8 16 16BE 16LE 32 32BE 32LE; do + iconv -t UTF$text ikiwiki-utf-test/raw/$page.$page > ikiwiki-utf-test/raw/$page-utf$text.$page; + done + done + ikiwiki --verbose --plugin txt --plugin mdwn ikiwiki-utf-test/raw/ ikiwiki-utf-test/rendered/ + www-browser ikiwiki-utf-test/rendered/ || x-www-browser ikiwiki-utf-test/rendered/ + # rm -r ikiwiki-utf-test/ # some browsers rather stupidly daemonize themselves, so this operation can't easily be safely automated + +BOMless LE and BE input is probably a lost cause. + +Optimally, UTF-16 (which is ubiquitous in the Windows world) and UTF-32 should be fully supported, probably by converting to mostly-UTF-8 and using `&#xXXXX;` or `&#DDDDD;` XML escapes where necessary. + +Suboptimally, UTF-16 and UTF-32 should be converted to UTF-8 where cleanly possible and a warning printed where impossible. -- cgit v1.2.3 From 3f104d1eb7cc15dec0d3a7a67db85fbe63484281 Mon Sep 17 00:00:00 2001 From: PeteG Date: Tue, 5 Oct 2010 02:30:25 +0000 Subject: --- doc/todo/web_reversion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index e0c6ebdf1..900d98591 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -69,8 +69,11 @@ Peter Gammie has done an initial implementation of the above. >>> I have made my own revert branch and put a few fixes in there >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] +>>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] >>> >>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]] + >>> * Would it be better for `rcs_revert` to not commit, and >>> `rcs_commit_staged` to then be used? This would work for git, but >>> maybe other RCSs would be problimatic. It would simplifiy the @@ -79,6 +82,9 @@ Peter Gammie has done an initial implementation of the above. >>> needs it to chdir, and not the other one. It's running >>> in the same git repo either way, and git doesn't need >>> `git show` to run in a subdir at all.. +>>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] + >>> * Probably needs to untaint the revs passed in. >>> * Seems backwards for `rcs_preprevert` to import and >>> use `IkiWiki::Receive`. +>>>> Indeed. This is saying that the checking code in IkiWiki::Receive is in the wrong place. I think it would be better to set up some general hooks and shuffle it into a plugin, for then other plugins that maintain special files in the repo can have a say about validity. -- [[peteg]] -- cgit v1.2.3 From b02081b6f7de340372100227efc4b97d494b170f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 13:33:36 +0000 Subject: Added link to git repository with support for inlining raw files. --- doc/todo/inline_raw_files.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/inline_raw_files.mdwn diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn new file mode 100644 index 000000000..0e0f0c298 --- /dev/null +++ b/doc/todo/inline_raw_files.mdwn @@ -0,0 +1,16 @@ +summary +======= + +Extend inlining to handle raw files (files with unrecognized extensions). + +Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. + +I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. + +[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ + +usage +===== + + \[[!inline pagenames="somefile.txt" template="raw" feeds="no"]] -- cgit v1.2.3 From 5017568721b598026dcb730157b66614b14a5a01 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 13:59:27 +0000 Subject: Added github git branch for W. Trevor King. --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/git.mdwn b/doc/git.mdwn index 88608d4b5..98f09014e 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -65,6 +65,7 @@ think about merging them. This is recommended. :-) * [[privat]] `git://github.com/privat/ikiwiki.git` * [[blipvert]] `git://github.com/blipvert/ikiwiki.git` * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` +* [[wtk|W. Trevor King]]: `git://github.com/wking/ikiwiki.git` ## branches -- cgit v1.2.3 From 267d2ce476756335142424b34fe4341081a67f36 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:02:03 +0000 Subject: Use wtk's github branch instead of drexel.edu branch. --- doc/todo/inline_raw_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 0e0f0c298..2968bad40 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -7,7 +7,7 @@ Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. -[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From 421de42c2a09d8e933dd25581333afa09c56ff15 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:08:23 +0000 Subject: Add gitbranch template to inline_raw_files.mdwn. --- doc/todo/inline_raw_files.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 2968bad40..b5a525ac0 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -1,13 +1,14 @@ +[[!template id=gitbranch branch=wtk/master author="[[wtk]]"]] + summary ======= Extend inlining to handle raw files (files with unrecognized extensions). -Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. +Also raise an error in `IkiWiki::pagetype($file)` if `$file` is blank, which avoids trying to do much with missing files, etc. -I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. +I'm using the new code in my [blog][]. -[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From a3b58406a1d111c4dbbd8469821771e84885eae9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:10:00 +0000 Subject: Fix wikilink from git to wtk page. --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git.mdwn b/doc/git.mdwn index 98f09014e..5943097e6 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -65,7 +65,7 @@ think about merging them. This is recommended. :-) * [[privat]] `git://github.com/privat/ikiwiki.git` * [[blipvert]] `git://github.com/blipvert/ikiwiki.git` * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` -* [[wtk|W. Trevor King]]: `git://github.com/wking/ikiwiki.git` +* [[wtk]]: `git://github.com/wking/ikiwiki.git` ## branches -- cgit v1.2.3 From 46a98c8a4d72e8be0fd5e683a83745d529b2c3c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Oct 2010 11:22:51 -0400 Subject: add pointer to my branch --- doc/todo/web_reversion.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 900d98591..33fa79aad 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -67,6 +67,7 @@ Peter Gammie has done an initial implementation of the above. >> Please look it over and tell me what else needs fixing... -- [[peteg]] >>> I have made my own revert branch and put a few fixes in there +>>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] -- cgit v1.2.3 From 8728a79226896b2909f60753dc17978c065cfc57 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Oct 2010 12:01:36 -0400 Subject: inline already supports raw files though --- doc/todo/inline_raw_files.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index b5a525ac0..645ab89b7 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -15,3 +15,17 @@ usage ===== \[[!inline pagenames="somefile.txt" template="raw" feeds="no"]] + + +> But inline already supports raw files in two ways: +> +> * setting raw=yes will cause a page to be inlined raw without +> using any template, as if it were part of the page at the location +> of the inline +> * otherwise, the file becomes an enclosure in the rss feed, for use with +> podcasting. +> +> So I don't see the point of your patch. Although since your text +> editor seems to like to make lots of whitespace changes, it's possible +> I missed something in the large quantity of noise introduced by it. +> --[[Joey]] -- cgit v1.2.3 From 4ea3c3c2e5cf17dc734f90bc2c142129e3106f58 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Wed, 6 Oct 2010 11:12:13 +0000 Subject: respond to Joey's raw inline comments. --- doc/todo/inline_raw_files.mdwn | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 645ab89b7..100c07288 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -28,4 +28,34 @@ usage > So I don't see the point of your patch. Although since your text > editor seems to like to make lots of whitespace changes, it's possible > I missed something in the large quantity of noise introduced by it. -> --[[Joey]] +> --[[Joey]] + +>> As I understand it, setting `raw=yes` causes the page to be inlined +>> as if the page contents had appeared in place of the directive. The +>> content is then processed by whatever `htmlize()` applies to the +>> inlining page. I want the inlined page to be unprocessed, and +>> wrapped in `
...
` (as they are on the blog +>> post I link to above). +>> +>> Enclosures do not include the page contents at all, just a link to +>> them. I'm trying to inline the content so I can comment on it from +>> the inlining page. +>> +>> Apologies for my cluttered version history, I should have branched my +>> earlier changes off to make things clearer. I tried to isolate my +>> whitespace changes (fixes?) in c9ae012d245154c3374d155958fcb0b60fda57ce. +>> 157389355d01224b2d3c3f6e4c1eb42a20ec8a90 should hold all the content +>> changes. +>> +>> A list of other things globbed into my master branch that should have +>> been separate branches: +>> +>> * Make it easy to select a Markdown executable for mdwn.pm. +>> * Included an updated form of +>> [[Javier Rojas' linktoimgonly.pm|forum/link_to_an_image_inside_the_wiki_without_inlining_it]]. +>> * Included an updated form of +>> [Jason Blevins' mdwn_itex.pm](http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm). +>> * Assorted minor documentation changes. +>> +>> --[[wtk]] + -- cgit v1.2.3 From 3d0108bf0a6f8b0284399cf3a5b150369308c935 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmVAPKb571nVlx9Em3vWyWOK1k0J6-TUAg" Date: Wed, 6 Oct 2010 12:50:17 +0000 Subject: --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 7a10c8403..a3a20fd78 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -12,7 +12,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki > > Back to the first level. -1. Hot Items +1. Hot Items that are hot 1. Daves Insanity Sauce 2. Marie Sharps 1. Blazing Inferno -- cgit v1.2.3 From 237ea79d715fbba5c1be0b73fbe008b3221975fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 14:39:10 -0400 Subject: remove rcs_showpatch --- IkiWiki.pm | 4 ---- IkiWiki/Plugin/git.pm | 9 --------- IkiWiki/Plugin/recentchanges.pm | 2 +- doc/plugins/write.mdwn | 6 ------ doc/todo/web_reversion.mdwn | 4 ---- 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 466907c9d..269647eb4 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1949,10 +1949,6 @@ sub rcs_revert (@) { $hooks{rcs}{rcs_revert}{call}->(@_); } -sub rcs_showpatch (@) { - $hooks{rcs}{rcs_showpatch}{call}->(@_); -} - sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 5922494bc..3ccaa446a 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -29,7 +29,6 @@ sub import { hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); - hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); } sub checkconfig () { @@ -865,12 +864,4 @@ sub rcs_revert (@) { } } -sub rcs_showpatch (@) { - # Show the patch with the given revision id. - my %params = @_; - my $rev = $params{rev}; - - return join "\n", run_or_die('git', 'show', $rev); -} - 1 diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 7e71d4fc3..948bb1366 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -117,7 +117,7 @@ sub sessioncgi ($$) { } else { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); - my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev); + my $patch_contents = IkiWiki::rcs_diff($rev); $form->tmpl_param(patch_contents => encode_entities($patch_contents)); $form->field(name => "rev", type => "hidden", value => $rev, force => 1); IkiWiki::showform($form, $buttons, $session, $q); diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 1bd3b0f87..3eade34ee 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1212,12 +1212,6 @@ It should try to revert the specified rev, which includes committing the reversion, and returns undef on _success_ and an error message on failure. -#### `rcs_showpatch(@)` - -This is passed a named parameter rev that is a RCS-specific -change ID. It should generate a diff-style patch showing the changes -made and return it. - ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 33fa79aad..7cb412f79 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -55,7 +55,6 @@ Peter Gammie has done an initial implementation of the above. > (The data from `rcs_preprevert` could also be used for a confirmation > prompt -- it doesn't currently include enough info for diffs, but at > least could have a list of changed files.) ->> I added `rcs_showpatch` which simply yields the output of `git show `. -- [[peteg]] > > Note that it's possible for a git repo to have commits that modify wiki > files in a subdir, and code files elsewhere. `rcs_preprevert` should @@ -71,9 +70,6 @@ Peter Gammie has done an initial implementation of the above. >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] ->>> ->>> * `rcs_diff` already exists; why add `rcs_showpatch`? ->>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]] >>> * Would it be better for `rcs_revert` to not commit, and >>> `rcs_commit_staged` to then be used? This would work for git, but -- cgit v1.2.3 From c2694e663deb6f49aa511c1b5310fb4cd4187eb0 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 6 Oct 2010 18:49:02 +0000 Subject: --- doc/todo/countdown_directive.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/countdown_directive.mdwn diff --git a/doc/todo/countdown_directive.mdwn b/doc/todo/countdown_directive.mdwn new file mode 100644 index 000000000..5a540d927 --- /dev/null +++ b/doc/todo/countdown_directive.mdwn @@ -0,0 +1,3 @@ +I'd love to have a countdown directive, which would take a timestamp to count down to and generate a JavaScript timer in the page. + +Ideally I'd also like to either have parameters providing content to show before and after the time passes, or integration with existing conditional directives to do the same thing. -- cgit v1.2.3 From 017f06dd49fc59c1c0b8c13c7d17722297c97200 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 6 Oct 2010 18:49:30 +0000 Subject: wishlist --- doc/todo/countdown_directive.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/countdown_directive.mdwn b/doc/todo/countdown_directive.mdwn index 5a540d927..61c36204c 100644 --- a/doc/todo/countdown_directive.mdwn +++ b/doc/todo/countdown_directive.mdwn @@ -1,3 +1,5 @@ I'd love to have a countdown directive, which would take a timestamp to count down to and generate a JavaScript timer in the page. Ideally I'd also like to either have parameters providing content to show before and after the time passes, or integration with existing conditional directives to do the same thing. + +[[!tag wishlist]] -- cgit v1.2.3 From 7988a5aee3be9fe82da1d47d2a72c95eabc7bb6e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 14:55:08 -0400 Subject: revert html tweaking --- doc/style.css | 3 ++- templates/change.tmpl | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/style.css b/doc/style.css index fa4b2a38a..aa27d8866 100644 --- a/doc/style.css +++ b/doc/style.css @@ -172,7 +172,8 @@ div.recentchanges { width: 35%; font-size: small; } -.recentchanges .pagelinks { +.recentchanges .pagelinks, +.recentchanges .revert { float: right; margin: 0; width: 60%; diff --git a/templates/change.tmpl b/templates/change.tmpl index 9cf40777b..4525402a7 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -10,10 +10,8 @@
Changed pages: -[[diff|wikiicons/diff.png]] - - - +[[diff|wikiicons/diff.png]] +
Changed by: @@ -29,8 +27,10 @@
Date:
-[[revert|wikiicons/revert.png]]
+ +[[revert|wikiicons/revert.png]] +
-- cgit v1.2.3 From d4fd8cd67dd868ed8b0d51c2d710b834d6a33b05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 14:59:20 -0400 Subject: put diff at end of revert form --- IkiWiki/Plugin/recentchanges.pm | 3 +-- templates/revert.tmpl | 15 ++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 948bb1366..4cd910667 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -117,8 +117,7 @@ sub sessioncgi ($$) { } else { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); - my $patch_contents = IkiWiki::rcs_diff($rev); - $form->tmpl_param(patch_contents => encode_entities($patch_contents)); + $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev))); $form->field(name => "rev", type => "hidden", value => $rev, force => 1); IkiWiki::showform($form, $buttons, $session, $q); exit 0; diff --git a/templates/revert.tmpl b/templates/revert.tmpl index 03cd0838d..6289bea6b 100644 --- a/templates/revert.tmpl +++ b/templates/revert.tmpl @@ -1,6 +1,3 @@ -
-
-
@@ -8,7 +5,15 @@
- - + +
+
+
+Diff being reverted: +
+
+
+
+
-- cgit v1.2.3 From 58a0698d921efe0daa932599515f6b41b2da4044 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 15:02:06 -0400 Subject: return to recentchanges page on form cancel --- IkiWiki/Plugin/recentchanges.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 4cd910667..439241b93 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -115,7 +115,7 @@ sub sessioncgi ($$) { IkiWiki::saveindex(); } } - else { + elsif ($form->submitted ne 'Cancel') { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev))); $form->field(name => "rev", type => "hidden", value => $rev, force => 1); -- cgit v1.2.3 From 238e8b95a5b084e7131d3314b78419b9404cba4c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 15:08:12 -0400 Subject: convert rcs_revert to only stage the reversion --- IkiWiki.pm | 4 ++-- IkiWiki/Plugin/git.pm | 13 ++++--------- IkiWiki/Plugin/recentchanges.pm | 13 +++++++++---- doc/plugins/write.mdwn | 10 ++++------ doc/todo/web_reversion.mdwn | 4 ---- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 269647eb4..faf4af5c7 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,11 +1941,11 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub rcs_preprevert (@) { +sub rcs_preprevert ($) { $hooks{rcs}{rcs_preprevert}{call}->(@_); } -sub rcs_revert (@) { +sub rcs_revert ($) { $hooks{rcs}{rcs_revert}{call}->(@_); } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3ccaa446a..996ab6fba 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -846,19 +846,14 @@ sub rcs_preprevert (@) { [git_parse_changes(git_commit_info($rev, 1))]); } -sub rcs_revert (@) { - # Try to revert the given patch; returns undef on _success_. - my %params = @_; - my $rev = $params{rev}; +sub rcs_revert ($) { + # Try to revert the given rev; returns undef on _success_. + my $rev = $shift; if (run_or_non('git', 'revert', '--no-commit', $rev)) { - debug "Committing revert for patch '$rev'."; - rcs_commit_staged(message => - sprintf(gettext("This reverts commit %s"), $rev), @_); + return undef; } else { - # No idea what is actually getting reverted, so all we can - # do is say we failed. run_or_die('git', 'reset', '--hard'); return sprintf(gettext("Failed to revert commit %s"), $rev); } diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 439241b93..44c981548 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -101,12 +101,17 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); IkiWiki::disable_commit_hook(); - my $r = IkiWiki::rcs_revert( - session => $session, - rev => $rev); + my $r = IkiWiki::rcs_revert($rev); + if (! defined $r) { # success + rcs_commit_staged( + message => sprintf(gettext("This reverts commit %s"), $rev), + session => $session, + rev => $rev, + ); + } IkiWiki::enable_commit_hook(); - if ($r) { + if (defined $r) { die "Revert '$rev' failed."; } else { diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 3eade34ee..dbbe83851 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1201,16 +1201,14 @@ Like `rcs_receive`, it should do whatever sanity checks are appropriate for the RCS to limit changes to safe changes, and die if a change would be unsafe to revert. -#### `rcs_revert(@)` +#### `rcs_revert($)` This is called by the revert web interface. It is passed a named parameter rev that is the RCS-specific change ID to revert. -Addition named parameters: `message`, and `session` (optional). - -It should try to revert the specified rev, which includes committing -the reversion, and returns undef on _success_ and an error message -on failure. +It should try to revert the specified rev, and leave the reversion staged +so `rcs_commit_staged` will complete it. It should return undef on _success_ +and an error message on failure. ### PageSpec plugins diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 7cb412f79..784b72e05 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -71,10 +71,6 @@ Peter Gammie has done an initial implementation of the above. >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] ->>> * Would it be better for `rcs_revert` to not commit, and ->>> `rcs_commit_staged` to then be used? This would work for git, but ->>> maybe other RCSs would be problimatic. It would simplifiy the ->>> interface and allow for future mulitple-revert interfaces. >>> * I quite don't understand why one caller of `git_parse_changes` >>> needs it to chdir, and not the other one. It's running >>> in the same git repo either way, and git doesn't need -- cgit v1.2.3 From 734d352bebc66cf80458277b96ef06467c6f99ed Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Wed, 6 Oct 2010 20:25:05 +0000 Subject: rationale --- doc/todo/use_templates_for_the_img_plugin.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/use_templates_for_the_img_plugin.mdwn diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn new file mode 100644 index 000000000..c5a1028f4 --- /dev/null +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -0,0 +1,5 @@ +The patches in http://github.com/jmtd/ikiwiki/tree/img_use_template convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a`template=` parameter) rather than hard-code the generated HTML. + +I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. + +However, I since thought of another use for this, and so started implementing it. -- cgit v1.2.3 From 78f784c91df385050ef61a0c76c906cacdb2d911 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Wed, 6 Oct 2010 20:27:08 +0000 Subject: gitbranch template --- doc/todo/use_templates_for_the_img_plugin.mdwn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn index c5a1028f4..d6dce8c63 100644 --- a/doc/todo/use_templates_for_the_img_plugin.mdwn +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -1,5 +1,9 @@ -The patches in http://github.com/jmtd/ikiwiki/tree/img_use_template convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a`template=` parameter) rather than hard-code the generated HTML. +[[!template id=gitbranch branch=jmtd/img_use_template author="[[Jon]]"]] + +Not finished! :-) + +The patches in convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a `template=` parameter) rather than hard-code the generated HTML. I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. -However, I since thought of another use for this, and so started implementing it. +However, I since thought of another use for this, and so started implementing it. (note to self: explain this other use) -- cgit v1.2.3 From c8214300ed6198d3a59cc1e3b3d74b0722c26b91 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 7 Oct 2010 12:37:02 +0000 Subject: other purpose --- doc/todo/use_templates_for_the_img_plugin.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn index d6dce8c63..1cee1b535 100644 --- a/doc/todo/use_templates_for_the_img_plugin.mdwn +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -7,3 +7,23 @@ The patches in convert th I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. However, I since thought of another use for this, and so started implementing it. (note to self: explain this other use) + +---- + +Ok, I have managed to achieve what I wanted with stock ikiwiki, this branch might not have any more life left in it (but it has proven an interesting experiment to see how much logic could be moved from `img.pm` into a template relatively easily. Although the template is not terribly legible.) + +My ikiwiki page has a picture on the front page. I've changed that picture just once, but I would like to change it again from time to time. I also want to keep a "gallery", or at least a list, of previous pictures, and perhaps include text alongside each picture, but not on the front page. + +I've achieved this as follows + + * each index picture gets a page under "indexpics". + * the "indexpics" page has a raw inline to include them all[1] + * the front page has more-or-less the same inline, with show=1 + * each index picture page has a [[plugins/conditional]]: + * if you are being included, show the resized picture only, and link the picture to the relevant indexpic page + * else, show the picture with the default link to a full-size image, and include explanatory text. + * most of the boilerplate is hidden inside a template + +It is not quite as I envisaged it: the explanatory text would probably make sense on the indexpics "gallery" page, but since that includes the page, the wrong trouser-leg of the conditional is used. But it works quite well. Introducing a new index picture involves creating an appropriate page under indexpics and the rest happens automatically. + +[1] lie #1: the pagespec is a lot more complex as it has to exclude raw image filetypes -- cgit v1.2.3 From 5448a9324e98a8aff32c68bf00ea8093aeb99167 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Fri, 8 Oct 2010 10:05:07 +0000 Subject: --- doc/ikiwiki/directive/aggregate/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/ikiwiki/directive/aggregate/discussion.mdwn diff --git a/doc/ikiwiki/directive/aggregate/discussion.mdwn b/doc/ikiwiki/directive/aggregate/discussion.mdwn new file mode 100644 index 000000000..cf3d2022f --- /dev/null +++ b/doc/ikiwiki/directive/aggregate/discussion.mdwn @@ -0,0 +1,3 @@ +It would be awesome if table could aggregrate remote CSVs too. I want something like: + + !table file="http://cyclehireapp.com/cyclehirelive/cyclehire.csv" -- cgit v1.2.3 From 62cd39a905cf3699bceb33dc6ea243f8ba030d26 Mon Sep 17 00:00:00 2001 From: z3ttacht Date: Fri, 8 Oct 2010 15:30:50 +0000 Subject: --- doc/templates/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn index 4ddc48ac3..efeedf448 100644 --- a/doc/templates/discussion.mdwn +++ b/doc/templates/discussion.mdwn @@ -7,6 +7,9 @@ note and popups are templates? But they're not in the templates directory, and i > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/` > --[[Joey]] +> > And how am I able to use e.g. links? It's not listed in `/usr/share/ikiwiki/basewiki/templates`. +> > I intend do (mis)use links for a horizontal navigation. Or may I be better off altering page.tmpl? +> > --z3ttacht Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki? -- cgit v1.2.3 From c0a128131fb8a9985a46b1050f3d029c41176ccf Mon Sep 17 00:00:00 2001 From: "83.61.47.122" <83.61.47.122@web> Date: Fri, 8 Oct 2010 19:45:29 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 32325559e..025a07802 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] -- cgit v1.2.3 From 7aba3bd74696dc5c3f51448db29bfba0c58d6529 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 8 Oct 2010 23:28:08 +0200 Subject: ping --- doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index 6ca9962ba..fb33f195c 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -21,4 +21,6 @@ and decided this time it was really needed to implement this feature. --[[intrigeri]] +> Ping. --[[intrigeri]] + [[!tag patch]] -- cgit v1.2.3 From 594eb32780466e89390bacc61f8c28b1d4ca9f0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 17:46:21 -0400 Subject: update for new hooks --- doc/rcs.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 83c6910d0..06af9807c 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -23,6 +23,8 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes `rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow `rcs_getmtime` |fast |slow |slow |no |no |no |no |no +`rcs_preprevert` |yes |no |no |no |no |no |no |no +`rcs_revert` |yes |no |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes openid username |yes |no |no |no |no |no |no |no -- cgit v1.2.3 From 84111d96c461a5d31a615ebf64cae751e6fd9aef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 17:54:12 -0400 Subject: make revert hooks optional I removed the IkiWiki::rcs_ stubs for the revert hooks. Instead recentchanges tests to see if the hooks are available and calls them directly. --- IkiWiki.pm | 8 -------- IkiWiki/Plugin/recentchanges.pm | 9 ++++++--- doc/plugins/write.mdwn | 5 +++-- templates/change.tmpl | 2 ++ 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index faf4af5c7..1f6d70ba3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,14 +1941,6 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub rcs_preprevert ($) { - $hooks{rcs}{rcs_preprevert}{call}->(@_); -} - -sub rcs_revert ($) { - $hooks{rcs}{rcs_revert}{call}->(@_); -} - sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 44c981548..a6d7f9fce 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -93,7 +93,8 @@ sub sessioncgi ($$) { return unless $do eq 'revert' && $rev; - IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev); + $IkiWiki::hooks{rcs}{rcs_preprevert}{call}->( + cgi => $q, session => $session, rev => $rev); my ($form, $buttons) = confirmation_form($q, $session); IkiWiki::decode_form_utf8($form); @@ -101,7 +102,7 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); IkiWiki::disable_commit_hook(); - my $r = IkiWiki::rcs_revert($rev); + my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); if (! defined $r) { # success rcs_commit_staged( message => sprintf(gettext("This reverts commit %s"), $rev), @@ -186,7 +187,9 @@ sub store ($$$) { ]; push @{$change->{pages}}, { link => '...' } if $is_excess; - if (length $config{cgiurl}) { + if (length $config{cgiurl} && + exists $IkiWiki::hooks{rcs}{rcs_preprevert} && + exists $IkiWiki::hooks{rcs}{rcs_revert}) { $change->{reverturl} = IkiWiki::cgiurl( do => "revert", rev => $change->{rev} diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index dbbe83851..6b751f0cd 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1154,8 +1154,6 @@ context, and the whole diff in scalar context. This is used to get the page creation time for a file from the RCS, by looking it up in the history. -It's ok if this is not implemented, and throws an error. - If the RCS cannot determine a ctime for the file, return 0. #### `rcs_getmtime($)` @@ -1210,6 +1208,9 @@ It should try to revert the specified rev, and leave the reversion staged so `rcs_commit_staged` will complete it. It should return undef on _success_ and an error message on failure. +This hook and `rcs_preprevert` are optional, if not implemented, no revert +web interface will be available. + ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/templates/change.tmpl b/templates/change.tmpl index 4525402a7..60a9d94b5 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -28,9 +28,11 @@
+ [[revert|wikiicons/revert.png]] +
-- cgit v1.2.3 From 5c6f7a8d1b805001a3d1ee912683755cec773682 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:02:47 -0400 Subject: fix rcs_prepedit implementation to match spec --- IkiWiki/Plugin/git.pm | 14 +++++--------- IkiWiki/Plugin/recentchanges.pm | 9 +++++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 996ab6fba..48e71aa9a 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -836,19 +836,15 @@ sub rcs_receive () { return reverse @rets; } -sub rcs_preprevert (@) { - my %params = @_; - my $rev = $params{rev}; - - # Note test_changes expects 'cgi' and 'session' parameters. - require IkiWiki::Receive; - IkiWiki::Receive::test_changes(%params, changes => - [git_parse_changes(git_commit_info($rev, 1))]); +sub rcs_preprevert ($) { + my $rev=shift; + + return git_parse_changes(git_commit_info($rev, 1)); } sub rcs_revert ($) { # Try to revert the given rev; returns undef on _success_. - my $rev = $shift; + my $rev = shift; if (run_or_non('git', 'revert', '--no-commit', $rev)) { return undef; diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index a6d7f9fce..56e17dcca 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -93,8 +93,13 @@ sub sessioncgi ($$) { return unless $do eq 'revert' && $rev; - $IkiWiki::hooks{rcs}{rcs_preprevert}{call}->( - cgi => $q, session => $session, rev => $rev); + my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev); + require IkiWiki::Receive; + IkiWiki::Receive::test_changes( + cgi => $q, + session => $session, + changes => \@changes, + ); my ($form, $buttons) = confirmation_form($q, $session); IkiWiki::decode_form_utf8($form); -- cgit v1.2.3 From faf94b578729387f85af2b2b248959debe2fa4b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:06:38 -0400 Subject: refactor check_canchange into IkiWiki library --- IkiWiki.pm | 63 +++++++++++++++++++++++++++++++++++++++ IkiWiki/Plugin/recentchanges.pm | 3 +- IkiWiki/Receive.pm | 65 ++--------------------------------------- 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 1f6d70ba3..2190f008c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1519,6 +1519,69 @@ sub check_content (@) { return defined $ok ? $ok : 1; } +sub check_canchange (@) { + my %params = @_; + my $cgi = $params{cgi}; + my $session = $params{session}; + my @changes = @{$params{changes}}; + + my %newfiles; + foreach my $change (@changes) { + # This untaint is safe because we check file_pruned and + # wiki_file_regexp. + my ($file)=$change->{file}=~/$config{wiki_file_regexp}/; + $file=possibly_foolish_untaint($file); + if (! defined $file || ! length $file || + file_pruned($file)) { + error(gettext("bad file name %s"), $file); + } + + my $type=pagetype($file); + my $page=pagename($file) if defined $type; + + if ($change->{action} eq 'add') { + $newfiles{$file}=1; + } + + if ($change->{action} eq 'change' || + $change->{action} eq 'add') { + if (defined $page) { + check_canedit($page, $cgi, $session); + next; + } + else { + if (IkiWiki::Plugin::attachment->can("check_canattach")) { + IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); + check_canedit($file, $cgi, $session); + next; + } + } + } + elsif ($change->{action} eq 'remove') { + # check_canremove tests to see if the file is present + # on disk. This will fail when a single commit adds a + # file and then removes it again. Avoid the problem + # by not testing the removal in such pairs of changes. + # (The add is still tested, just to make sure that + # no data is added to the repo that a web edit + # could not add.) + next if $newfiles{$file}; + + if (IkiWiki::Plugin::remove->can("check_canremove")) { + IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); + check_canedit(defined $page ? $page : $file, $cgi, $session); + next; + } + } + else { + error "unknown action ".$change->{action}; + } + + error sprintf(gettext("you are not allowed to change %s"), $file); + } +} + + my $wikilock; sub lockwiki () { diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 56e17dcca..fe414d865 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -94,8 +94,7 @@ sub sessioncgi ($$) { return unless $do eq 'revert' && $rev; my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev); - require IkiWiki::Receive; - IkiWiki::Receive::test_changes( + IkiWiki::check_canchange( cgi => $q, session => $session, changes => \@changes, diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 88fb49725..225f2b9ab 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -73,73 +73,12 @@ sub test () { }) || error("failed adding user"); } - test_changes(cgi => $cgi, + check_canchange( + cgi => $cgi, session => $session, changes => [IkiWiki::rcs_receive()] ); exit 0; } -sub test_changes { - my %params = @_; - my $cgi = $params{cgi}; - my $session = $params{session}; - my @changes = @{$params{changes}}; - - my %newfiles; - foreach my $change (@changes) { - # This untaint is safe because we check file_pruned and - # wiki_file_regexp. - my ($file)=$change->{file}=~/$config{wiki_file_regexp}/; - $file=IkiWiki::possibly_foolish_untaint($file); - if (! defined $file || ! length $file || - IkiWiki::file_pruned($file)) { - error(gettext("bad file name %s"), $file); - } - - my $type=pagetype($file); - my $page=pagename($file) if defined $type; - - if ($change->{action} eq 'add') { - $newfiles{$file}=1; - } - - if ($change->{action} eq 'change' || - $change->{action} eq 'add') { - if (defined $page) { - IkiWiki::check_canedit($page, $cgi, $session); - next; - } - else { - if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); - IkiWiki::check_canedit($file, $cgi, $session); - next; - } - } - } - elsif ($change->{action} eq 'remove') { - # check_canremove tests to see if the file is present - # on disk. This will fail when a single commit adds a - # file and then removes it again. Avoid the problem - # by not testing the removal in such pairs of changes. - # (The add is still tested, just to make sure that - # no data is added to the repo that a web edit - # could not add.) - next if $newfiles{$file}; - - if (IkiWiki::Plugin::remove->can("check_canremove")) { - IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); - IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session); - next; - } - } - else { - error "unknown action ".$change->{action}; - } - - error sprintf(gettext("you are not allowed to change %s"), $file); - } -} - 1 -- cgit v1.2.3 From f5c270b11dbfb2589df21388a07f55002e076d3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:43:15 -0400 Subject: update --- doc/todo/web_reversion.mdwn | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 784b72e05..4335b3fbf 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -62,6 +62,8 @@ Peter Gammie has done an initial implementation of the above. >> Taken care of by refactoring `rcs_receive` in `git.pm` >> I've tested it lightly in my single-user setup. It's a little nasty that the `attachment` plugin >> gets used to check whether attachments are allowed -- there really should be a hook for that. +>>> I agree, but have not figured out a way to make a hook work yet. +>>> --[[Joey]] >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] @@ -76,8 +78,3 @@ Peter Gammie has done an initial implementation of the above. >>> in the same git repo either way, and git doesn't need >>> `git show` to run in a subdir at all.. >>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] - ->>> * Probably needs to untaint the revs passed in. ->>> * Seems backwards for `rcs_preprevert` to import and ->>> use `IkiWiki::Receive`. ->>>> Indeed. This is saying that the checking code in IkiWiki::Receive is in the wrong place. I think it would be better to set up some general hooks and shuffle it into a plugin, for then other plugins that maintain special files in the repo can have a say about validity. -- [[peteg]] -- cgit v1.2.3 From e7d6dcfed618c57c775478c95b77a15097142e6e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:46:30 -0400 Subject: remove todo item I understand the need to avoid chdir when running git_parse_changes for receive now. At that point, the changes have not been pushed to the srcdir's repo yet. When running the same code for preprevert, chdir to the srcdir is ok, and necessary. --- IkiWiki/Plugin/git.pm | 2 -- doc/todo/web_reversion.mdwn | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 48e71aa9a..47e806209 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -794,8 +794,6 @@ sub git_parse_changes { die $@ if $@; my $fh; ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - # Ensure we run this in the right place, - # see comments in rcs_receive. my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") . "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 4335b3fbf..212fd3a53 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -69,12 +69,5 @@ Peter Gammie has done an initial implementation of the above. >>> I have made my own revert branch and put a few fixes in there >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] ->>> (and fixed all the indention..). Issues I noticed but have not gotten ->>> to: --[[Joey]] +>>> (and fixed all the indention..). --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] - ->>> * I quite don't understand why one caller of `git_parse_changes` ->>> needs it to chdir, and not the other one. It's running ->>> in the same git repo either way, and git doesn't need ->>> `git show` to run in a subdir at all.. ->>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] -- cgit v1.2.3 From c430792148b2193585dfed6cc2a5f778f7167de1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:50:24 -0400 Subject: refactor --- IkiWiki/Plugin/recentchanges.pm | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index fe414d865..88100af0f 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -61,12 +61,23 @@ sub refresh ($) { } } -sub confirmation_form { - my ($q, $session, $rev) = @_; +sub sessioncgi ($$) { + my ($q, $session) = @_; + my $do = $q->param('do'); + my $rev = $q->param('rev'); + + return unless $do eq 'revert' && $rev; + + my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev); + IkiWiki::check_canchange( + cgi => $q, + session => $session, + changes => \@changes, + ); eval q{use CGI::FormBuilder}; error($@) if $@; - my $f = CGI::FormBuilder->new( + my $form = CGI::FormBuilder->new( name => "revert", header => 0, charset => "utf-8", @@ -77,30 +88,13 @@ sub confirmation_form { stylesheet => 1, template => { template('revert.tmpl') }, ); + my $buttons=["Revert", "Cancel"]; - $f->field(name => "sid", type => "hidden", value => $session->id, + $form->field(name => "sid", type => "hidden", value => $session->id, force => 1); - $f->field(name => "do", type => "hidden", value => "revert", + $form->field(name => "do", type => "hidden", value => "revert", force => 1); - return $f, ["Revert", "Cancel"]; -} - -sub sessioncgi ($$) { - my ($q, $session) = @_; - my $do = $q->param('do'); - my $rev = $q->param('rev'); - - return unless $do eq 'revert' && $rev; - - my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev); - IkiWiki::check_canchange( - cgi => $q, - session => $session, - changes => \@changes, - ); - - my ($form, $buttons) = confirmation_form($q, $session); IkiWiki::decode_form_utf8($form); if ($form->submitted eq 'Revert' && $form->validate) { -- cgit v1.2.3 From 4efc1f22d428ebfdc1c0ef5b4c6375cf3287526b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:58:47 -0400 Subject: taint handling for rev --- IkiWiki/Plugin/git.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 47e806209..e89813253 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -836,20 +836,22 @@ sub rcs_receive () { sub rcs_preprevert ($) { my $rev=shift; + my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint - return git_parse_changes(git_commit_info($rev, 1)); + return git_parse_changes(git_commit_info($sha1, 1)); } sub rcs_revert ($) { # Try to revert the given rev; returns undef on _success_. my $rev = shift; + my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint - if (run_or_non('git', 'revert', '--no-commit', $rev)) { + if (run_or_non('git', 'revert', '--no-commit', $sha1)) { return undef; } else { run_or_die('git', 'reset', '--hard'); - return sprintf(gettext("Failed to revert commit %s"), $rev); + return sprintf(gettext("Failed to revert commit %s"), $sha1); } } -- cgit v1.2.3 From fb4ee927a0ee3d959b2e910928d24facb1fd8068 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:59:04 -0400 Subject: propigate rcs_revert error message and misc reorg --- IkiWiki/Plugin/recentchanges.pm | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 88100af0f..b7c014e90 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -99,25 +99,18 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); - IkiWiki::disable_commit_hook(); my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); - if (! defined $r) { # success - rcs_commit_staged( - message => sprintf(gettext("This reverts commit %s"), $rev), - session => $session, - rev => $rev, - ); - } + error $r if defined $r; + IkiWiki::disable_commit_hook(); + rcs_commit_staged( + message => sprintf(gettext("This reverts commit %s"), $rev), + session => $session, + ); IkiWiki::enable_commit_hook(); - if (defined $r) { - die "Revert '$rev' failed."; - } - else { - require IkiWiki::Render; - IkiWiki::refresh(); - IkiWiki::saveindex(); - } + require IkiWiki::Render; + IkiWiki::refresh(); + IkiWiki::saveindex(); } elsif ($form->submitted ne 'Cancel') { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); -- cgit v1.2.3 From 481d8e69dece3f256015af4a5c1da33bf06c7b99 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:12:46 -0400 Subject: better revert icon based on one of the smileys, fixed to have transparent bg --- doc/wikiicons/revert.png | Bin 840 -> 397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/wikiicons/revert.png b/doc/wikiicons/revert.png index 9036046e9..c39e65c33 100644 Binary files a/doc/wikiicons/revert.png and b/doc/wikiicons/revert.png differ -- cgit v1.2.3 From 108d2ac9ae8597ff7e62edd6274fc21d626cdf69 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:13:35 -0400 Subject: fix to have transparent background --- doc/smileys/icon-error.png | Bin 159 -> 397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/smileys/icon-error.png b/doc/smileys/icon-error.png index 53b1055f6..c39e65c33 100644 Binary files a/doc/smileys/icon-error.png and b/doc/smileys/icon-error.png differ -- cgit v1.2.3 From 7e9ca590c745ad01f7d0beb44bbe24eea35f531d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:19:43 -0400 Subject: add message field to revert form --- IkiWiki/Plugin/recentchanges.pm | 9 ++++++++- templates/revert.tmpl | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index b7c014e90..c57b6749a 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -87,9 +87,11 @@ sub sessioncgi ($$) { action => $config{cgiurl}, stylesheet => 1, template => { template('revert.tmpl') }, + fields => [qw{revertmessage do sid rev}], ); my $buttons=["Revert", "Cancel"]; + $form->field(name => "revertmessage", type => "text", size => 80); $form->field(name => "sid", type => "hidden", value => $session->id, force => 1); $form->field(name => "do", type => "hidden", value => "revert", @@ -99,11 +101,16 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + my $message=sprintf(gettext("This reverts commit %s"), $rev); + if (defined $form->field('revertmessage') && + length $form->field('revertmessage')) { + $message=$form->field('revertmessage')."\n".$message; + } my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); error $r if defined $r; IkiWiki::disable_commit_hook(); rcs_commit_staged( - message => sprintf(gettext("This reverts commit %s"), $rev), + message => $message, session => $session, ); IkiWiki::enable_commit_hook(); diff --git a/templates/revert.tmpl b/templates/revert.tmpl index 6289bea6b..0de32811b 100644 --- a/templates/revert.tmpl +++ b/templates/revert.tmpl @@ -3,6 +3,8 @@ + +
-- cgit v1.2.3 From 1820f07f04476e8be290aadeee140cd0a5a0dfed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:24:06 -0400 Subject: revert interface done --- debian/changelog | 5 +++++ doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 6 ++++++ doc/todo/web_reversion.mdwn | 2 ++ 3 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1d12d0558..d1ee4967d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) * Updated French program translation. Closes: #598918 + * git: Added new rcs_revert and rcs_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 4998c1a75..d69b3801b 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -38,3 +38,9 @@ Puzzled a bit :-/ Perer Gammie and I are working on reversion over at [[todo/web_reversion]]. --[[Joey]] + +Update: Web reversion is now supported by ikiwiki. Only changes committed +to your wiki after you upgrade to the version of ikiwiki that supports it +will get revert buttons on the RecentChanges page. If you want to force +adding buttons for older changes, you can delete `recentchanges/*._change` +from your srcdir, and rebuild the wiki. --[[Joey]] diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 212fd3a53..9550fa58b 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -71,3 +71,5 @@ Peter Gammie has done an initial implementation of the above. >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] + +[[done]] -- cgit v1.2.3 From 7d5ac1cdd9357bab089cfd03189f2c2351f6dad1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:25:35 -0400 Subject: typo --- IkiWiki/Plugin/recentchanges.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index c57b6749a..a846cc899 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -109,7 +109,7 @@ sub sessioncgi ($$) { my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); error $r if defined $r; IkiWiki::disable_commit_hook(); - rcs_commit_staged( + IkiWiki::rcs_commit_staged( message => $message, session => $session, ); -- cgit v1.2.3 From 9aa9604c36a2111fb778cd74260c8b7591188fc5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:26:31 -0400 Subject: add blank line --- IkiWiki/Plugin/recentchanges.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index a846cc899..562f61d40 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -104,7 +104,7 @@ sub sessioncgi ($$) { my $message=sprintf(gettext("This reverts commit %s"), $rev); if (defined $form->field('revertmessage') && length $form->field('revertmessage')) { - $message=$form->field('revertmessage')."\n".$message; + $message=$form->field('revertmessage')."\n\n".$message; } my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); error $r if defined $r; -- cgit v1.2.3 From 2d99fe0d34be35d9e5d556d530f2d8993007cdf6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:27:28 -0400 Subject: note that recentchanges plugin handles reversions --- doc/plugins/recentchanges.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 823f68502..6fff18e8a 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -6,6 +6,8 @@ generates a page describing each recent change made to the wiki. These pages can be joined together with [[inline]] to generate the [[RecentChanges]] page. +This plugin also currently handles web-based reversion of changes. + Typically only the RecentChanges page will use the pages generated by this plugin, but you can use it elsewhere too if you like. It's used like this: -- cgit v1.2.3 From 59ea972fc91005699b14204c989c2d29997a3009 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:32:09 -0400 Subject: cleanup --- doc/todo/web_reversion.mdwn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 9550fa58b..736d674fe 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -67,9 +67,7 @@ Peter Gammie has done an initial implementation of the above. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] ->>> I have made my own revert branch and put a few fixes in there ->>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] ->>> (and fixed all the indention..). --[[Joey]] ->>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] +>>> I have made my own revert branch and put a few^Wseveral fixes in there. +>>> All merged to master now! --[[Joey]] [[done]] -- cgit v1.2.3 From 2852c6b0d5494b21695ebe39b172fc30d01d2600 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:55:56 -0400 Subject: actiontabs: More consistent styling of Hn tags. In particular the use of italics for h3 was weird. --- debian/changelog | 1 + themes/actiontabs/style.css | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1ee4967d..53bee5df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low implement web-based reversion interface. * Thanks to Peter Gammie for his assistance with the web-based reversion feature. + * actiontabs: More consistent styling of Hn tags. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css index 13e9dc1a4..749d9b21e 100644 --- a/themes/actiontabs/style.css +++ b/themes/actiontabs/style.css @@ -97,8 +97,7 @@ body { h1 { font: 120% sans-serif } h2 { font: bold 100% sans-serif } -h3 { font: italic 100% sans-serif } -h4, h5, h6 { font: small-caps 100% sans-serif } +h3, h4, h5, h6 { font: bold 80% sans-serif } /* Smaller headings for inline pages */ .inlinepage h1 { font-size: 110% } -- cgit v1.2.3 From bc8b61dae8faa0a654f3a5f2278cd1c66a2f44a3 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 9 Oct 2010 12:48:47 +0000 Subject: pseudo-review --- ...irrorlist_with_per-mirror_usedirs_settings.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index fb33f195c..484f85cbb 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -24,3 +24,27 @@ and decided this time it was really needed to implement this feature. > Ping. --[[intrigeri]] [[!tag patch]] + +>> (I'm not an ikiwiki committer, opinions may vary.) +>> +>> This would be easier to review if there weren't a million merges from +>> master; perhaps either leave a branch as-is, or rebase it, or merge +>> only at "significant" times like after a release? +>> +>> I believe Joey's main objection to complex $config entries is that +>> it's not at all clear what [[plugins/websetup]] would do with them. +>> Would something like this make a reasonable alternative? +>> +>> $config{mirrorlist} = ["nousedirs|file:///home/intrigeri/wiki", +>> "usedirs|http://example.com/wiki", "http://example.net"]; +>> +>> From how I understand tainting, this: +>> +>> $untainted{$_} = possibly_foolish_untaint($tainted->{$_}) +>> +>> probably needs to untaint the key too: +>> +>> my $key = possibly_foolish_untaint($_); +>> $untainted{$key} = possibly_foolish_untaint($tainted->{key}); +>> +>> --[[smcv]] -- cgit v1.2.3 From 2c0d2799b752c81c4fe45d569d1931157ef947ec Mon Sep 17 00:00:00 2001 From: justint Date: Sun, 10 Oct 2010 23:01:19 +0000 Subject: perl Makefile.PL LIB=/Library/Perl/5.10.0 #this worked for me(Mac OS X) --- doc/install.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install.mdwn b/doc/install.mdwn index cc3a4c29f..f38ae2aab 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -41,5 +41,6 @@ If you're using a shared hosting provider, of the sort where you don't have root, you can still install ikiwiki. There are tutorials covering this for a few providers: + * [[tips/NearlyFreeSpeech]] * [[tips/DreamHost]] -- cgit v1.2.3 From 2ef899d9f94768d714b81ff5bc157e5f2c521395 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Mon, 11 Oct 2010 11:45:38 +0200 Subject: Bugreport --- ..._of_img_directive_behave_not_as_documented.mdwn | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn new file mode 100644 index 000000000..10ba15066 --- /dev/null +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -0,0 +1,29 @@ +On [[ikiwiki/directive/img/]] I read that + +> You can also pass alt, title, class, align, id, hspace, and vspace +> parameters. These are passed through unchanged to the html img tag. + +but when I pass `class="myclass"` to an img directive, I obtain + + img: Add a margin around images displayed by this directive. +> +> Particularly important for floating images, which could before be placed +> uncomfortably close to text. + +which adds to img.pm: + + if (exists $params{class}) { + $params{class}.=" img"; + } + else { + $params{class}="img"; + } + +I would prefer if the `img` class were only added if no class attribute is +passed. + +If you keep the current behaviour, please document it. -- cgit v1.2.3 From 274219ecc865f9bdcb65ad26e4750fa90dfaa670 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 11:12:41 -0400 Subject: websetup: Fix saving of advanced mode changes. The showadvanced field was not known to formbuilder when hitting the save changes button. --- IkiWiki/Plugin/websetup.pm | 1 + debian/changelog | 1 + 2 files changed, 2 insertions(+) diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 11b4428e3..2674b91e8 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -295,6 +295,7 @@ sub showform ($$) { $form->field(name => "do", type => "hidden", value => "setup", force => 1); $form->field(name => "rebuild_asked", type => "hidden"); + $form->field(name => "showadvanced", type => "hidden"); if ($form->submitted eq 'Basic Mode') { $form->field(name => "showadvanced", type => "hidden", diff --git a/debian/changelog b/debian/changelog index 53bee5df6..fb012abd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Thanks to Peter Gammie for his assistance with the web-based reversion feature. * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From cfbd272c8bdbb96b6e92449f4d940fb2b72aa651 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 11:27:06 -0400 Subject: websetup: Fix defaults of checkboxes in advanced mode. So formbuilder has an annoying glitch, that setting the value of a checkbox, even without force, will override the value currently on the form. Thus the guards against changing checkbox values when a form has been submitted. But those guards also prevented the checkboxes for advanced items getting the right value when going into advanced mode. Note that if the user makes changes to advanced mode stuff and leaves advanced mode, those changes are lost. That seems reasonable so I didn't change it -- and it made this fix simple. --- IkiWiki/Plugin/websetup.pm | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 2674b91e8..0ab18997c 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -219,7 +219,8 @@ sub showfields ($$$@) { options => [ [ 1 => $description ] ], fieldset => $section, ); - if (! $form->submitted) { + if (! $form->submitted || + ($info{advanced} && $form->submitted eq 'Advanced Mode')) { $form->field(name => $name, value => $value); } } diff --git a/debian/changelog b/debian/changelog index fb012abd2..6d333a843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low feature. * actiontabs: More consistent styling of Hn tags. * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From 6dd49d0df7ac97b2a74517f18fcb24881c940cad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 19:23:24 -0400 Subject: bug --- doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn new file mode 100644 index 000000000..9e1924472 --- /dev/null +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -0,0 +1,3 @@ +The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir +in a subdirectory of the repository. It must be at the top. Git has +special code to handle this case. --[[Joey]] -- cgit v1.2.3 From 7ba0f7d297e7d3e833756016b635ffa0cc78200e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 20:30:14 -0400 Subject: monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. --- IkiWiki/Plugin/monotone.pm | 13 ++++++++++++- debian/changelog | 2 ++ .../monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 95fbcee76..75bf2f458 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -252,9 +252,20 @@ sub get_changed_files ($$) { my @ret; my %seen = (); - + + # we need to strip off the relative path to the source dir + # because monotone outputs all file paths absolute according + # to the workspace root + my $rel_src_dir = $config{'srcdir'}; + $rel_src_dir =~ s/^\Q$config{'mtnrootdir'}\E\/?//; + $rel_src_dir .= "/" if length $rel_src_dir; + while ($changes =~ m/\s*(add_file|patch|delete|rename)\s"(.*?)(? Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn index 9e1924472..35f624f78 100644 --- a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -1,3 +1,5 @@ The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir in a subdirectory of the repository. It must be at the top. Git has special code to handle this case. --[[Joey]] + +[[done]] -- cgit v1.2.3 From c752be0acb942036a2dfd69dcfde06c17860db34 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:53:32 +0000 Subject: Mac OS X Snow Leopard Installing IkiWiki Tips --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 81 ++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn new file mode 100644 index 000000000..2c3428b3f --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -0,0 +1,81 @@ +These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. + +The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + +## installing git: + +curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O +tar xzvf git-(latest version).tar.gz +cd git-(latest version) +./configure --prefix=/usr/local +NO_MSGFMT=yes make prefix=/usr/local all +sudo make install + +git config --global user.name "firstname lastname" +git config --global user.email "email here" +git config --global color.ui "auto" + +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ + + +## installing ikiwiki: +I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I like to install test software in /opt. No particular reason. You could install to defaults. + +perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +perl Makefile.PL LIB=/Library/Perl/5.10.0 +make +make install +sudo install -d /opt/ikiwiki +sudo install -m 0644 wikilist /opt/ikiwiki +sudo install -m 0644 auto.setup /opt/ikiwiki +sudo install -m 0644 auto-blog.setup /opt/ikiwiki + +when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + +## using git from inside a git folder: +start with git clone, then learn to do the git dance like this. +git pull +make your changes to your clone +git commit -a -m "message here" +git push + +When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. + +## installing gitweb + +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin + +cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +sudo chmod 2755 gitweb.cgi + +## installing xapian: +download xapian and omega +I needed pcre: sudo ports install pcre + +./configure +make +sudo make install + +## installing omega: +I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. +./configure +make +sudo make install + +## installing Search::Xapian from CPAN +for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. +perl Makefile.PL +make +make test +sudo make install +it installed without issue so I'm baffled why it didn't install from command line. + +## turning on search plugin: +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +find / -name "omega" -print +and found the omega program in +/usr/local/lib/xapian-omega/bin/omega. +Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + +Then I fell asleep. -- cgit v1.2.3 From 20b94ad9e1f5a401798b6991aeba964267ce3087 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:55:32 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 2c3428b3f..4eb084f38 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -2,44 +2,71 @@ These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a th The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + ## installing git: curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O + tar xzvf git-(latest version).tar.gz + cd git-(latest version) + ./configure --prefix=/usr/local + NO_MSGFMT=yes make prefix=/usr/local all + sudo make install + git config --global user.name "firstname lastname" + git config --global user.email "email here" + git config --global color.ui "auto" + curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. + I like to install test software in /opt. No particular reason. You could install to defaults. + perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 + perl Makefile.PL LIB=/Library/Perl/5.10.0 + make + make install + sudo install -d /opt/ikiwiki + sudo install -m 0644 wikilist /opt/ikiwiki + sudo install -m 0644 auto.setup /opt/ikiwiki + sudo install -m 0644 auto-blog.setup /opt/ikiwiki + when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + ## using git from inside a git folder: + start with git clone, then learn to do the git dance like this. + git pull + make your changes to your clone + git commit -a -m "message here" + git push + When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. ## installing gitweb @@ -47,35 +74,61 @@ When you can't get into the setup page or you get strange behavior after a setup make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ + sudo chmod 2755 gitweb.cgi + ## installing xapian: + download xapian and omega + I needed pcre: sudo ports install pcre ./configure + make + sudo make install + ## installing omega: + I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. + ./configure + make + sudo make install + ## installing Search::Xapian from CPAN + for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. + perl Makefile.PL + make + make test + sudo make install + it installed without issue so I'm baffled why it didn't install from command line. + + ## turning on search plugin: + I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a + find / -name "omega" -print + and found the omega program in + /usr/local/lib/xapian-omega/bin/omega. + Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + Then I fell asleep. -- cgit v1.2.3 From b7d4c1e473ccec6d6e21b1ed225f5e4de27a62f5 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 14:46:35 +0000 Subject: setting Discussion PageSpec? --- doc/forum/Discussion_PageSpec__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Discussion_PageSpec__63__.mdwn diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn new file mode 100644 index 000000000..fb592be48 --- /dev/null +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -0,0 +1 @@ +I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? -- cgit v1.2.3 From e6d130877bb374abe9721e497f0d4868b6c952d8 Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 03:03:24 +0000 Subject: --- .../Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn new file mode 100644 index 000000000..fcffe690f --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn @@ -0,0 +1,3 @@ +Map Plugin, would like to add ?updated to all links created. + +When I edit a page and then click that page in a map in a sidebar Safari always shows me a cached page. -- cgit v1.2.3 From 48c53906bc899364c74a2877ea6e5c5189299e0e Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 05:30:50 +0000 Subject: Added a comment: skip it --- .../comment_1_3fe4c5967e704355f9b594aed46baf67._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment new file mode 100644 index 000000000..ce1a78584 --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="justint" + ip="24.182.207.250" + subject="skip it" + date="2010-10-13T05:30:50Z" + content=""" +skip it, I added + + + + +to my page.tmpl and the problem went away. +"""]] -- cgit v1.2.3 From 71fdabcb494d3f6e62bf755246c480ac7fc17156 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE" Date: Wed, 13 Oct 2010 09:10:45 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a3a20fd78..c665e67f0 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) +* Joey's blog ---- -- cgit v1.2.3 From 8555d10f6369d78c44cf4677010b7e1260d9f5c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:57:16 -0400 Subject: img: If a class is specified, don't also put the img in the img class. --- IkiWiki/Plugin/img.pm | 5 +---- debian/changelog | 2 ++ .../class_parameter_of_img_directive_behave_not_as_documented.mdwn | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2375ead89..bd527c8c8 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,10 +156,7 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (exists $params{class}) { - $params{class}.=" img"; - } - else { + if (! exists $params{class}) { $params{class}="img"; } diff --git a/debian/changelog b/debian/changelog index 12cc90b11..5433ba05f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * websetup: Fix defaults of checkboxes in advanced mode. * monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn index 10ba15066..e7797765f 100644 --- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is passed. If you keep the current behaviour, please document it. + +> [[done]] --[[Joey]] -- cgit v1.2.3 From dcd89979379b7cbaab7ec4af0411796bdcf16f44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:59:59 -0400 Subject: answer --- doc/forum/Discussion_PageSpec__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn index fb592be48..2860d0d17 100644 --- a/doc/forum/Discussion_PageSpec__63__.mdwn +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -1 +1,3 @@ I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? + +> Not currently, sorry. --[[Joey]] -- cgit v1.2.3 From a14c2a9cd0f04062e32c218b799076adaf8b934e Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 14 Oct 2010 12:25:48 +0000 Subject: perms --- doc/bugs/More_permission_checking.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/More_permission_checking.mdwn diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn new file mode 100644 index 000000000..e56cda98b --- /dev/null +++ b/doc/bugs/More_permission_checking.mdwn @@ -0,0 +1,9 @@ +I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup. + +I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw. + +I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user. + +I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`. Though shouldn't everything be under the `www-data` group in reality? + +Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this. -- cgit v1.2.3 From 46118a983f1253defcda3042821a10ce5046103c Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:24:43 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 35 ++++++++++---------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 4eb084f38..38df19708 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -5,15 +5,17 @@ The best part of installing ikiwiki was learning how to use git. I never used so ## installing git: +cd /opt/ikiwiki/install + curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O tar xzvf git-(latest version).tar.gz cd git-(latest version) -./configure --prefix=/usr/local +./configure --prefix=/usr/local -NO_MSGFMT=yes make prefix=/usr/local all +make prefix=/usr/local all sudo make install @@ -25,31 +27,20 @@ git config --global user.email "email here" git config --global color.ui "auto" -curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. -I like to install test software in /opt. No particular reason. You could install to defaults. - - -perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +git clone git://git.ikiwiki.info/ perl Makefile.PL LIB=/Library/Perl/5.10.0 make -make install - -sudo install -d /opt/ikiwiki - -sudo install -m 0644 wikilist /opt/ikiwiki - -sudo install -m 0644 auto.setup /opt/ikiwiki - -sudo install -m 0644 auto-blog.setup /opt/ikiwiki - +sudo make install when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. @@ -71,12 +62,13 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin +cd gitweb -cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" -sudo chmod 2755 gitweb.cgi +cp gitweb.cgi /Library/WebServer/CGI-Executables/ +sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi ## installing xapian: @@ -117,7 +109,6 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a @@ -131,4 +122,4 @@ and found the omega program in Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. -Then I fell asleep. + -- cgit v1.2.3 From 52375d9c080fd5db8106f75d5ca00f3c806644de Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:42:23 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 38df19708..d685af0d0 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -109,6 +109,50 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. +## setup file + +#!/usr/bin/perl +# Ikiwiki setup automator. +# +# This setup file causes ikiwiki to create a wiki, check it into revision +# control, generate a setup file for the new wiki, and set everything up. +# +# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup +# +# By default, it asks a few questions, and confines itself to the user's home +# directory. You can edit it to change what it asks questions about, or to +# modify the values to use site-specific settings. + +require IkiWiki::Setup::Automator; + +our $wikiname="your wiki"; +our $wikiname_short="yourwiki"; +our $rcs="git"; +our $admin="your name"; +use Net::Domain q{hostfqdn}; +our $domain="your.domain"; + +IkiWiki::Setup::Automator->import( +wikiname => $wikiname, +adminuser => [$admin], +rcs => $rcs, +srcdir => "/opt/ikiwiki/$wikiname_short", +destdir => "/Library/WebServer/Documents/$wikiname_short", +repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), +dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", +url => "http://$domain/$wikiname_short", +cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", +cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", +adminemail => "your\@email.com", +add_plugins => [qw{goodstuff websetup}], +disable_plugins => [qw{}], +libdir => "/opt/ikiwiki/.ikiwiki", +rss => 1, +atom => 1, +syslog => 1, +) + + ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a -- cgit v1.2.3 From 29b5c68bbbb35749b5b515266deffe9358ce3b74 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:19:19 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 96 ++++++++++++++------------ 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index d685af0d0..05a9bf6d7 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -64,11 +64,19 @@ When you can't get into the setup page or you get strange behavior after a setup cd gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi +sudo chmod 2755 /Library/WebServer/git-favicon.png +sudo chmod 2755 /Library/WebServer/git-logo.png +sudo chmod 2755 /Library/WebServer/gitweb.css +sudo chmod 2755 /Library/WebServer/gitweb.js ## installing xapian: @@ -108,50 +116,48 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - -## setup file - -#!/usr/bin/perl -# Ikiwiki setup automator. -# -# This setup file causes ikiwiki to create a wiki, check it into revision -# control, generate a setup file for the new wiki, and set everything up. -# -# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup -# -# By default, it asks a few questions, and confines itself to the user's home -# directory. You can edit it to change what it asks questions about, or to -# modify the values to use site-specific settings. - -require IkiWiki::Setup::Automator; - -our $wikiname="your wiki"; -our $wikiname_short="yourwiki"; -our $rcs="git"; -our $admin="your name"; -use Net::Domain q{hostfqdn}; -our $domain="your.domain"; - -IkiWiki::Setup::Automator->import( -wikiname => $wikiname, -adminuser => [$admin], -rcs => $rcs, -srcdir => "/opt/ikiwiki/$wikiname_short", -destdir => "/Library/WebServer/Documents/$wikiname_short", -repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), -dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", -url => "http://$domain/$wikiname_short", -cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", -cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", -adminemail => "your\@email.com", -add_plugins => [qw{goodstuff websetup}], -disable_plugins => [qw{}], -libdir => "/opt/ikiwiki/.ikiwiki", -rss => 1, -atom => 1, -syslog => 1, -) - + + ## setup file + _!/usr/bin/perl + _ Ikiwiki setup automator. + + _ This setup file causes ikiwiki to create a wiki, check it into revision + _ control, generate a setup file for the new wiki, and set everything up. + + _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup + + _By default, it asks a few questions, and confines itself to the user's home + _directory. You can edit it to change what it asks questions about, or to + _modify the values to use site-specific settings. + require IkiWiki::Setup::Automator; + + our $wikiname="your wiki"; + our $wikiname_short="yourwiki"; + our $rcs="git"; + our $admin="your name"; + use Net::Domain q{hostfqdn}; + our $domain="your.domain"; + + IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "/opt/ikiwiki/$wikiname_short", + destdir => "/Library/WebServer/Documents/$wikiname_short", + repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", + url => "http://$domain/$wikiname_short", + cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", + adminemail => "your\@email.com", + add_plugins => [qw{goodstuff websetup}], + disable_plugins => [qw{}], + libdir => "/opt/ikiwiki/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + ) + ## turning on search plugin: -- cgit v1.2.3 From 222e1fdc1f62433d290c39e8bb3235167192b062 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:23:08 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 05a9bf6d7..aa89c4f55 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -67,16 +67,26 @@ cd gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ -cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ + +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/ + sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi -sudo chmod 2755 /Library/WebServer/git-favicon.png -sudo chmod 2755 /Library/WebServer/git-logo.png -sudo chmod 2755 /Library/WebServer/gitweb.css -sudo chmod 2755 /Library/WebServer/gitweb.js + +sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png + +sudo chmod 2755 /Library/WebServer/Documents/git-logo.png + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.css + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.js + ## installing xapian: -- cgit v1.2.3 From 1c4eeddb784b4e04abb5364d140684359a56aca3 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:45:48 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index aa89c4f55..50bb2f520 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -171,15 +171,10 @@ it installed without issue so I'm baffled why it didn't install from command lin ## turning on search plugin: -I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory". +I did a "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega". -find / -name "omega" -print - -and found the omega program in - -/usr/local/lib/xapian-omega/bin/omega. - -Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. +Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing. -- cgit v1.2.3 From f57f56fac11f2cbd619b7e2d14944538e9fb34b6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:17:32 +0000 Subject: add my own way :) --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index d67a9131b..cbea798f1 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,6 +6,10 @@ ---- +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: -- cgit v1.2.3 From c8d5b7d2f93464560b2db97b139713eda692320f Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:19:06 +0000 Subject: --- doc/users/anarcat.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/anarcat.wiki diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki new file mode 100644 index 000000000..7ef474ed6 --- /dev/null +++ b/doc/users/anarcat.wiki @@ -0,0 +1 @@ +Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me. -- cgit v1.2.3 From deb4bb6111beb9004544bc32d4aeb79f6d5768f7 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:24:40 +0000 Subject: date --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index cbea798f1..4a7163eae 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,7 +6,7 @@ ---- -I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 ---- -- cgit v1.2.3 From dd35d0d28fa2db775b4fd7fef0c587d5abd96e3e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Fri, 15 Oct 2010 14:39:18 +0000 Subject: package systems exist --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn new file mode 100644 index 000000000..ae3969879 --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn @@ -0,0 +1 @@ +If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc. --[[schmonz]] -- cgit v1.2.3 From 1d119e5314279235cebc5624f944ee67586cca52 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 17 Oct 2010 17:26:35 -0400 Subject: auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments. --- auto-blog.setup | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/auto-blog.setup b/auto-blog.setup index 980074ec3..0eb83ded6 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}], + add_plugins => [qw{goodstuff websetup comments blogspam calendar sidebar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -49,6 +49,6 @@ IkiWiki::Setup::Automator->import( archive_pagespec => "page(posts/*) and !*/Discussion", global_sidebars => 0, discussion => 0, - locked_pages => "*", + locked_pages => "* and !postcomment(*)", tagbase => "tags", ) diff --git a/debian/changelog b/debian/changelog index 5433ba05f..9e6bd53f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low of the monotone workspace. Thanks, tommyd. * img: If a class is specified, don't also put the img in the img class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From 332cb13310dfdc40b4620be7942657c30f63b3c8 Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:05:02 +0000 Subject: Fixes --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 50bb2f520..f755813e3 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -34,8 +34,12 @@ curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | su I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. +cd .. + git clone git://git.ikiwiki.info/ +cd git.ikiwiki.info/ + perl Makefile.PL LIB=/Library/Perl/5.10.0 make -- cgit v1.2.3 From d2b7fcda9a3b302cfabf528e37dd3366030ebb6b Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:38:16 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index f755813e3..8b649156d 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -66,7 +66,7 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -cd gitweb +cd ../git-1.7.3.1/gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" -- cgit v1.2.3 From 0fe25eb41464095f1511b054f45b885572a13071 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnzWY2QyG3IWm_oMTbSsdYFbNE3kiwh4ns" Date: Tue, 19 Oct 2010 06:10:17 +0000 Subject: --- doc/examples/blog/posts/hello__33__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/examples/blog/posts/hello__33__.mdwn diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn new file mode 100644 index 000000000..2a855be13 --- /dev/null +++ b/doc/examples/blog/posts/hello__33__.mdwn @@ -0,0 +1 @@ +hi! there............ -- cgit v1.2.3 From a40abf3e1acba1eaab8dd0f2e416bfde2d9b6667 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:32:04 -0400 Subject: cleanup --- doc/examples/blog/posts/hello__33__.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/hello__33__.mdwn diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn deleted file mode 100644 index 2a855be13..000000000 --- a/doc/examples/blog/posts/hello__33__.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi! there............ -- cgit v1.2.3 From 490e0813c53ce7cff708ae4b6c2805c643f9f005 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:44:10 -0400 Subject: releasing version 3.20101019 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/bg.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/cs.po | 97 ++++++++++++++++++++++++++++++++----------------------- po/da.po | 95 ++++++++++++++++++++++++++++++++---------------------- po/de.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/es.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/fr.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/gu.po | 97 ++++++++++++++++++++++++++++++++----------------------- po/ikiwiki.pot | 78 ++++++++++++++++++++++++++------------------ po/it.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/pl.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/sv.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/tr.po | 92 +++++++++++++++++++++++++++++++--------------------- po/vi.po | 98 +++++++++++++++++++++++++++++++++----------------------- 15 files changed, 738 insertions(+), 511 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e6bd53f0..951e59c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100927) UNRELEASED; urgency=low +ikiwiki (3.20101019) unstable; urgency=low * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. @@ -19,7 +19,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments. - -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 + -- Joey Hess Tue, 19 Oct 2010 02:32:23 -0400 ikiwiki (3.20100926) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 5cd072750..b2cebc495 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100926 +Version: 3.20101019 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 4fb771b75..36774cfb2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -130,6 +130,11 @@ msgstr "данните от източника предизвикаха греш msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "грешка при обработване на шаблона" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -335,12 +340,6 @@ msgstr "не е указан файл на обвивката" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "грешка при обработване на шаблона" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -369,8 +368,8 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -384,6 +383,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "крешка при компилиране на файла %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +417,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" @@ -468,12 +472,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "шаблонът „%s” не е намерен" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -509,17 +513,17 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -800,6 +804,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1000,11 +1014,6 @@ msgstr "създаване на нова страницa „%s”" msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "шаблонът „%s” не е намерен" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1029,26 +1038,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1067,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "пропускане на невалидното име на файл „%s”" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1178,13 +1182,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1237,21 +1241,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "пропускане на невалидното име на файл „%s”" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "шаблонът „%s” не е намерен" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1276,6 +1290,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "шаблонът „%s” не е намерен" + #~ msgid "You need to log in first." #~ msgstr "Първо трябва да влезете." diff --git a/po/cs.po b/po/cs.po index 068327ecb..c154da695 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -129,6 +129,11 @@ msgstr "kanál shodil XML::Feed!" msgid "creating new page %s" msgstr "vytvářím novou stránku %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "nepodařilo se zpracovat:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "mažu bucket..." @@ -256,7 +261,7 @@ msgstr "Přidán komentář" msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -334,12 +339,6 @@ msgstr "nebyl zadán parametr match" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "nepodařilo se zpracovat:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" @@ -366,8 +365,8 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" @@ -381,6 +380,11 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "nelze zkompilovat %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" @@ -458,12 +462,12 @@ msgstr "parametry %s a %s nelze použít zároveň" msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "šablona %s nebyla nalezena" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -495,15 +499,15 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -790,6 +794,16 @@ msgstr "neplatná procentuální hodnota %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "potvrďte odstranění %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff oříznut)" @@ -980,11 +994,6 @@ msgstr "vytvářím novou stránku %s" msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s nenalezen" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" @@ -1008,20 +1017,20 @@ msgstr "moduly" msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1029,7 +1038,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1041,11 +1050,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "chybné jméno souboru %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1163,13 +1167,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1221,21 +1225,31 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "chybné jméno souboru %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "šablona %s nebyla nalezena" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -1260,6 +1274,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "%s not found" +#~ msgstr "%s nenalezen" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" diff --git a/po/da.po b/po/da.po index 45cb8bab9..331654355 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -133,6 +133,10 @@ msgstr "fødning fik XML::Feed til at bryde sammen!" msgid "creating new page %s" msgstr "opretter ny side %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "beandling af skabelon mislykkedes:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "sletter bundt.." @@ -259,7 +263,7 @@ msgstr "Tilføjede en kommentar" msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" @@ -336,11 +340,6 @@ msgstr "sammenligning ikke angivet" msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "beandling af skabelon mislykkedes:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" @@ -367,8 +366,8 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" @@ -382,6 +381,11 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "kompilering af %s mislykkedes" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgstr "" "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel " "gennemkørsel" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy kunne ikke afkode dette html" @@ -461,12 +465,12 @@ msgstr "parametrene %s og %s kan ikke anvendes sammen" msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "skabelon %s ikke fundet" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "beandling af skabelon mislykkedes:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -500,15 +504,15 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -795,6 +799,16 @@ msgstr "ugyldig procentværdi %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bekræft at %s bliver fjernet" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff trunkeret)" @@ -985,11 +999,6 @@ msgstr "opretter mærkatside %s" msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s ikke fundet" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" @@ -1013,22 +1022,22 @@ msgstr "%s udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1036,7 +1045,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1046,11 +1055,6 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "dårligt filnavn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1168,13 +1172,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1226,21 +1230,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "dårligt filnavn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "skabelon %s ikke fundet" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1265,5 +1279,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "%s not found" +#~ msgstr "%s ikke fundet" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "gendanner alle sider for at korrigere meta titler" diff --git a/po/de.po b/po/de.po index 07e702e5c..6159912d0 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -130,6 +130,11 @@ msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" msgid "creating new page %s" msgstr "erstelle neue Seite %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "Fehler beim Ablauf:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." @@ -259,7 +264,7 @@ msgstr "Kommentar hinzugefügt" msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -336,12 +341,6 @@ msgstr "Übereinstimmung nicht angegeben" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "Fehler beim Ablauf:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" @@ -368,8 +367,8 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" @@ -383,6 +382,11 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "erzeugen von %s fehlgeschlagen" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +417,7 @@ msgstr "" "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass " "through" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy konnte dieses HTML nicht auswerten" @@ -464,12 +468,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Vorlage %s nicht gefunden" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -504,15 +508,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -804,6 +808,16 @@ msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " "benötigt" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bestätigen Sie die Entfernung von %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" @@ -994,11 +1008,6 @@ msgstr "erstelle neue Seite %s" msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "Vorlage (feed) nicht gefunden" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" @@ -1022,22 +1031,22 @@ msgstr "%s-Erweiterungen" msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1045,7 +1054,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1067,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "fehlerhafter Dateiname %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1183,13 +1187,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1244,21 +1248,31 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "fehlerhafter Dateiname %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Vorlage %s nicht gefunden" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1283,6 +1297,10 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "Vorlage (feed) nicht gefunden" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" diff --git a/po/es.po b/po/es.po index 39c4797e7..a2459007b 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -135,6 +135,11 @@ msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" msgid "creating new page %s" msgstr "creando nueva página %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "borrando el directorio.." @@ -265,7 +270,7 @@ msgstr "Añadir un comentario" msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -343,12 +348,6 @@ msgstr "falta indicar la coincidencia de páginas (match)" msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "se ha producido un error fatal mientras procesaba la plantilla:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" @@ -376,8 +375,8 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" @@ -391,6 +390,11 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "ha fallado la compilación del programa %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -421,7 +425,7 @@ msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" @@ -473,12 +477,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "no he encontrado la plantilla %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -512,15 +516,15 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -805,6 +809,16 @@ msgstr "%s es un valor erróneo para un porcentaje" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "confirme el borrado de %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" @@ -999,11 +1013,6 @@ msgstr "creando nueva página %s" msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "fuente de datos no encontrada" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" @@ -1027,22 +1036,22 @@ msgstr "complementos" msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1050,7 +1059,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1062,11 +1071,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "el nombre de archivo %s es erróneo" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1188,13 +1192,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1250,21 +1254,31 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "el nombre de archivo %s es erróneo" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "no he encontrado la plantilla %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1292,6 +1306,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "fuente de datos no encontrada" + #~ msgid "You need to log in first." #~ msgstr "Antes es necesario identificarse." diff --git a/po/fr.po b/po/fr.po index ae2b9f411..c0df34b6a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -131,6 +131,10 @@ msgstr "Plantage du flux XML::Feed !" msgid "creating new page %s" msgstr "Création de la nouvelle page %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "Échec du traitementdu modèle :" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." @@ -256,7 +260,7 @@ msgstr "Commentaire ajouté" msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -333,11 +337,6 @@ msgstr "correspondance non indiquée" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "Échec du traitementdu modèle :" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" @@ -364,8 +363,8 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" @@ -379,6 +378,11 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "Échec de la compilation de %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgstr "" "Avertissement : le module perl « highlight » n'est pas disponible. " "Continuation malgré tout." -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy n'a pas pu analyser cette page html" @@ -460,12 +464,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Modèle de page %s introuvable" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Échec du traitementdu modèle :" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -498,15 +502,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta demande un paramètre." @@ -801,6 +805,16 @@ msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est " "nécessaire." +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "Suppression de %s confirmée" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" @@ -991,11 +1005,6 @@ msgstr "Création de la nouvelle page %s" msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s introuvable" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" @@ -1019,22 +1028,22 @@ msgstr "Greffons %s" msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1051,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1053,11 +1062,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "Nom de fichier incorrect %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1085,7 +1089,8 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "recherche de %s pour les dates de modification et de création des fichiers..." +msgstr "" +"recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 #, perl-format @@ -1180,13 +1185,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1238,21 +1243,31 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "Nom de fichier incorrect %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Modèle de page %s introuvable" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" @@ -1277,6 +1292,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "%s not found" +#~ msgstr "%s introuvable" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "" #~ "Reconstruction de toutes les pages pour corriger les titres (greffon " diff --git a/po/gu.po b/po/gu.po index 08107e5b4..b73f51591 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -128,6 +128,11 @@ msgstr "ફીડ ભાંગી ગયું XML::Feed!" msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -254,7 +259,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -333,12 +338,6 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "ક્રિયા કરવામાં નિષ્ફળ:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -367,8 +366,8 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -382,6 +381,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -410,7 +414,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" @@ -463,12 +467,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -499,17 +503,17 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -791,6 +795,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -986,11 +1000,6 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1016,26 +1025,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1045,11 +1054,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1165,13 +1169,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1222,21 +1226,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "ટેમ્પલેટ %s મળ્યું નહી" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1261,6 +1275,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "%s not found" +#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી" + #~ msgid "You need to log in first." #~ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 17c313ba8..bca72b108 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-26 23:04-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -129,6 +129,10 @@ msgstr "" msgid "creating new page %s" msgstr "" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -252,7 +256,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -329,11 +333,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -360,8 +359,8 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -375,6 +374,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -403,7 +407,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -452,12 +456,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -773,6 +777,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -963,11 +977,6 @@ msgstr "" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -991,26 +1000,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1020,11 +1029,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1197,21 +1201,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 4d6f1d887..657bda7a0 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -128,6 +128,11 @@ msgstr "il notiziario ha fatto andare in crash XML::Feed." msgid "creating new page %s" msgstr "creazione nuova pagina %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "errore nell'elaborazione:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "eliminazione contenitore..." @@ -255,7 +260,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -333,12 +338,6 @@ msgstr "corrispondenza non specificata" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "errore nell'elaborazione:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" @@ -365,8 +364,8 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" @@ -380,6 +379,11 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "errore nel compilare %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgid "" msgstr "" "attenzione: modulo perl highlight non trovato, verrà passato inalterato" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" @@ -460,12 +464,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme" msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "modello %s non trovato" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -498,15 +502,15 @@ msgstr "" msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -801,6 +805,16 @@ msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " "\"donepages\"" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "conferma rimozione di %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff troncato)" @@ -991,11 +1005,6 @@ msgstr "creazione nuova pagina %s" msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "notiziario non trovato" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" @@ -1019,22 +1028,22 @@ msgstr "plugin" msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1051,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1052,11 +1061,6 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "nome file %s scorretto" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1175,13 +1179,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1233,21 +1237,31 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "nome file %s scorretto" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "modello %s non trovato" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1272,6 +1286,10 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "notiziario non trovato" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" diff --git a/po/pl.po b/po/pl.po index 4bd07b5a6..6a9d973be 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -132,6 +132,11 @@ msgstr "awaria kanału RSS w module XML::Feed!" msgid "creating new page %s" msgstr "tworzenie nowej strony %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "awaria w trakcie przetwarzania:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -258,7 +263,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -337,12 +342,6 @@ msgstr "nieokreślona nazwa pliku osłony" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "awaria w trakcie przetwarzania:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -371,8 +370,8 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -386,6 +385,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "awaria w trakcie kompilowania %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -415,7 +419,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" @@ -470,12 +474,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "nieznaleziony szablon %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -512,17 +516,17 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -804,6 +808,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1007,11 +1021,6 @@ msgstr "tworzenie nowej strony %s" msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "nie znaleziono %s" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1037,26 +1046,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1066,11 +1075,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "pomijanie nieprawidłowej nazwy pliku %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1186,13 +1190,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1245,21 +1249,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "pomijanie nieprawidłowej nazwy pliku %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "nieznaleziony szablon %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1284,6 +1298,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "nie znaleziono %s" + #~ msgid "You need to log in first." #~ msgstr "Proszę najpierw zalogować się." diff --git a/po/sv.po b/po/sv.po index 1dc8a5f49..1b6d1f2e8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -129,6 +129,11 @@ msgstr "kanalen kraschade XML::Feed!" msgid "creating new page %s" msgstr "skapar nya sidan %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "misslyckades med att behandla mall:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -255,7 +260,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "filnamn för wrapper har inte angivits" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "misslyckades med att behandla mall:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,8 +367,8 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -383,6 +382,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "misslyckades med att kompilera %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" @@ -465,12 +469,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "mallen %s hittades inte" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -505,17 +509,17 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +800,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1009,6 @@ msgstr "skapar nya sidan %s" msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "mallen %s hittades inte" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1033,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1062,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "hoppar över felaktigt filnamn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1177,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1230,21 +1234,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "hoppar över felaktigt filnamn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "mallen %s hittades inte" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1269,6 +1283,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "mallen %s hittades inte" + #~ msgid "You need to log in first." #~ msgstr "Du måste logga in först." diff --git a/po/tr.po b/po/tr.po index b94039191..aa6884a6f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -125,6 +125,10 @@ msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -248,7 +252,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -325,11 +329,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -356,8 +355,8 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -371,6 +370,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -399,7 +403,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -448,12 +452,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -484,15 +488,15 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -769,6 +773,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -959,11 +973,6 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "özet akışı bulunamadı" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -987,26 +996,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1016,11 +1025,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1136,13 +1140,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1193,21 +1197,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -1232,5 +1246,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "özet akışı bulunamadı" + #~ msgid "You need to log in first." #~ msgstr "Önce sisteme giriş yapmanız gerekiyor." diff --git a/po/vi.po b/po/vi.po index 1b0bab9b1..59f74e881 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -130,6 +130,11 @@ msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." msgid "creating new page %s" msgstr "đang tạo trang mới %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "mẫu không xử lý được:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "chưa xác định tên tập tin bộ bao bọc" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "mẫu không xử lý được:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,8 +367,8 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -383,6 +382,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "lỗi biên dịch %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" @@ -467,12 +471,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "không tìm thấy mẫu %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -505,17 +509,17 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » ( msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +800,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1009,6 @@ msgstr "đang tạo trang mới %s" msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "không tìm thấy mẫu %s" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1033,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1062,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "đang bỏ qua tên tập tin sai %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1177,13 @@ msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1231,21 +1235,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "đang bỏ qua tên tập tin sai %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "không tìm thấy mẫu %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1270,6 +1284,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "không tìm thấy mẫu %s" + #~ msgid "You need to log in first." #~ msgstr "Trước tiên bạn cần phải đăng nhập." -- cgit v1.2.3 From 2bb049df4fe55191783e6625dbac719e52e329fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:45:29 -0400 Subject: add news item for ikiwiki 3.20101019 --- doc/news/version_3.20100804.mdwn | 14 -------------- doc/news/version_3.20101019.mdwn | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 doc/news/version_3.20100804.mdwn create mode 100644 doc/news/version_3.20101019.mdwn diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn deleted file mode 100644 index be85cb949..000000000 --- a/doc/news/version_3.20100804.mdwn +++ /dev/null @@ -1,14 +0,0 @@ -ikiwiki 3.20100804 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * 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) - * git: Fix gitweb historyurl examples so "diff to current" links work. - (Thanks jrayhawk) - * meta: Allow syntax closer to html meta to be used. - * Add new disable hook, allowing plugins to perform cleanup after they - have been disabled. - * Use Digest::SHA built into perl rather than external Digest::SHA1 - to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040) - * Fixes a bug that prevented matching deleted pages when using the page() - PageSpec."""]] \ No newline at end of file diff --git a/doc/news/version_3.20101019.mdwn b/doc/news/version_3.20101019.mdwn new file mode 100644 index 000000000..86c302e25 --- /dev/null +++ b/doc/news/version_3.20101019.mdwn @@ -0,0 +1,20 @@ +ikiwiki 3.20101019 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) + * Updated French program translation. Closes: #[598918](http://bugs.debian.org/598918) + * git: Added new rcs\_revert and rcs\_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. + * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. + * monotone: Fix recentchanges page when the srcdir is not at the top + of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments."""]] \ No newline at end of file -- cgit v1.2.3 From a0b55ac3cd4f840f62d0441e3b1fe9b95ec15007 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Tue, 19 Oct 2010 15:13:29 +0000 Subject: setting cookies before aggregating --- doc/plugins/aggregate/discussion.mdwn | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn index 1a9844577..77005a6a1 100644 --- a/doc/plugins/aggregate/discussion.mdwn +++ b/doc/plugins/aggregate/discussion.mdwn @@ -89,3 +89,30 @@ New bug: new posts aren't getting displayed (or cached for aggregation). After f >>> mind having a copy to investigate. --[[Joey]] >>>> Didn't think of that, will keep a copy if there's a next time. -- [[schmonz]] + +----- + +In a corporate environment where feeds are generally behind +authentication, I need to prime the aggregator's `LWP::UserAgent` +with some cookies. What I've done is write a custom plugin to populate +`$config{cookies}` with an `HTTP::Cookies` object, plus this diff: + + --- /var/tmp/pkg/lib/perl5/vendor_perl/5.10.0/IkiWiki/Plugin/aggregate.pm 2010-06-24 13:03:33.000000000 -0400 + +++ aggregate.pm 2010-06-24 13:04:09.000000000 -0400 + @@ -488,7 +488,11 @@ + } + $feed->{feedurl}=pop @urls; + } + - my $res=URI::Fetch->fetch($feed->{feedurl}); + + my $res=URI::Fetch->fetch($feed->{feedurl}, + + UserAgent => LWP::UserAgent->new( + + cookie_jar => $config{cookies}, + + ), + + ); + if (! $res) { + $feed->{message}=URI::Fetch->errstr; + $feed->{error}=1; + +It works, but I have to remember to apply the diff whenever I update +ikiwiki. Can you provide a more elegant means of allowing cookies and/or +the user agent to be programmatically manipulated? --[[schmonz]] -- cgit v1.2.3 From 9b832df0d257e3d358ead63fd865d2a6b1914e19 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 21:37:31 -0400 Subject: add a missing chomp --- IkiWiki/Plugin/filecheck.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index a78058ffe..3b0a7b314 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -148,6 +148,7 @@ sub match_mimetype ($$;@) { if (! defined $mimetype) { open(my $file_h, "-|", "file", "-bi", $file); $mimetype=<$file_h>; + chomp $mimetype; close $file_h; } if (! defined $mimetype || $mimetype !~s /;.*//) { -- cgit v1.2.3 From 372ed18f2806367964ac500ac4f463ad466ca06f Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Wed, 20 Oct 2010 06:57:06 +0000 Subject: forum: PageSpec results from independent checkout: call for help --- doc/forum/PageSpec_results_from_independent_checkout.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/PageSpec_results_from_independent_checkout.mdwn diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn new file mode 100644 index 000000000..6b2fd6df0 --- /dev/null +++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn @@ -0,0 +1,5 @@ +I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, but at best I'm currently restricted to copying over and using whatever is in the indexdb with this approach: + + perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" + +I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk -- cgit v1.2.3 From 4a75dee651390b79ce4ceb1d951b02e28b3ce83a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Oct 2010 18:52:46 -0400 Subject: avoid perl warning when passed bad non-numeric year/month/day --- IkiWiki.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 2190f008c..941ee13c4 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2608,6 +2608,10 @@ sub match_created_after ($$;@) { } sub match_creation_day ($$;@) { + my $d=shift; + if ($d !~ /^\d+$/) { + return IkiWiki::FailReason->new('invalid day'); + } if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { return IkiWiki::SuccessReason->new('creation_day matched'); } @@ -2617,6 +2621,10 @@ sub match_creation_day ($$;@) { } sub match_creation_month ($$;@) { + my $m=shift; + if ($m !~ /^\d+$/) { + return IkiWiki::FailReason->new('invalid month'); + } if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { return IkiWiki::SuccessReason->new('creation_month matched'); } @@ -2626,7 +2634,11 @@ sub match_creation_month ($$;@) { } sub match_creation_year ($$;@) { - if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { + my $y=shift; + if ($y !~ /^\d+$/) { + return IkiWiki::FailReason->new('invalid year'); + } + if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); } else { -- cgit v1.2.3 From 7e8064e9fa8b3f2c3c0bd0aa5458f00552398e06 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Oct 2010 18:53:50 -0400 Subject: add a hint that creation_month takes a number, not a month name --- IkiWiki.pm | 6 +++--- doc/ikiwiki/pagespec.mdwn | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 941ee13c4..1fa89586e 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2610,7 +2610,7 @@ sub match_created_after ($$;@) { sub match_creation_day ($$;@) { my $d=shift; if ($d !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid day'); + return IkiWiki::ErrorReason->new("invalid day $d"); } if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { return IkiWiki::SuccessReason->new('creation_day matched'); @@ -2623,7 +2623,7 @@ sub match_creation_day ($$;@) { sub match_creation_month ($$;@) { my $m=shift; if ($m !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid month'); + return IkiWiki::ErrorReason->new("invalid month $m"); } if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { return IkiWiki::SuccessReason->new('creation_month matched'); @@ -2636,7 +2636,7 @@ sub match_creation_month ($$;@) { sub match_creation_year ($$;@) { my $y=shift; if ($y !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid year'); + return IkiWiki::ErrorReason->new("invalid year $y"); } if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 6aec561ae..fe1af4c15 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page -- cgit v1.2.3 From a0eb16b68dc11d7e9e13f8f9aebb8cb9d312ef6e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 21 Oct 2010 05:27:08 +0000 Subject: --- ...r_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn new file mode 100644 index 000000000..8d6700651 --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn @@ -0,0 +1,7 @@ +I have been mucking about with ikiwiki for two whole days now. + +I like many things about it. Even though I've been spending most of my time wrestling with css I did manage to write a whole lot of blog posts and love what ikiwiki is doing for the "revise" part of my writing cycle. And I like the idea of integrating the wiki and the blog into one unifying architecture.... + +But... I would like very much to have different page templates for blogging and wiki-ing, some way of specifying that for stuff in the "/posts" directory I'd rather use blogpost.tmpl rather than page.tmpl. I just spent a few minutes looking at the perl for this (I assume Render.pm) and my mind dumped core... + +(generically, some way to specify output formatting on a subdirectory basis would be good) -- cgit v1.2.3 From 1fc550ac8c9a6ca8c666fde3bcbf5743a4b8d3fe Mon Sep 17 00:00:00 2001 From: "https://mukund.startssl.com/" Date: Thu, 21 Oct 2010 08:37:47 +0000 Subject: Fix link --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..2836d96e5 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -154,7 +154,7 @@ Personal sites and blogs * [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) -* [Mukund](https://www.mukund.org/) +* [Mukund](https://mukund.org/) * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) -- cgit v1.2.3 From 6a3323e9b6d5813233025a28d88d36cb861ee58c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Thu, 21 Oct 2010 15:00:50 +0000 Subject: Added a comment --- .../comment_1_15651796492a6f04a19f4a481947c97c._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment new file mode 100644 index 000000000..e92f4107d --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" + nickname="Javier" + subject="comment 1" + date="2010-10-21T15:00:50Z" + content=""" +You can do what you want with the [[ikiwiki/directive/pagetemplate]] directive, but in a slightly cumbersome way, because you have to say what template you want in every page that differs from the default. + +See also: [[templates]] + +And, a perhaps more proper solution to your problem, although I don't fully understand the way of tackling it, in [[todo/multiple_template_directories]]. + +If you could create a proper page in this wiki, centralizing all the knowledge dispersed in those pages, it would be nice ;) + +--[[jerojasro]] +"""]] -- cgit v1.2.3 From 5a82fad494ddbf8f283454202eb3d2712b1b4b19 Mon Sep 17 00:00:00 2001 From: fd Date: Fri, 22 Oct 2010 14:18:41 +0000 Subject: --- doc/sandbox/hey.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/hey.mdwn diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn new file mode 100644 index 000000000..a955185ef --- /dev/null +++ b/doc/sandbox/hey.mdwn @@ -0,0 +1 @@ +* Hello -- cgit v1.2.3 From 91a3b74711df8a74e2d600ba3b0bca8f441d1958 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmZMunnF2szppZKh59QntrdlZDr6BPipiM" Date: Sat, 23 Oct 2010 02:16:00 +0000 Subject: --- doc/plugins/theme.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 7149cc163..2622abc88 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -9,3 +9,6 @@ inside `/usr/share/ikiwiki/themes/`. A theme provides, via the underlay, an enhanced version of the regular [[style.css]]. This leaves [[local.css]] free for you to further customise. Themes can also provide header and background images. + +You can set the theme via the **theme** option in your config file (after +enabling the plugin). Refresh the wiki after changing it to see the changes. -- cgit v1.2.3 From d567c8b209e6643f603d04f8f62f2ca67e9154c6 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:35:42 +0000 Subject: expand on using templates outside the wiki source directory --- doc/ikiwiki/directive/template.mdwn | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn index 6c50fa32e..9e3ae54df 100644 --- a/doc/ikiwiki/directive/template.mdwn +++ b/doc/ikiwiki/directive/template.mdwn @@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a template: The template is a regular wiki page, located in the `templates/` subdirectory inside the source directory of the wiki. -(Alternatively, templates can be stored in a directory outside the wiki, +Alternatively, templates can be stored in a directory outside the wiki, as files with the extension ".tmpl". -By default, these are searched for in `/usr/share/ikiwiki/templates`; +By default, these are searched for in `/usr/share/ikiwiki/templates`, the `templatedir` setting can be used to make another directory be searched -first.) +first. When referring to templates outside the wiki source directory, the "id" +parameter is not interpreted as a pagespec, and you must include the full filename +of the template page, including the ".tmpl" extension. E.g.: + + \[[!template id=blogpost.tmpl]] The template uses the syntax used by the [[!cpan HTML::Template]] perl module, which allows for some fairly complex things to be done. Consult its -- cgit v1.2.3 From 30a647edf89d9645291ee7ba1f8df328f4d21821 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:45:47 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/revert_me.mdwn diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn new file mode 100644 index 000000000..2b1cd2f94 --- /dev/null +++ b/doc/sandbox/revert_me.mdwn @@ -0,0 +1 @@ +this looks good -- cgit v1.2.3 From 9d85b10be894c85529daac111040b1ff1ee3ecd9 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:47:04 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,5 @@ this looks good + +alas, + + Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 1c8d7c450b6ec1e6bf9973525bf117035b907e98 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 18:06:17 +0000 Subject: web reversion - hmm --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/bugs/web_reversion_on_ikiwiki.info.mdwn diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn new file mode 100644 index 000000000..c8563b1b5 --- /dev/null +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -0,0 +1,5 @@ +I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was + + Error: you are not allowed to change sandbox/revert_me.mdwn + +I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon -- cgit v1.2.3 From 6ec52548c22d96f1d9eabdca48694ba167d47631 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:23:37 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..ed717d26d 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,3 +3,5 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn + +test -- cgit v1.2.3 From 1c5a3f2c67c153a57439bce02f320e6e950a58ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:25:29 -0400 Subject: Fix typo that broke anonymous git push. --- IkiWiki/Receive.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 225f2b9ab..c73adfbbb 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -73,7 +73,7 @@ sub test () { }) || error("failed adding user"); } - check_canchange( + IkiWiki::check_canchange( cgi => $cgi, session => $session, changes => [IkiWiki::rcs_receive()] diff --git a/debian/changelog b/debian/changelog index 951e59c9a..3f649a2ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20101020) UNRELEASED; urgency=low + + * Fix typo that broke anonymous git push. + + -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 + ikiwiki (3.20101019) unstable; urgency=low * Fix test suite failure on other side of date line. -- cgit v1.2.3 From 2c0783831e08dc912d8c90879c00c3315bf85d96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:32:46 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index ed717d26d..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,5 +3,3 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn - -test -- cgit v1.2.3 From f3820ee8acbbb31a4794039a989d3e642f5c6d2a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:17:57 +0000 Subject: test web revert (fixed bug) This reverts commit 9d85b10be894c85529daac111040b1ff1ee3ecd9 --- doc/sandbox/revert_me.mdwn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,5 +1 @@ this looks good - -alas, - - Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 9ca9959eda17ca85ca1550353d09ee33f6bb0469 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:19:16 -0400 Subject: fix web reversion when the srcdir is in a subdir of the git repo. --- IkiWiki/Plugin/git.pm | 35 +++++++++++++++++++++++------------ debian/changelog | 1 + 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index e89813253..892b711d8 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -9,7 +9,7 @@ use open qw{:utf8 :std}; my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes -my $no_chdir=0; +my $git_dir=undef; sub import { hook(type => "checkconfig", id => "git", call => \&checkconfig); @@ -164,9 +164,13 @@ sub safe_git (&@) { if (!$pid) { # In child. # Git commands want to be in wc. - if (! $no_chdir) { + if (! defined $git_dir) { chdir $config{srcdir} - or error("Cannot chdir to $config{srcdir}: $!"); + or error("cannot chdir to $config{srcdir}: $!"); + } + else { + chdir $git_dir + or error("cannot chdir to $git_dir: $!"); } exec @cmdline or error("Cannot exec '@cmdline': $!"); } @@ -721,14 +725,13 @@ sub rcs_getmtime ($) { } { -my $git_root; - +my $ret; sub git_find_root { # The wiki may not be the only thing in the git repo. # Determine if it is in a subdirectory by examining the srcdir, # and its parents, looking for the .git directory. - return $git_root if defined $git_root; + return @$ret if defined $ret; my $subdir=""; my $dir=$config{srcdir}; @@ -740,7 +743,8 @@ sub git_find_root { } } - return $git_root=$subdir; + $ret=[$subdir, $dir]; + return @$ret; } } @@ -748,7 +752,7 @@ sub git_find_root { sub git_parse_changes { my @changes = @_; - my $subdir = git_find_root(); + my ($subdir, $rootdir) = git_find_root(); my @rets; foreach my $ci (@changes) { foreach my $detail (@{ $ci->{'details'} }) { @@ -794,8 +798,8 @@ sub git_parse_changes { die $@ if $@; my $fh; ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") - . "git show $detail->{sha1_to} > '$path'"; + my $cmd = "cd $git_dir && ". + "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { error("failed writing temp file '$path'."); } @@ -825,10 +829,12 @@ sub rcs_receive () { # Avoid chdir when running git here, because the changes # are in the master git repo, not the srcdir repo. + # (Also, if a subdir is involved, we don't want to chdir to + # it and only see changes in it.) # The pre-receive hook already puts us in the right place. - $no_chdir=1; + $git_dir="."; push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); - $no_chdir=0; + $git_dir=undef; } return reverse @rets; @@ -838,7 +844,12 @@ sub rcs_preprevert ($) { my $rev=shift; my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint + # Examine changes from root of git repo, not from any subdir, + # in order to see all changes. + my ($subdir, $rootdir) = git_find_root(); + $git_dir=$rootdir; return git_parse_changes(git_commit_info($sha1, 1)); + $git_dir=undef; } sub rcs_revert ($) { diff --git a/debian/changelog b/debian/changelog index 3f649a2ce..cee42dc85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20101020) UNRELEASED; urgency=low * Fix typo that broke anonymous git push. + * fix web reversion when the srcdir is in a subdir of the git repo. -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 -- cgit v1.2.3 From 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:29:12 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..d5fb06504 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,3 @@ this looks good + +ok -- cgit v1.2.3 From bb8fc299acf377846caa189cd17426e4abd2ce74 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:30:02 +0000 Subject: test 2 This reverts commit 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index d5fb06504..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,3 +1 @@ this looks good - -ok -- cgit v1.2.3 From 62a0f2f3d65aa86996f11a01cadb88380ba3d4e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:31:58 -0400 Subject: bugfix --- IkiWiki/Plugin/git.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 892b711d8..f8e16859b 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -848,8 +848,9 @@ sub rcs_preprevert ($) { # in order to see all changes. my ($subdir, $rootdir) = git_find_root(); $git_dir=$rootdir; - return git_parse_changes(git_commit_info($sha1, 1)); + my @ret=git_parse_changes(git_commit_info($sha1, 1)); $git_dir=undef; + return @ret; } sub rcs_revert ($) { -- cgit v1.2.3 From 9d78e484da5c0f8734cbc26bb1a8f89617d6afe8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:33:27 -0400 Subject: fixed --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index c8563b1b5..19a073da2 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -1,5 +1,12 @@ -I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was +I created [[sandbox/revert me]] and then tried the revert button on +[[recentchanges]], but I was not allowed to revert it. The specific error +was Error: you are not allowed to change sandbox/revert_me.mdwn -I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon +I've just tried reading through the revert code, and I haven't figured out +what permission I am lacking. Perhaps the error message could be a little +clearer on that. The error might have been thrown by git_parse_changes in +git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon + +[[fixed|done]] --[[Joey]] -- cgit v1.2.3 From 0cc2a36f593fd14b6345ad2c0b446edb2bafbe2e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:47:19 -0400 Subject: bugfix --- IkiWiki.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 1fa89586e..08a3d7875 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2608,11 +2608,12 @@ sub match_created_after ($$;@) { } sub match_creation_day ($$;@) { + my $page=shift; my $d=shift; if ($d !~ /^\d+$/) { return IkiWiki::ErrorReason->new("invalid day $d"); } - if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { + if ((localtime($IkiWiki::pagectime{$page}))[3] == $d) { return IkiWiki::SuccessReason->new('creation_day matched'); } else { @@ -2621,11 +2622,12 @@ sub match_creation_day ($$;@) { } sub match_creation_month ($$;@) { + my $page=shift; my $m=shift; if ($m !~ /^\d+$/) { return IkiWiki::ErrorReason->new("invalid month $m"); } - if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { + if ((localtime($IkiWiki::pagectime{$page}))[4] + 1 == $m) { return IkiWiki::SuccessReason->new('creation_month matched'); } else { @@ -2634,11 +2636,12 @@ sub match_creation_month ($$;@) { } sub match_creation_year ($$;@) { + my $page=shift; my $y=shift; if ($y !~ /^\d+$/) { return IkiWiki::ErrorReason->new("invalid year $y"); } - if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == $y) { + if ((localtime($IkiWiki::pagectime{$page}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); } else { -- cgit v1.2.3 From 3993757cf8f5747dd19cf35e95e1078de1513acf Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 20:48:03 +0000 Subject: Thanks Joey --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index 19a073da2..6f18cfcba 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -10,3 +10,5 @@ clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon [[fixed|done]] --[[Joey]] + +: Brilliant, many thanks. -- [[Jon]] -- cgit v1.2.3 From 5db2d6f6b224872b119535d57e675d12a2c7dfe1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:13:04 -0400 Subject: nice message if someone tries to revert a merge commit --- IkiWiki/Plugin/git.pm | 15 +++++++++++++-- debian/changelog | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index f8e16859b..f5101d904 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -848,9 +848,20 @@ sub rcs_preprevert ($) { # in order to see all changes. my ($subdir, $rootdir) = git_find_root(); $git_dir=$rootdir; - my @ret=git_parse_changes(git_commit_info($sha1, 1)); + my @commits=git_commit_info($sha1, 1); $git_dir=undef; - return @ret; + + if (! @commits) { + error "unknown commit"; # just in case + } + + # git revert will fail on merge commits. Add a nice message. + if (exists $commits[0]->{parents} && + @{$commits[0]->{parents}} > 1) { + error gettext("you are not allowed to revert a merge"); + } + + return git_parse_changes(@commits); } sub rcs_revert ($) { diff --git a/debian/changelog b/debian/changelog index cee42dc85..b304e4b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -ikiwiki (3.20101020) UNRELEASED; urgency=low +ikiwiki (3.20101023) unstable; urgency=low * Fix typo that broke anonymous git push. - * fix web reversion when the srcdir is in a subdir of the git repo. + * Fix web reversion when the srcdir is in a subdir of the git repo. - -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 + -- Joey Hess Sat, 23 Oct 2010 16:36:50 -0400 ikiwiki (3.20101019) unstable; urgency=low -- cgit v1.2.3 From 1ca7a35268afbe60b8ec2c4581d01dd8a45948ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:25:32 -0400 Subject: releasing version 3.20101023 --- ikiwiki.spec | 2 +- po/bg.po | 14 +++++++++----- po/cs.po | 15 ++++++++++----- po/da.po | 15 ++++++++++----- po/de.po | 15 ++++++++++----- po/es.po | 15 ++++++++++----- po/fr.po | 15 ++++++++++----- po/gu.po | 14 +++++++++----- po/ikiwiki.pot | 14 +++++++++----- po/it.po | 15 ++++++++++----- po/pl.po | 14 +++++++++----- po/sv.po | 14 +++++++++----- po/tr.po | 14 +++++++++----- po/vi.po | 14 +++++++++----- 14 files changed, 124 insertions(+), 66 deletions(-) diff --git a/ikiwiki.spec b/ikiwiki.spec index b2cebc495..7653ac671 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101019 +Version: 3.20101023 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 36774cfb2..0d631d812 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -368,22 +368,26 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "крешка при компилиране на файла %s" diff --git a/po/cs.po b/po/cs.po index c154da695..e4fbe0d11 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -365,22 +365,27 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "nejste oprávněni měnit %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "nelze zkompilovat %s" diff --git a/po/da.po b/po/da.po index 331654355..49dd1de7e 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -366,22 +366,27 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Du har ikke lov til at ændre %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "kompilering af %s mislykkedes" diff --git a/po/de.po b/po/de.po index 6159912d0..4bc3fe379 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -367,22 +367,27 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Sie dürfen %s nicht verändern" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "erzeugen von %s fehlgeschlagen" diff --git a/po/es.po b/po/es.po index a2459007b..e5159d0c6 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -375,22 +375,27 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "No puede cambiar %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "ha fallado la compilación del programa %s" diff --git a/po/fr.po b/po/fr.po index c0df34b6a..786889c88 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -363,22 +363,27 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Vous n'êtes pas autorisé à modifier %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "Échec de la compilation de %s" diff --git a/po/gu.po b/po/gu.po index b73f51591..32b7c5701 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -366,22 +366,26 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index bca72b108..fa65b6f93 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -359,22 +359,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, perl-format msgid "Failed to revert commit %s" msgstr "" diff --git a/po/it.po b/po/it.po index 657bda7a0..fc5fb5aea 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -364,22 +364,27 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "non è permesso modificare %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "errore nel compilare %s" diff --git a/po/pl.po b/po/pl.po index 6a9d973be..dc78149f3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -370,22 +370,26 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "awaria w trakcie kompilowania %s" diff --git a/po/sv.po b/po/sv.po index 1b6d1f2e8..5a2d7b666 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -367,22 +367,26 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "misslyckades med att kompilera %s" diff --git a/po/tr.po b/po/tr.po index aa6884a6f..6b904a945 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -355,22 +355,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, perl-format msgid "Failed to revert commit %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index 59f74e881..619509c4c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -367,22 +367,26 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "lỗi biên dịch %s" -- cgit v1.2.3 From 7163ec70f955a1ea902bc16d6a229b57732473b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:26:26 -0400 Subject: add news item for ikiwiki 3.20101023 --- doc/news/version_3.20100815.mdwn | 4 ---- doc/news/version_3.20101023.mdwn | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_3.20100815.mdwn create mode 100644 doc/news/version_3.20101023.mdwn diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn deleted file mode 100644 index 1073933a1..000000000 --- a/doc/news/version_3.20100815.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -ikiwiki 3.20100815 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix po test suite to not assume ikiwiki's underlay is already installed. - Closes: #[593047](http://bugs.debian.org/593047)"""]] \ No newline at end of file diff --git a/doc/news/version_3.20101023.mdwn b/doc/news/version_3.20101023.mdwn new file mode 100644 index 000000000..44bed6be6 --- /dev/null +++ b/doc/news/version_3.20101023.mdwn @@ -0,0 +1,4 @@ +ikiwiki 3.20101023 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix typo that broke anonymous git push. + * Fix web reversion when the srcdir is in a subdir of the git repo."""]] \ No newline at end of file -- cgit v1.2.3 From 38f0bec34560d2258a2d690676987b12ab184490 Mon Sep 17 00:00:00 2001 From: "72.0.72.144" <72.0.72.144@web> Date: Sun, 24 Oct 2010 13:58:59 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 025a07802..05991ff72 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] -- cgit v1.2.3 From 2076ed597c02bfede9063c3d40f4b855d4e8f8b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 22:37:34 -0400 Subject: txt: Fix display when used inside a format directive. txt's use of a format hook can't work in that case, so it needs to use a htmlizeformat hook in this case to handle wrapping the text in pre tags. --- IkiWiki/Plugin/format.pm | 24 +++++++++++++----------- IkiWiki/Plugin/highlight.pm | 6 +++--- IkiWiki/Plugin/txt.pm | 38 ++++++++++++++++++++++++++++---------- debian/changelog | 6 ++++++ 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm index d54e71131..b596bc0a1 100644 --- a/IkiWiki/Plugin/format.pm +++ b/IkiWiki/Plugin/format.pm @@ -29,22 +29,24 @@ sub preprocess (@) { if (! defined $format || ! defined $text) { error(gettext("must specify format and text")); } + + # Other plugins can register htmlizeformat hooks to add support + # for page types not suitable for htmlize, or that need special + # processing when included via format. Try them until one succeeds. + my $ret; + IkiWiki::run_hooks(htmlizeformat => sub { + $ret=shift->($format, $text) + unless defined $ret; + }); + + if (defined $ret) { + return $ret; + } elsif (exists $IkiWiki::hooks{htmlize}{$format}) { return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text); } else { - # Other plugins can register htmlizefallback - # hooks to add support for page types - # not suitable for htmlize. Try them until - # one succeeds. - my $ret; - IkiWiki::run_hooks(htmlizefallback => sub { - $ret=shift->($format, $text) - unless defined $ret; - }); - return $ret if defined $ret; - error(sprintf(gettext("unsupported page format %s"), $format)); } } diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index d4ade0a7b..5674f0b4a 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -10,8 +10,8 @@ sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); # this hook is used by the format plugin - hook(type => "htmlizefallback", id => "highlight", call => - \&htmlizefallback); + hook(type => "htmlizeformat", id => "highlight", call => + \&htmlizeformat); } sub getsetup () { @@ -79,7 +79,7 @@ sub checkconfig () { } } -sub htmlizefallback { +sub htmlizeformat { my $format=lc shift; my $langfile=ext2langfile($format); diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm index 0d9a0b35b..fcfb68be9 100644 --- a/IkiWiki/Plugin/txt.pm +++ b/IkiWiki/Plugin/txt.pm @@ -17,6 +17,7 @@ sub import { hook(type => "getsetup", id => "txt", call => \&getsetup); hook(type => "filter", id => "txt", call => \&filter); hook(type => "htmlize", id => "txt", call => \&htmlize); + hook(type => "htmlizeformat", id => "txt", call => \&htmlizeformat); eval q{use URI::Find}; if (! $@) { @@ -46,25 +47,42 @@ sub filter (@) { will_render($params{page}, 'robots.txt'); writefile('robots.txt', $config{destdir}, $content); } - - encode_entities($content, "<>&"); - if ($findurl) { - my $finder = URI::Find->new(sub { - my ($uri, $orig_uri) = @_; - return qq|$orig_uri|; - }); - $finder->find(\$content); - } - $content = "
" . $content . "
"; + return txt2html($content); } return $content; } +sub txt2html ($) { + my $content=shift; + + encode_entities($content, "<>&"); + if ($findurl) { + my $finder = URI::Find->new(sub { + my ($uri, $orig_uri) = @_; + return qq|$orig_uri|; + }); + $finder->find(\$content); + } + return "
" . $content . "
"; +} + # We need this to register the .txt file extension sub htmlize (@) { my %params=@_; return $params{content}; } +sub htmlizeformat ($$) { + my $format=shift; + my $content=shift; + + if ($format eq 'txt') { + return txt2html($content); + } + else { + return; + } +} + 1 diff --git a/debian/changelog b/debian/changelog index b304e4b86..2857ec482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20101024) UNRELEASED; urgency=low + + * txt: Fix display when used inside a format directive. + + -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 + ikiwiki (3.20101023) unstable; urgency=low * Fix typo that broke anonymous git push. -- cgit v1.2.3 From 5c6eb167b8e69e0607330f06c893a73dfe1c675a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 23:00:32 -0400 Subject: highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. --- IkiWiki/Plugin/highlight.pm | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 5674f0b4a..872537c72 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -10,8 +10,8 @@ sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); # this hook is used by the format plugin - hook(type => "htmlizeformat", id => "highlight", call => - \&htmlizeformat); + hook(type => "htmlizeformat", id => "highlight", + call => \&htmlizeformat, last => 1); } sub getsetup () { @@ -74,6 +74,7 @@ sub checkconfig () { }, longname => sprintf(gettext("Source code: %s"), $file), @opts, + last => 1, ); } } diff --git a/debian/changelog b/debian/changelog index 2857ec482..f6ca122a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. + * highlight: Ensure that other, more-specific format plugins, + like txt are used in preference to this one in case of ties. -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From ac8aad2ecaad1204e00d0b6eac834ff619e0dc09 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 23:03:28 -0400 Subject: remove a last that won't work --- IkiWiki/Plugin/highlight.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 872537c72..934e64bed 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -74,7 +74,6 @@ sub checkconfig () { }, longname => sprintf(gettext("Source code: %s"), $file), @opts, - last => 1, ); } } -- cgit v1.2.3 From ac6b5c12fa9c834555fde4a4cf06db7b792556d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 23:31:41 -0400 Subject: squash undef --- IkiWiki/Plugin/goto.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm index 42d2425ca..348a663ef 100644 --- a/IkiWiki/Plugin/goto.pm +++ b/IkiWiki/Plugin/goto.pm @@ -52,7 +52,7 @@ sub cgi_goto ($;$) { IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink}); } - if (! length $link) { + if (! defined $link || ! length $link) { IkiWiki::cgi_custom_failure( $q, "404 Not Found", -- cgit v1.2.3 From 577e185b63c6703df1045a7109882e5c3548ab4d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 26 Oct 2010 17:42:51 +0200 Subject: signal dead link to 'default content for *copyright* and *license*' plugin --- ...fault_content_for___42__copyright__42___and___42__license__42__.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index b9ad3cc8e..7b7cd9ccd 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -10,6 +10,8 @@ so I'm now publishing them here. and [`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm) +> These links are dead + Usage instructions are found inside the two plugin files. --[[tschwinge]] -- cgit v1.2.3 From 616767191759281cf6c3abdfedaa649a8147761a Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 27 Oct 2010 12:39:34 +0000 Subject: Fix links. DynDNS (which was resolving *.schwinge.homeip.net to my server at home) stopped supporting wildcard CNAMEs *.schwinge.homeip.net, so I now always have to use the canonical name (or pay for getting this back, or go looking for another service provider)... --- ...t_content_for___42__copyright__42___and___42__license__42__.mdwn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index 7b7cd9ccd..ce2779db1 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -6,11 +6,9 @@ Someone was just asking for it and I had written these two plugins already some months ago, so I'm now publishing them here. -[`copyright.pm`](http://www.schwinge.homeip.net/~thomas/tmp/copyright.pm) +[`copyright.pm`](http://schwinge.homeip.net/~thomas/tmp/copyright.pm) and -[`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm) - -> These links are dead +[`license.pm`](http://schwinge.homeip.net/~thomas/tmp/license.pm) Usage instructions are found inside the two plugin files. -- cgit v1.2.3 From a12dd235ea6afff3540da3f5e66e7abbadaa6944 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 27 Oct 2010 14:49:21 +0200 Subject: Fix some more links. DynDNS (which was resolving *.schwinge.homeip.net to my server at home) stopped supporting wildcard CNAMEs *.schwinge.homeip.net, so I now always have to use the canonical name (or pay for getting this back, or go looking for another service provider)... --- ..._no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn | 2 +- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 4 ++-- doc/forum/cutpaste.pm_not_only_file-local.mdwn | 2 +- doc/plugins/contrib/texinfo.mdwn | 2 +- .../__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn | 2 +- doc/todo/passwordauth:_sendmail_interface.mdwn | 2 +- doc/users/tschwinge.mdwn | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 6996a9fbf..0082eed4d 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -2,7 +2,7 @@ That one has bitten me for some time; here is the minimal testcase. There is also an equivalent (I suppose) problem when using another plugin, but I hope it's enough to track it down for this one. - $ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2) + $ tar -xj < [bug-dep_order.tar.bz2](http://schwinge.homeip.net/~thomas/tmp/bug-dep_order.tar.bz2) $ cd bug-dep_order/ $ ./render_locally [...] diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index f7138cba0..4b22fd06c 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -1,7 +1,7 @@ Consider this: - $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2 - $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch + $ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.tar.bz2 + $ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.patch $ tar -xj < cutpaste_filter.tar.bz2 $ cd cutpaste_filter/ diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn index 3563e3e01..0c5221cc9 100644 --- a/doc/forum/cutpaste.pm_not_only_file-local.mdwn +++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn @@ -3,7 +3,7 @@ has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]], and can then use \[[!paste id=foo]]. Therefore, I've written an [*absorb* directive / -plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to +plugin](http://schwinge.homeip.net/~thomas/tmp/absorb.pm), which is meant to absorb pages in order to get hold of their *cut* and *copy* directives' contents. This does work as expected. But it also absorbs page fileA's *meta* values, like a *meta title*, etc. How to avoid / solve this? diff --git a/doc/plugins/contrib/texinfo.mdwn b/doc/plugins/contrib/texinfo.mdwn index 595bd27aa..a2769166d 100644 --- a/doc/plugins/contrib/texinfo.mdwn +++ b/doc/plugins/contrib/texinfo.mdwn @@ -8,7 +8,7 @@ This plugin is not neccessarily meant to enable people to write arbitrary wiki pages in the Texinfo format (even though that is possible, of course), but rather to ease collaboration on existing Texinfo documents. -The plugin is available at . +The plugin is available at . It's very basic at the moment, but will be improved over time. diff --git a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn index 61b19d302..b3804d652 100644 --- a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn +++ b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn @@ -4,7 +4,7 @@ to the [[`meta`_plugin|plugins/meta]]. > [[done]], with some changes --[[Joey]] Find the most recent version at -. +. I can't use `scrub(...)`, as that will strip out the forwarding HTML command. How to deal with that? diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn index 29f28ca32..556240964 100644 --- a/doc/todo/passwordauth:_sendmail_interface.mdwn +++ b/doc/todo/passwordauth:_sendmail_interface.mdwn @@ -35,7 +35,7 @@ in the ikiwiki source code, where emailing is done. OK, so I'll have a look at replacing all email handling with *Email::Send*. [[!tag patch]] -** +** Remaining TODOs: diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 944105349..435208a71 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -1,8 +1,8 @@ [[!meta title="Thomas Schwinge"]] # Thomas Schwinge - - + + I have converted the [GNU Hurd](http://www.gnu.org/software/hurd/)'s previous web pages and previous wiki pages to a *[[ikiwiki]]* system; and all that while -- cgit v1.2.3 From 43e399d7d221d060b76e86dce72beb5b04eea132 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:51:34 +0000 Subject: --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__.mdwn diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn new file mode 100644 index 000000000..f3cc6375d --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -0,0 +1,17 @@ +I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. + +Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed + + srcdir => '/home/pixel/.notebook/wiki', + git_wrapper => '/home/pixel/.notebook/wiki.git/hooks/post-update', + +and that seems to be fine. However when I go to run ikiwiki --setup things go wrong: + + pixel@tosh: [~ (ruby-1.9.2-p0)] ➔ ikiwiki -setup .notebook/wiki.setup + successfully generated /home/pixel/public_html/wiki/ikiwiki.cgi + successfully generated /home/pixel/.notebook/wiki.git/hooks/post-update + fatal: '/home/pixel/wiki.git' does not appear to be a git repository + fatal: The remote end hung up unexpectedly + 'git pull origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 193. + +I've gone through wiki.setup and nothing has jumped out as the place to set this, have I missed something? -- cgit v1.2.3 From 2a224f5a8a81b923ba0da4fcb742fb293122f19b Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:52:08 +0000 Subject: edit for typo --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn index f3cc6375d..77d1da1ee 100644 --- a/doc/forum/Moving_wiki.git_folder__63__.mdwn +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -1,4 +1,4 @@ -I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. +Hi folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed -- cgit v1.2.3 From f840fb5c58ac4b0e5ab41165fbc0afd2d6a9a256 Mon Sep 17 00:00:00 2001 From: "http://users.itk.ppke.hu/~cstamas/openid/" Date: Wed, 27 Oct 2010 22:45:28 +0000 Subject: Added a comment --- .../comment_1_05238461520613f4ed1b0d02ece663bd._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment new file mode 100644 index 000000000..d654591c0 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://users.itk.ppke.hu/~cstamas/openid/" + ip="212.183.140.47" + subject="comment 1" + date="2010-10-27T22:45:28Z" + content=""" +I think you want to edit + + .git/config + +"""]] -- cgit v1.2.3 From 9ffa87671062eecfcd042a9501032d441def7ce1 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 28 Oct 2010 00:19:43 +0000 Subject: tweaking docs --- doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn index bb4a58fc6..1a01834f8 100644 --- a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn +++ b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn @@ -14,4 +14,4 @@ There is one argument to this directive. The YAML-format data. This should be enclosed inside triple-quotes to preserve the data correctly. If more than one ymlfront directive is given per page, the result is undefined. -Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data. +Likewise, it is inadvisable to try to mix the non-directive ymlfront format with the directive form of the data. -- cgit v1.2.3 From f2f41d680a841813fb3b75e0311793afc956ffd2 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 28 Oct 2010 00:21:47 +0000 Subject: new version of ymlfront finally documented --- doc/plugins/contrib/ymlfront.mdwn | 65 ++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn index a2c649044..2805be04f 100644 --- a/doc/plugins/contrib/ymlfront.mdwn +++ b/doc/plugins/contrib/ymlfront.mdwn @@ -10,6 +10,9 @@ IkiWiki::Plugin::ymlfront - add YAML-format data to a page # activate the plugin add_plugins => [qw{goodstuff ymlfront ....}], + # configure the plugin + ymlfront_delim => [qw(--YAML-- --YAML--)], + ## DESCRIPTION This plugin provides a way of adding arbitrary meta-data (data fields) to any @@ -25,23 +28,57 @@ This plugin is meant to be used in conjunction with the [[field]] plugin. ## DETAILS -If one is not using the ymlfront directive, the YAML-format data in a page -must be placed at the start of the page and delimited by lines containing -precisely three dashes. The "normal" content of the page then follows. +There are three formats for adding YAML data to a page. These formats +should not be mixed - the result is undefined. -For example: +1. ymlfront directive + + See [[ikiwiki/directive/ymlfront]] for more information. - --- - title: Foo does not work - Urgency: High - Status: Assigned - AssignedTo: Fred Nurk - Version: 1.2.3 - --- - When running on the Sprongle system, the Foo function returns incorrect data. +2. default YAML-compatible delimiter + + By default, the YAML-format data in a page is placed at the start of + the page and delimited by lines containing precisely three dashes. + This is what YAML itself uses to delimit multiple documents. + The "normal" content of the page then follows. + + For example: + + --- + title: Foo does not work + Urgency: High + Status: Assigned + AssignedTo: Fred Nurk + Version: 1.2.3 + --- + When running on the Sprongle system, the Foo function returns incorrect data. + + What will normally be displayed is everything following the second line of dashes. That will be htmlized using the page-type of the page-file. + +3. user-defined delimiter + + Instead of using the default "---" delimiter, the user can define, + in the configuration file, the **ymlfront_delim** value, which is an + array containing two strings. The first string defines the markup for + the start of the YAML data, and the second string defines the markip + for the end of the YAML data. These two strings can be the same, or + they can be different. In this case, the YAML data section is not + required to be at the start of the page, but as with the default, it + is expected that only one data section will be on the page. + + For example: + + --YAML-- + title: Foo does not work + Urgency: High + Status: Assigned + AssignedTo: Fred Nurk + Version: 1.2.3 + --YAML-- + When running on the Sprongle system, the Foo function returns incorrect data. -What will normally be displayed is everything following the second line of dashes. -That will be htmlized using the page-type of the page-file. + What will normally be displayed is everything outside the delimiters, + both before and after. That will be htmlized using the page-type of the page-file. ### Accessing the Data -- cgit v1.2.3 From 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:39:05 +0000 Subject: Added a comment: I'm trying to move the root repository --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment new file mode 100644 index 000000000..a761bbc76 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="I'm trying to move the root repository" + date="2010-10-28T02:39:04Z" + content=""" +This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. +"""]] -- cgit v1.2.3 From c53ddaf93abd16d2e64b62a465c630dee9a8a157 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:42:26 +0000 Subject: This reverts commit 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment deleted file mode 100644 index a761bbc76..000000000 --- a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://pixel.dreamwidth.org/" - ip="65.29.14.21" - subject="I'm trying to move the root repository" - date="2010-10-28T02:39:04Z" - content=""" -This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. -"""]] -- cgit v1.2.3 From e8802c885a55c22b5ff754839654d0785ad91991 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:54:15 +0000 Subject: Added a comment --- .../comment_2_72b2b842dfa0cfaf899fe7af12977519._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment new file mode 100644 index 000000000..f2e7ece18 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="comment 2" + date="2010-10-28T02:54:15Z" + content=""" +That did it thanks! + +Should I make some sort of edit in the setup page? I've used git for a while and for whatever reason it never occurred to me that this was from git, not from ikiwiki itself. +"""]] -- cgit v1.2.3 From 34ef3fb40f0a8a5d595ce5cf5f0b6470b7c78198 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:20:24 +0000 Subject: I'm curious if there has been any progress on better RSS output --- ...not_use_recommended_encoding_of_entities_for_some_fields.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn index 48c168997..85c317669 100644 --- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn @@ -34,3 +34,12 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo > Update: Ok, I've fixed this for titles, as a special case, but the > underlying problem remains for other fields in rss feeds (such as > author), so I'm leaving this bug report open. --[[Joey]] + +>> I'm curious if there has been any progress on better RSS output? +>> I've been prototyping a new blog and getting good RSS out of it +>> seems important as the bulk of my current readers use RSS. +>> I note, in passing that the "more" plugin doesn't quite do what +>> I want either - I'd like to pass a full RSS feed of a post and only +>> have "more" apply to the front page of the blog. Is there a way to do that? +>> -- [[dtaht]] +>> -- cgit v1.2.3 From 99749dfdeac07b975cfba6eef617f3d7362eec73 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:28:04 +0000 Subject: more plugin and rss --- doc/bugs/more_and_RSS_generation.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/more_and_RSS_generation.mdwn diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn new file mode 100644 index 000000000..72d636f18 --- /dev/null +++ b/doc/bugs/more_and_RSS_generation.mdwn @@ -0,0 +1,7 @@ +I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed. + +Maybe there is a different plugin (I also tried toggle)? + +I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. + +see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] -- cgit v1.2.3 From 1b770bea3fd5b5dfb4e75237218db204139d9189 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:38:32 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/bugs/logout_in_ikiwiki.mdwn diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn new file mode 100644 index 000000000..ad89f4c2d --- /dev/null +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -0,0 +1 @@ +It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? -- cgit v1.2.3 From 663d2578832dd0808ea98a624b49cec4bf3c0243 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Thu, 28 Oct 2010 17:39:29 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index ad89f4c2d..9f974be15 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -1 +1,3 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? + +> Click on "Preferences". There is a logout button there. --liw -- cgit v1.2.3 From 47b9f10e6254277918873a980af0cf0631326165 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Oct 2010 15:39:22 -0400 Subject: response --- doc/bugs/logout_in_ikiwiki.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 9f974be15..5df19c405 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -1,3 +1,7 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? > Click on "Preferences". There is a logout button there. --liw + +> It would be nice if it were not buried there, but putting it on the +> action bar statically would be confusing. The best approach might be to +> use javascript. --[[Joey]] -- cgit v1.2.3 From f54a91c3021b304fdde183834542418720e4f792 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Fri, 29 Oct 2010 00:56:13 +0000 Subject: trying to figure out how to make ikiwiki slightly more interactive --- doc/bugs/logout_in_ikiwiki.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 5df19c405..a9c407ba2 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -5,3 +5,18 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y > It would be nice if it were not buried there, but putting it on the > action bar statically would be confusing. The best approach might be to > use javascript. --[[Joey]] + + +>> I agree that javascript seems to be a solution, but my brain falls +>> off the end of the world while looking at ways to manipulate the DOM. +>> (I'd argue also in favor of the openid_provider cookie expiring +>> in less time than it does now, and being session based) + +>> It would be nice to move navigational elements to the upper right corner +>> of the page... + +>> I have two kinds of pages (wiki and blog), and three classes of users +>> anonymous users - display things like login, help, and recentchanges, +>> non-admin users - on a per subdir basis (blog and !blog) display +>> logout, help, recentchanges, edit, comment +>> admin users - logout, help, recentchanges, edit, comment, etc -- cgit v1.2.3 From cfc1b6ac486e11cb11d6c72602bf70b0a440b747 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Fri, 29 Oct 2010 00:58:34 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index a9c407ba2..3ca85fddc 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -16,7 +16,10 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y >> of the page... >> I have two kinds of pages (wiki and blog), and three classes of users + >> anonymous users - display things like login, help, and recentchanges, + >> non-admin users - on a per subdir basis (blog and !blog) display >> logout, help, recentchanges, edit, comment + >> admin users - logout, help, recentchanges, edit, comment, etc -- cgit v1.2.3 From d16104f55d8b31929d0466ca9abc3ccb4af0a8e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:41:31 -0400 Subject: response --- doc/bugs/more_and_RSS_generation.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn index 72d636f18..00ab43fa2 100644 --- a/doc/bugs/more_and_RSS_generation.mdwn +++ b/doc/bugs/more_and_RSS_generation.mdwn @@ -2,6 +2,19 @@ I'd like the more plugin and RSS to play better together. In the case of the htm Maybe there is a different plugin (I also tried toggle)? +> I am not a fan of the more directive (thus the rant about it sucking +> embedded in its [[example|ikiwiki/directive/more]]). But I don't think +> that weakening it to not work in rss feeds is a good idea, if someone +> wants to force users to go somewhere to view their full content, +> they should be able to do it, even though it does suck. +> +> The toggle directive will degrade fairly well in an rss feed to +> display the full text. (There is an annoying toggle link that does +> nothing when embedded in an rss feed). --[[Joey]] + I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. +> It's just a simple directive, it should work anywhere any directive will, +> and does as far as I can see. Details? --[[Joey]] + see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] -- cgit v1.2.3 From 313a28b8f68b76aee4b94413e4e9d47dca93a34e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:50:26 -0400 Subject: response --- ...o_not_use_recommended_encoding_of_entities_for_some_fields.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn index 85c317669..0a435cea3 100644 --- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn @@ -43,3 +43,10 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo >> have "more" apply to the front page of the blog. Is there a way to do that? >> -- [[dtaht]] >> +>>> To be clear, the RSS spec sucks to such an extent that, as far as +>>> I know, there is no sort of title escaping that will work in all +>>> RSS consumers. Titles are currently escaped in the way +>>> that tends to break the fewest according to what I've read. +>>> If you're unlucky enough to +>>> have a "&" or "<" in your **name**, then you may still run into +>>> problems with how that is escaped in rss feeds. --[[Joey]] -- cgit v1.2.3 From cb45d3cf44760411746414ba1218c925ad097149 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:59:31 -0400 Subject: re the openid_provider cookie --- doc/bugs/logout_in_ikiwiki.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 3ca85fddc..d9b6df677 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -12,6 +12,12 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y >> (I'd argue also in favor of the openid_provider cookie expiring >> in less time than it does now, and being session based) +>>> (The `openid_provider` cookie is purely a convenience cookie to +>>> auto-select the user's openid provider the next time they log +>>> in. As such, it cannot be a session cookie. It does not provide any +>>> personally-identifying information so it should not really matter +>>> when it expires.) --[[Joey]] + >> It would be nice to move navigational elements to the upper right corner >> of the page... -- cgit v1.2.3 From b62581583107f6fc3e9bccf66a87a491c236757f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8" Date: Sat, 30 Oct 2010 20:26:45 +0000 Subject: --- doc/forum/ikiwiki_+_mathjax.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/ikiwiki_+_mathjax.mdwn diff --git a/doc/forum/ikiwiki_+_mathjax.mdwn b/doc/forum/ikiwiki_+_mathjax.mdwn new file mode 100644 index 000000000..1279a2c80 --- /dev/null +++ b/doc/forum/ikiwiki_+_mathjax.mdwn @@ -0,0 +1 @@ +Is it possible to use [mathjax](http://www.mathjax.org/) in ikiwiki to typeset math formulas? If so, is this compatible with the [wmd](http://ikiwiki.info/plugins/wmd/) plugin? -- cgit v1.2.3 From 85d262e4cab2bfa55194b445d7fd251fa5818bc6 Mon Sep 17 00:00:00 2001 From: "http://edrex.myopenid.com/" Date: Sat, 30 Oct 2010 21:24:17 +0000 Subject: --- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 92c3b7695..676e2bc00 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -260,5 +260,6 @@ required to implement [[todo/alias directive]], which couldn't be easily done by writing to the RCS as the page's contents can change depending on which other pages claim it as an alias. --[[chrysn]] +I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]] [[!tag done]] -- cgit v1.2.3 From 4573524196abfa2ba130d725ce67b8963da09c62 Mon Sep 17 00:00:00 2001 From: Tuomas Jormola Date: Sun, 31 Oct 2010 03:02:38 +0200 Subject: Added missing hook registration for checkconfig Signed-off-by: Tuomas Jormola --- IkiWiki/Plugin/htmltidy.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 185d01dd6..1108aeb89 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -15,6 +15,7 @@ use IPC::Open2; sub import { hook(type => "getsetup", id => "tidy", call => \&getsetup); hook(type => "sanitize", id => "tidy", call => \&sanitize); + hook(type => "checkconfig", id => "tidy", call => \&checkconfig); } sub getsetup () { -- cgit v1.2.3 From 49865d551294f2fbf24458aa7fa4f8ddc441ce1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 22:03:02 -0400 Subject: changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index f6ca122a0..45971e593 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. * highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. + * htmltidy: Add missing checkconfig hook registration. Closes: #601912 -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From cf2e3cb7d9d825ec2e517acdbc61e2502b5a87df Mon Sep 17 00:00:00 2001 From: Craig Lennox Date: Sat, 30 Oct 2010 12:34:00 -0400 Subject: Added missing registration of checkconfig hook. --- IkiWiki/Plugin/sortnaturally.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm index 62e42767c..b038b2f9a 100644 --- a/IkiWiki/Plugin/sortnaturally.pm +++ b/IkiWiki/Plugin/sortnaturally.pm @@ -7,6 +7,7 @@ no warnings; sub import { hook(type => "getsetup", id => "sortnaturally", call => \&getsetup); + hook(type => "checkconfig", id => "sortnaturally", call => \&checkconfig); } sub getsetup { -- cgit v1.2.3 From 0a0366b8c6d280fff06e4edd5639dd57605a86e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Oct 2010 10:12:28 -0400 Subject: changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45971e593..d2f0c334e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. * highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. - * htmltidy: Add missing checkconfig hook registration. Closes: #601912 + * htmltidy, sortnaturally: Add missing checkconfig hook + registration. Closes: #601912 -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From d32a1028ab59e20b2c1d8caaefa65e154181ea05 Mon Sep 17 00:00:00 2001 From: Tuomas Jormola Date: Sun, 31 Oct 2010 19:53:06 +0200 Subject: Use author date instead of commit date Signed-off-by: Tuomas Jormola --- IkiWiki/Plugin/git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index f5101d904..3fa29b22f 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -688,7 +688,7 @@ sub findtimes ($$) { if (! keys %time_cache) { my $date; foreach my $line (run_or_die('git', 'log', - '--pretty=format:%ct', + '--pretty=format:%at', '--name-only', '--relative')) { if (! defined $date && $line =~ /^(\d+)$/) { $date=$line; -- cgit v1.2.3 From 0c18b347aa286647ee5d3bdb36653ef3585ba61f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Oct 2010 16:07:54 -0400 Subject: changelog --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index d2f0c334e..59d7eb761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low like txt are used in preference to this one in case of ties. * htmltidy, sortnaturally: Add missing checkconfig hook registration. Closes: #601912 + (Thanks, Craig Lennox and Tuomas Jormola) + * git: Use author date, not committer date. Closes: #602012 + (Thanks, Tuomas Jormola) -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 238259dfa199e217e34cc02462f55df6b2b1fcc5 Mon Sep 17 00:00:00 2001 From: "http://dtaht.myopenid.com/" Date: Sun, 31 Oct 2010 22:23:03 +0000 Subject: --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2836d96e5..54fa1d57b 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -159,6 +159,7 @@ Personal sites and blogs * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend +* [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From fa71b0e6aa08b0e3b274a0b939bf657f2576e482 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 1 Nov 2010 18:23:43 +0000 Subject: added to git --- ..._content_for___42__copyright__42___and___42__license__42__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index ce2779db1..c13114360 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -45,3 +45,10 @@ by ikiwiki are likewise fine. --[[tschwinge]] > and can extend beyond just copyright and license, but has the disadvantage > that it doesn't support setting defaults for a given "subdirectory" > only. --[[smcv]] + +[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] + +> For `./gitremotes` convenience (taking the Linus approach to backups :-) ) +> I've added this to my git repository as a branch. No review, approval or +> ownership is implied, feel free to replace this with a branch in any other +> repository --[[smcv]] -- cgit v1.2.3 From e68f29eebb3917909b939869e57b985add724598 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 1 Nov 2010 18:24:46 +0000 Subject: ugh, now with better syntax --- ...fault_content_for___42__copyright__42___and___42__license__42__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index c13114360..16c147b68 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -46,7 +46,7 @@ by ikiwiki are likewise fine. --[[tschwinge]] > that it doesn't support setting defaults for a given "subdirectory" > only. --[[smcv]] -[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] +[[!template id=gitbranch branch=smcv/contrib/defcopyright author="[[tschwinge]]"]] > For `./gitremotes` convenience (taking the Linus approach to backups :-) ) > I've added this to my git repository as a branch. No review, approval or -- cgit v1.2.3 From ca166361973e09b6756acbfe46b4a1bcfa4148d7 Mon Sep 17 00:00:00 2001 From: dark Date: Mon, 1 Nov 2010 20:53:42 +0000 Subject: --- doc/users/dark.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/users/dark.mdwn diff --git a/doc/users/dark.mdwn b/doc/users/dark.mdwn new file mode 100644 index 000000000..e1d06d0b0 --- /dev/null +++ b/doc/users/dark.mdwn @@ -0,0 +1,3 @@ +[[!meta title="Richard Braakman"]] + +Lars Wirzenius convinced me to try ikiwiki for blogging :) -- cgit v1.2.3 From 69a22a6f4b4dfc47a7ce39476758742036b70e63 Mon Sep 17 00:00:00 2001 From: dark Date: Mon, 1 Nov 2010 20:55:20 +0000 Subject: proposal plus patch --- doc/todo/selective_more_directive.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/todo/selective_more_directive.mdwn diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn new file mode 100644 index 000000000..24e6ab568 --- /dev/null +++ b/doc/todo/selective_more_directive.mdwn @@ -0,0 +1,26 @@ +I'm setting up a blog for NaNoWriMo and other story-writing, which means long posts every day. I want to have excerpts on the front page, which link to the full length story posts. I also want a dedicated page for each story which inlines the story in full and in chronological order. I can use the "more" directive to achieve this effect on the front page but then it spoils the story page. My solution was to add a pages= parameter to the more directive to make it more selective. + + --- /usr/share/perl5/IkiWiki/Plugin/more.pm 2010-10-09 00:09:24.000000000 +0000 + +++ .ikiwiki/IkiWiki/Plugin/more.pm 2010-11-01 20:24:59.000000000 +0000 + @@ -26,7 +26,10 @@ + + $params{linktext} = $linktext unless defined $params{linktext}; + + - if ($params{page} ne $params{destpage}) { + + if ($params{page} ne $params{destpage} && + + (! exists $params{pages} || + + pagespec_match($params{destpage}, $params{pages}, + + location => $params{page}))) { + return "\n". + htmllink($params{page}, $params{destpage}, $params{page}, + linktext => $params{linktext}, + +I can now call it as + + \[[!more pages="index" linktext="Chapter 1" text=""" + etc + """]] + +I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. + +-- [[dark]] -- cgit v1.2.3 From ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3 Mon Sep 17 00:00:00 2001 From: "http://cristian.regolo.cc/" Date: Tue, 2 Nov 2010 14:13:12 +0000 Subject: --- doc/setup/byhand.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn index 86cff5af4..75a5648d5 100644 --- a/doc/setup/byhand.mdwn +++ b/doc/setup/byhand.mdwn @@ -104,7 +104,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done! There are lots of other configuration options in ikiwiki.setup that you can uncomment, configure, and enable by re-running `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the -[[plugins]].. +[[plugins]]. ## Put your wiki in revision control. -- cgit v1.2.3 From a194fbc5bced565fa751008b8ada666c411d097d Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Wed, 3 Nov 2010 21:12:48 +0000 Subject: Add myself. --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 54fa1d57b..d8e55bace 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -160,6 +160,7 @@ Personal sites and blogs * [Thomas Kane](http://planetkane.org/) * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 +* [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From c3624227620f5034fa84b3cb1294a61fc08eeea9 Mon Sep 17 00:00:00 2001 From: civiccents Date: Wed, 3 Nov 2010 21:54:17 +0000 Subject: test --- doc/sandbox/D-Liberative.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/D-Liberative.wiki diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki new file mode 100644 index 000000000..69071521a --- /dev/null +++ b/doc/sandbox/D-Liberative.wiki @@ -0,0 +1 @@ +For now its just a concept... what if we could map deliberative capacity? -- cgit v1.2.3 From 23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" Date: Wed, 3 Nov 2010 23:34:53 +0000 Subject: --- doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn new file mode 100644 index 000000000..3e6c23241 --- /dev/null +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn @@ -0,0 +1,19 @@ +What I wanted +------------- + +I thought to myself it would be nice to see from the console the dates that my ikiwiki blog posts were published. Especially as I would like to know the order of my todo list without having to view the webpage. + +What I discovered +----------------- + +Looked at the code and saw the functions for grabbing the ctime from git but couldn't reconcile them to the "Posted" date in the RSS feed. Some more reading and I figured out that the Posted time is taken from the UNIX ctime when first uploaded into the repository and this information is stored in the page state via a Perl storable database - indexdb. (I'm sure most know this but to be clear in UNIX ctime is *not* the actual creation time of a file. UNIX has no facility for recording the actual creation time - however on first upload to the wiki it's good enough). + +Wrote a Perl script to query and sort indexdb. Now I can list my todos or blog posts in the order they appear on the web. Handy. + +However the ikiwiki state is specifically excluded via '.gitignore'. I work a lot on trains and not having this file in my cloned wiki means I can't list published posts or my todos in the proper order. I can get an approximation from git logs but, dam it, I want it the same! + +What can I do? +-------------- + +Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? + -- cgit v1.2.3 From c8537b41320e1f38b2369f24431423dfb2f14b15 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Thu, 4 Nov 2010 10:58:53 +0000 Subject: --- doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn index 3e6c23241..0c1da5b97 100644 --- a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn @@ -17,3 +17,12 @@ What can I do? Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? +> Have you tried running ikiwiki with the `--gettime` option on your laptop, +> to force it to retrieve initial commit times from git? You should only +> need to do that once, and it'll be cached in the pagestate thereafter. +> +> Because that functionality is slow on every supported VCS except git, +> ikiwiki tries to avoid using it unless it's really needed. [[rcs]] +> lists it as "fast" for git, though, so depending how fast it really is +> and how large your wiki is, you might be able to get away with running +> ikiwiki with `--gettime` all the time? --[[smcv]] -- cgit v1.2.3 From a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" Date: Thu, 4 Nov 2010 11:52:53 +0000 Subject: Added a comment --- .../comment_1_87304dfa2caea7e526cdb04917524e8c._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment new file mode 100644 index 000000000..62bae02b0 --- /dev/null +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" + nickname="Matt" + subject="comment 1" + date="2010-11-04T11:52:53Z" + content=""" +Perhaps I have a different setup from you but on my laptop I don't have ikiwiki installed - only a clone of the git repo. You mean to run --gettime on the post-update git hook? +"""]] -- cgit v1.2.3 From 415effbb43663ad756d78b3e957ac593d0227a74 Mon Sep 17 00:00:00 2001 From: civiccents Date: Thu, 4 Nov 2010 20:40:10 +0000 Subject: grammer --- doc/sandbox/D-Liberative.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki index 69071521a..b8c94f310 100644 --- a/doc/sandbox/D-Liberative.wiki +++ b/doc/sandbox/D-Liberative.wiki @@ -1 +1 @@ -For now its just a concept... what if we could map deliberative capacity? +For now its just a concept... what if a community could map its deliberative capacity? -- cgit v1.2.3 From 1f32f5e6184b6354f671ae71578f1158c49168b6 Mon Sep 17 00:00:00 2001 From: harishcm Date: Fri, 5 Nov 2010 09:01:58 +0000 Subject: Put link to personal website --- doc/users/harishcm.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn index 164711022..292a3bfad 100644 --- a/doc/users/harishcm.mdwn +++ b/doc/users/harishcm.mdwn @@ -1 +1 @@ -Using ikiwiki for my yet to be published personal website :) +Using ikiwiki for my personal website -- cgit v1.2.3 From 65873fee5e1dda78d6cf561cdd81a5dcd6d2735d Mon Sep 17 00:00:00 2001 From: "http://cristian.regolo.cc/" Date: Fri, 5 Nov 2010 15:49:36 +0000 Subject: add link to tag plugin page --- doc/examples/blog.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index b25601227..5f8f6c3ce 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -10,8 +10,8 @@ Some additional configuration you might want to do, if not using * Make sure to configure ikiwiki to generate RSS or Atom feeds. -* Make sure you have the tag plugin enabled, and the `tagbase` set to - "tags". Tag pages will then automatically be created. +* Make sure you have the [[tag|plugins/tag]] plugin enabled, and the + `tagbase` set to "tags". Tag pages will then automatically be created. An example of how to tag a post is: \[[!tag life]] -- cgit v1.2.3 From 87a42450e1ac8e2e01b7ed2785ed43040fd14ed3 Mon Sep 17 00:00:00 2001 From: "http://jugglingbits.wordpress.com/" Date: Sat, 6 Nov 2010 07:51:29 +0000 Subject: --- doc/forum/How_to_list_new_pages__44___inline__63__.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/How_to_list_new_pages__44___inline__63__.mdwn diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn new file mode 100644 index 000000000..f28e8b99b --- /dev/null +++ b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn @@ -0,0 +1,5 @@ +Hi, I'd love to include a "New posts" list into my front page, like at for example. + +It should be different from recent changes in that it shouldn't show modifications of existing pages, and in that it would be inside a page with other content. + +Thanks, Thomas -- cgit v1.2.3 From eaa04125d7080a9c882b629d1e0f6c7992ad462f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" Date: Sat, 6 Nov 2010 09:15:29 +0000 Subject: Added crucial hello-world line --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index c665e67f0..df9d688b8 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,3 +1,5 @@ +Hello, world! + This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). -- cgit v1.2.3 From cbcd9077ad5fbef8c0622ea9c78a66c9baece804 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" Date: Sat, 6 Nov 2010 09:17:43 +0000 Subject: --- doc/sandbox/Testing_blog_entry.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/sandbox/Testing_blog_entry.mdwn diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn new file mode 100644 index 000000000..aa5fa5b20 --- /dev/null +++ b/doc/sandbox/Testing_blog_entry.mdwn @@ -0,0 +1,7 @@ +# Be cool, this is a test! + +Hello guys, this is *just a test* entry. + +* Did I say +* that I love +* bulleted lists? -- cgit v1.2.3 From 408af2bb9e10d2ed899e17f9814a5514c0254dc8 Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Sun, 7 Nov 2010 04:37:14 +0000 Subject: A wish for a noninvasive autoindex. --- doc/plugins/autoindex/discussion.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index 2d6b6f1f0..a48fe9df1 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -61,3 +61,15 @@ If you just don't want to clutter your git repo, below it's a patch does the fol Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] + +------ + +`autoindex_commit => 0` would be nice, but uncommited files are definitely not. +
+remote: From /srv/git/test3
+remote:    3047077..1df636c  master     -> origin/master
+remote: error: Untracked working tree file 'test.mdwn' would be overwritten by merge.  Aborting
+remote: 'git pull --prune origin' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 201.
+
+ +It'd be nice if we were able to notice directories with no associated compilable markup files and compile a simple map directive straight to HTML without any intermediate markup file being involved at all. -- JoeRayhawk -- cgit v1.2.3 From 93e15cc84f47a1340f8bd06d7056ba423fe510bb Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:02:36 +0000 Subject: --- doc/plugins/autoindex/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index a48fe9df1..d8b9be6e0 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -1,6 +1,11 @@ Would it be possible to add an option to only generate the index files for the html output and not place the markdown files in the wiki source? +> Or better still, add a mechanism for ikiwiki to hold transient source +> pages in memory and render them as if they existed, without actually +> writing them out, as [[JoeRayhawk]] suggests below? I think +> add_autofile would be the way to do this. --[[smcv]] + The reason being that I have a lot of directories which need to be autoindexed, but I would prefer if the index files didn't clutter up my git repository. -- cgit v1.2.3 From 0e4e3f7cae25082fc90a93dee41b397b0ae9be09 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:10:20 +0000 Subject: suggested in two places => useful? --- doc/todo/transient_in-memory_pages.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/todo/transient_in-memory_pages.mdwn diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn new file mode 100644 index 000000000..9808ffdfe --- /dev/null +++ b/doc/todo/transient_in-memory_pages.mdwn @@ -0,0 +1,20 @@ +On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]] +suggests: + +> Instead of creating a file that gets checked in into the RCS, the +> source files could be left out and the output files be written as +> long as there is no physical source file (think of a virtual underlay). +> Something similar would be required to implement alias directive, +> which couldn't be easily done by writing to the RCS as the page's +> contents can change depending on which other pages claim it as an alias. + +`add_autofile` could be adapted to do this, or a similar API could be +added. + +This would also be useful for autoindex, as suggested on +[[plugins/autoindex/discussion]]. I'd also like to use it for +[[plugins/contrib/album]]. + +One refinement I'd suggest is that if the transient page is edited, +its transient contents are evaluated and used as the initial +content for the edit box; after that, it'd become a static page. --[[smcv]] -- cgit v1.2.3 From db3fb406733b98535d426acedd58f1633df79ade Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:11:32 +0000 Subject: --- doc/todo/autoindex_should_use_add__95__autofile.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/todo/autoindex_should_use_add__95__autofile.mdwn diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn new file mode 100644 index 000000000..517567e58 --- /dev/null +++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn @@ -0,0 +1,2 @@ +`add_autofile` is a generic version of [[plugins/autoindex]]'s code, +so the latter should probably use the former. --[[smcv]] -- cgit v1.2.3 From 2c17255b6641e33374a446ca281a0ad6d46af1dc Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:14:26 +0000 Subject: cross-references --- doc/plugins/autoindex/discussion.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index d8b9be6e0..b09481cdc 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -4,7 +4,9 @@ for the html output and not place the markdown files in the wiki source? > Or better still, add a mechanism for ikiwiki to hold transient source > pages in memory and render them as if they existed, without actually > writing them out, as [[JoeRayhawk]] suggests below? I think -> add_autofile would be the way to do this. --[[smcv]] +> add_autofile would be the way to do this. +> I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]] +> and [[todo/transient in-memory pages]]. --[[smcv]] The reason being that I have a lot of directories which need to be autoindexed, but I would prefer if the index files didn't clutter up my git repository. -- cgit v1.2.3 From 9c42f5786601429a0b921d6591ebf5e4c1eb4da8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:17:07 +0000 Subject: put the problematic patch in a toggleable to make discussion more visible --- doc/plugins/autoindex/discussion.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index b09481cdc..6b13d2342 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -22,6 +22,8 @@ If you just don't want to clutter your git repo, below it's a patch does the fol * If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend. +[[!toggle id="patch-for-autoindex_commit" text="patch for autoindex_commit"]] +[[!toggleable id="patch-for-autoindex_commit" text=""" 
 --- autoindex.pm.orig	2009-10-01 17:13:51.000000000 +0800
 +++ autoindex.pm	2009-10-01 17:21:09.000000000 +0800
@@ -65,7 +67,7 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
  				gettext("automatic index generation"),
  				undef, undef);
- +"""]] Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] -- cgit v1.2.3 From af75602391ac9651e7594c65588da86d591f2c01 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc" Date: Mon, 8 Nov 2010 13:31:35 +0000 Subject: --- doc/sandbox/Mooooo.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/Mooooo.mdwn diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn new file mode 100644 index 000000000..6f11d357c --- /dev/null +++ b/doc/sandbox/Mooooo.mdwn @@ -0,0 +1 @@ +Hrm. -- cgit v1.2.3 From 2fdda536ec6bee1eff3b71c214753078cd588f8f Mon Sep 17 00:00:00 2001 From: "143.215.206.35" <143.215.206.35@web> Date: Mon, 8 Nov 2010 20:54:58 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 05991ff72..02f7afbc0 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] -- cgit v1.2.3 From 9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2 Mon Sep 17 00:00:00 2001 From: "134.100.5.65" <134.100.5.65@web> Date: Tue, 9 Nov 2010 20:05:26 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 02f7afbc0..5b145fee4 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]] -- cgit v1.2.3 From 171c429f829aac53cb449e3bb574d2a1669e025e Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Wed, 10 Nov 2010 00:53:10 +0000 Subject: make match_glob faster - patch! --- ...mproving_the_efficiency_of_match__95__glob.mdwn | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn new file mode 100644 index 000000000..8f70f1dde --- /dev/null +++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn @@ -0,0 +1,39 @@ +I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob. This matcher is a good one to improve the speed of, because it gets called so many times. + +Here's my patch - please consider it! -- [[KathrynAndersen]] + +-------------------------------------------------------------- +
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 08a3d78..c187b98 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -2482,6 +2482,8 @@ sub derel ($$) {
+ 	return $path;
+ }
+ 
++my %glob_cache;
++
+ sub match_glob ($$;@) {
+ 	my $page=shift;
+ 	my $glob=shift;
+@@ -2489,8 +2491,15 @@ sub match_glob ($$;@) {
+ 	
+ 	$glob=derel($glob, $params{location});
+ 
+-	my $regexp=IkiWiki::glob2re($glob);
+-	if ($page=~/^$regexp$/i) {
++	# Instead of converting the glob to a regex every time,
++	# cache the compiled regex to save time.
++	if (!exists $glob_cache{$glob}
++	    or !defined $glob_cache{$glob})
++	{
++	    my $re=IkiWiki::glob2re($glob);
++	    $glob_cache{$glob} = qr/^$re$/i;
++	}
++	if ($page =~ $glob_cache{$glob}) {
+ 		if (! IkiWiki::isinternal($page) || $params{internal}) {
+ 			return IkiWiki::SuccessReason->new("$glob matches $page");
+ 		}
+
+-------------------------------------------------------------- -- cgit v1.2.3 From e810fe394b49955971299329136d46548d95ec6b Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 10 Nov 2010 13:26:16 +0000 Subject: possible improvement --- doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn index 8f70f1dde..0a9d8c69c 100644 --- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn @@ -2,6 +2,10 @@ I've been profiling my IkiWiki to try to improve speed (with many pages makes sp Here's my patch - please consider it! -- [[KathrynAndersen]] +> It seems to me as though changing `glob2re` to return qr/$re/, and calling +> `memoize(glob2re)` next to the other memoize calls, would be a less +> verbose way to do this? --[[smcv]] + -------------------------------------------------------------- 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 08a20a3deaca2cb1f68fba993411b51c19e4c362 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Wed, 10 Nov 2010 11:37:59 -0400
Subject: benchmarks

---
 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 0a9d8c69c..b63128702 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -6,6 +6,9 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 > `memoize(glob2re)` next to the other memoize calls, would be a less
 > verbose way to do this? --[[smcv]]
 
+>> I think so, yeah. Anyway, do you have any benchmark results handy,
+>> Kathryn?  --[[Joey]] 
+
 --------------------------------------------------------------
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From f35f79a0b831e8b47f62c430c1bba538d4687521 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Wed, 10 Nov 2010 21:08:45 +0000
Subject: response with benchmark

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index b63128702..ff9784dd1 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -9,6 +9,47 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >> I think so, yeah. Anyway, do you have any benchmark results handy,
 >> Kathryn?  --[[Joey]] 
 
+>>> See below.
+>>> Also, would it make more sense for glob2re to return qr/^$re$/i rather than qr/$re/?  Everything that uses glob2re seems to use
+	$foo =~ /^$re$/i
+>>> rather than /$re/ so I think that would make sense.
+>>> -- [[KathrynAndersen]]
+
+--------------------------------------------------------------
+Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+
+Before:
+
+time elapsed (wall):   27.4173
+time running program:  22.5909  (82.40%)
+time profiling (est.): 4.8264  (17.60%)
+number of calls:       1314729
+number of exceptions:  65
+
+%Time    Sec.     #calls   sec/call  F  name
+11.05    2.4969    62333   0.000040     IkiWiki::PageSpec::match_glob
+ 4.10    0.9261      679   0.001364     Text::Balanced::_match_tagged
+ 2.72    0.6139    59812   0.000010     IkiWiki::SuccessReason::merge_influences
+

+
+After:
+
+time elapsed (wall):   26.1843
+time running program:  21.5673  (82.37%)
+time profiling (est.): 4.6170  (17.63%)
+number of calls:       1252433
+number of exceptions:  65
+
+%Time    Sec.     #calls   sec/call  F  name
+ 7.66    1.6521    62333   0.000027     IkiWiki::PageSpec::match_glob
+ 4.33    0.9336      679   0.001375     Text::Balanced::_match_tagged
+ 2.81    0.6057    59812   0.000010     IkiWiki::SuccessReason::merge_influences
+

+
+Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
+
+K.A.
+
 --------------------------------------------------------------
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 8806a9795116e73ec851dfea89af45a786fbe6da Mon Sep 17 00:00:00 2001
From: dark 
Date: Thu, 11 Nov 2010 21:49:10 +0000
Subject: poll vote (Accept both)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 5b145fee4..87f640321 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 41 "Accept both"]]
-- 
cgit v1.2.3


From 0a7db85f06674311b80b490dfc238a1eaed040f8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"
 
Date: Thu, 11 Nov 2010 23:01:14 +0000
Subject:

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..90713d1f2 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
-## developer resources
+## developer resources sas
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 289b30a47d548326aad9c1dc5252fc0269494c87 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Thu, 11 Nov 2010 23:59:24 -0400
Subject: Fix htmlscrubber_skip to be matched on the source page, not the page
 it is inlined into. Should allow setting to "* and !comment(*)" to scrub
 comments, but leave your blog posts unscrubbed, etc.

---
 IkiWiki/Plugin/htmlscrubber.pm | 4 ++--
 debian/changelog               | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 927792f79..a58a27d52 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -57,8 +57,8 @@ sub sanitize (@) {
 
 	if (exists $config{htmlscrubber_skip} &&
 	    length $config{htmlscrubber_skip} &&
-	    exists $params{destpage} &&
-	    pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+	    exists $params{page} &&
+	    pagespec_match($params{page}, $config{htmlscrubber_skip})) {
 		return $params{content};
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 59d7eb761..63e13896e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
     (Thanks, Craig Lennox and Tuomas Jormola)
   * git: Use author date, not committer date. Closes: #602012
     (Thanks, Tuomas Jormola)
+  * Fix htmlscrubber_skip to be matched on the source page, not the page it is
+    inlined into. Should allow setting to "* and !comment(*)" to scrub
+    comments, but leave your blog posts unscrubbed, etc.
 
  -- Joey Hess   Mon, 25 Oct 2010 22:30:29 -0400
 
-- 
cgit v1.2.3


From d5056fb61e8332fea658363e931ec28a35681ffe Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:24:33 -0400
Subject: add example of skipping blog posts while scrubbing comments

---
 doc/plugins/htmlscrubber.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
index c59b46e14..080575c46 100644
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@@ -32,10 +32,11 @@ other HTML-related functionality, such as whether [[meta]] allows
 potentially unsafe HTML tags.
 
 The `htmlscrubber_skip` configuration setting can be used to skip scrubbing
-of some pages. Set it to a [[ikiwiki/PageSpec]], such as "!*/Discussion",
-and pages matching that can have all the evil CSS, JavsScript, and unsafe
-html elements you like. One safe way to use this is to use [[lockedit]] to
-lock those pages, so only admins can edit them.
+of some pages. Set it to a [[ikiwiki/PageSpec]], such as 
+"posts/* and !comment(*) and !*/Discussion", and pages matching that can have
+all the evil CSS, JavsScript, and unsafe html elements you like. One safe
+way to use this is to use [[lockedit]] to lock those pages, so only admins
+can edit them.
 
 ----
 
-- 
cgit v1.2.3


From 0ea5f43790fe2ce3cc40e9513191e72c67a1ee51 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:24:52 -0400
Subject: security issue

---
 doc/security.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 34a005239..33b199247 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -440,3 +440,16 @@ with the release of ikiwiki 3.20100312.
 A fix was also backported to Debian etch, as version 2.53.5. I recommend
 upgrading to one of these versions if your wiki can be edited by third
 parties.
+
+## javascript insertation via insufficient htmlscrubbing of comments
+
+Kevin Riggle noticed that it was not possible to configure
+`htmlscrubber_skip` to scrub comments while leaving unscubbed the text
+of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
+scrub comments.
+
+Additionally, it was discovered that comments' html was never scrubbed during
+preview or moderation of comments.
+
+These problems were discovered on 12 November 2010 and fixed the same
+hour with the release of ikiwiki 3.20101112.
-- 
cgit v1.2.3


From 78de33d2eaf8a187b610685f70e60b7d5946374f Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:25:31 -0400
Subject: comments: Make postcomment() pagespec work when previewing a comment.

---
 IkiWiki/Plugin/comments.pm | 6 ++++++
 debian/changelog           | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 851f4862e..57f5b1304 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -727,6 +727,10 @@ sub previewcomment ($$$) {
 	my $page=shift;
 	my $time=shift;
 
+	# Previewing a comment should implicitly enable comment posting mode.
+	my $oldpostcomment=$postcomment;
+	$postcomment=1;
+
 	my $preview = IkiWiki::htmlize($location, $page, '_comment',
 			IkiWiki::linkify($location, $page,
 			IkiWiki::preprocess($location, $page,
@@ -745,6 +749,8 @@ sub previewcomment ($$$) {
 
 	$template->param(have_actions => 0);
 
+	$postcomment=$oldpostcomment;
+
 	return $template->output;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 63e13896e..91a678805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
     inlined into. Should allow setting to "* and !comment(*)" to scrub
     comments, but leave your blog posts unscrubbed, etc.
+  * comments: Make postcomment() pagespec work when previewing a comment,
+    including during moderation.
 
  -- Joey Hess   Mon, 25 Oct 2010 22:30:29 -0400
 
-- 
cgit v1.2.3


From d8de98911ec98f9e4560ab2939b4edf8fb04066b Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:36:03 -0400
Subject: comments: Make comment() pagespec also match comments that are being
 posted.

---
 IkiWiki/Plugin/comments.pm | 18 ++++++++++--------
 debian/changelog           |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 57f5b1304..a39dab36c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -947,14 +947,16 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	# To see if it's a comment, check the source file type.
-	# Deal with comments that were just deleted.
-	my $source=exists $IkiWiki::pagesources{$page} ?
-		$IkiWiki::pagesources{$page} :
-		$IkiWiki::delpagesources{$page};
-	my $type=defined $source ? IkiWiki::pagetype($source) : undef;
-	if (! defined $type || $type ne "_comment") {
-		return IkiWiki::FailReason->new("$page is not a comment");
+	if (! $postcomment) {
+		# To see if it's a comment, check the source file type.
+		# Deal with comments that were just deleted.
+		my $source=exists $IkiWiki::pagesources{$page} ?
+			$IkiWiki::pagesources{$page} :
+			$IkiWiki::delpagesources{$page};
+		my $type=defined $source ? IkiWiki::pagetype($source) : undef;
+		if (! defined $type || $type ne "_comment") {
+			return IkiWiki::FailReason->new("$page is not a comment");
+		}
 	}
 
 	return match_glob($page, "$glob/*", internal => 1, @_);
diff --git a/debian/changelog b/debian/changelog
index 91a678805..2c4c9274a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
     comments, but leave your blog posts unscrubbed, etc.
   * comments: Make postcomment() pagespec work when previewing a comment,
     including during moderation.
+  * comments: Make comment() pagespec also match comments that are being
+    posted.
 
  -- Joey Hess   Mon, 25 Oct 2010 22:30:29 -0400
 
-- 
cgit v1.2.3


From 5dbf25127fb776cc52a3a142b805a0c7f3cef242 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:45:00 -0400
Subject: releasing version 3.20101112

---
 debian/changelog  |  4 ++--
 doc/security.mdwn |  2 +-
 ikiwiki.spec      |  2 +-
 po/ikiwiki.pot    | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c4c9274a..f8dc04eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20101024) UNRELEASED; urgency=low
+ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.
   * highlight: Ensure that other, more-specific format plugins,
@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
   * comments: Make comment() pagespec also match comments that are being
     posted.
 
- -- Joey Hess   Mon, 25 Oct 2010 22:30:29 -0400
+ -- Joey Hess   Fri, 12 Nov 2010 00:36:06 -0400
 
 ikiwiki (3.20101023) unstable; urgency=low
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 33b199247..2c342b199 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
 scrub comments.
 
 Additionally, it was discovered that comments' html was never scrubbed during
-preview or moderation of comments.
+preview or moderation of comments with such a configuration.
 
 These problems were discovered on 12 November 2010 and fixed the same
 hour with the release of ikiwiki 3.20101112.
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 7653ac671..5ef43903d 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20101023
+Version: 3.20101112
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index fa65b6f93..e4274d0f6 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 17:21-0400\n"
+"POT-Creation-Date: 2010-11-12 00:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:822
+#: ../IkiWiki/Plugin/comments.pm:828
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -278,7 +278,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
+#: ../IkiWiki/Plugin/comments.pm:838
 msgid "Comment"
 msgstr ""
 
@@ -411,7 +411,7 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/htmltidy.pm:62
+#: ../IkiWiki/Plugin/htmltidy.pm:63
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-- 
cgit v1.2.3


From 65ecc73755348f1ed13b77b2f4bdf9db4e465be4 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:46:29 -0400
Subject: add news item for ikiwiki 3.20101112

---
 doc/news/version_3.20100831.mdwn | 27 ---------------------------
 doc/news/version_3.20101112.mdwn | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 doc/news/version_3.20100831.mdwn
 create mode 100644 doc/news/version_3.20101112.mdwn

diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn
deleted file mode 100644
index 152e3c2f7..000000000
--- a/doc/news/version_3.20100831.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-ikiwiki 3.20100831 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * filecheck: Fall back to using the file command if the freedesktop
-     magic file cannot identify a file.
-   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
-     at a flattr plugin! This one is less configurable, but simpler.)
-   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
-   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
-     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
-     the bug and providing access to debug it.
-   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
-   * htmlscrubber: Do not scrub url anchors that contain colons.
-   * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673)
-   * highlight: Make location of highlight's files configurable in setup
-     file to allow for nonstandard installations.
-   * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
-   * Run the preprocess hooks in scan mode *before* the scan hooks.
-     This allows the po plugin to register a scan hook that runs
-     last and rescans pages after all data from the first scan pass is
-     completed. This avoids the po plugin needing to rebuild some pages.
-     (intrigeri)
-   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
-     setup. (intrigeri)
-   * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
-     bzr whoami before committing.
-   * httpauth: Avoid redirecting the user to the cgiauthurl if
-     they already have a login session."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101112.mdwn b/doc/news/version_3.20101112.mdwn
new file mode 100644
index 000000000..ad591445f
--- /dev/null
+++ b/doc/news/version_3.20101112.mdwn
@@ -0,0 +1,17 @@
+ikiwiki 3.20101112 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * txt: Fix display when used inside a format directive.
+   * highlight: Ensure that other, more-specific format plugins,
+     like txt are used in preference to this one in case of ties.
+   * htmltidy, sortnaturally: Add missing checkconfig hook
+     registration. Closes: #[601912](http://bugs.debian.org/601912)
+     (Thanks, Craig Lennox and Tuomas Jormola)
+   * git: Use author date, not committer date. Closes: #[602012](http://bugs.debian.org/602012)
+     (Thanks, Tuomas Jormola)
+   * Fix htmlscrubber\_skip to be matched on the source page, not the page it is
+     inlined into. Should allow setting to "* and !comment(*)" to scrub
+     comments, but leave your blog posts unscrubbed, etc.
+   * comments: Make postcomment() pagespec work when previewing a comment,
+     including during moderation.
+   * comments: Make comment() pagespec also match comments that are being
+     posted."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"
 
Date: Fri, 12 Nov 2010 13:35:34 +0000
Subject:

---
 doc/todo/Add_nicer_math_formatting.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
index 6e082c102..3a5e94a14 100644
--- a/doc/todo/Add_nicer_math_formatting.mdwn
+++ b/doc/todo/Add_nicer_math_formatting.mdwn
@@ -21,4 +21,6 @@ It would be nice to add nicer math formatting.  I currently use the
 > I've posted a question about this to its forum:  --[[Joey]] 
 >  
 
+I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow.
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 5f750e16b8c32d2fd69209f433e7d19efa53a71f Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 10:25:21 -0400
Subject: CVE id

---
 debian/changelog  | 6 +++---
 doc/security.mdwn | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8dc04eca..582a8e36a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH
     (Thanks, Tuomas Jormola)
   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
     inlined into. Should allow setting to "* and !comment(*)" to scrub
-    comments, but leave your blog posts unscrubbed, etc.
+    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
   * comments: Make postcomment() pagespec work when previewing a comment,
-    including during moderation.
+    including during moderation. CVE-2010-1673
   * comments: Make comment() pagespec also match comments that are being
-    posted.
+    posted. CVE-2010-1673
 
  -- Joey Hess   Fri, 12 Nov 2010 00:36:06 -0400
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 2c342b199..4fa531eb1 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during
 preview or moderation of comments with such a configuration.
 
 These problems were discovered on 12 November 2010 and fixed the same
-hour with the release of ikiwiki 3.20101112.
+hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]])
-- 
cgit v1.2.3


From 98d0883c8949e6cde8db019bb282d5fa815ffc1a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sun, 14 Nov 2010 16:50:31 +0000
Subject: branches imported into git; benchmark results

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 71 ++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index ff9784dd1..c4d3a8ecb 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -15,6 +15,11 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>> rather than /$re/ so I think that would make sense.
 >>> -- [[KathrynAndersen]]
 
+>>>> Git branch `smcv/ka-glob-cache` has Kathryn's patch. Git
+>>>> branch `smcv/memoize-glob2re` does as I suggested, which
+>>>> is less verbose than Kathryn's patch but also not as
+>>>> fast; I'm not sure why, tbh. --[[smcv]]
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
@@ -51,6 +56,72 @@ Note that the seconds per call for match_glob in the "after" case has gone down
 K.A.
 
 --------------------------------------------------------------
+
+A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
+like so:
+
+    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
+
+The docwiki appears to use fewer glob matches than Kathryn's wiki.
+
+With master:
+
+    time elapsed (wall):   29.6970
+    time running program:  24.6930  (83.15%)
+    time profiling (est.): 5.0041  (16.85%)
+    number of calls:       1359180
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
+    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
+     3.08    0.7598    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
+     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
+
+With my `smcv/memoize-glob2re` branch:
+
+    time elapsed (wall):   30.4931
+    time running program:  25.1248  (82.39%)
+    time profiling (est.): 5.3683  (17.61%)
+    number of calls:       1439943
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
+     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
+     3.97    0.9979    86905   0.000011     Memoize::_memoizer
+     3.05    0.7654    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
+
+and in a repeated run:
+
+     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
+
+With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
+
+    time elapsed (wall):   27.7567
+    time running program:  22.9941  (82.84%)
+    time profiling (est.): 4.7627  (17.16%)
+    number of calls:       1279946
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
+     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
+     3.30    0.7577    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
+     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
+
+and in a repeated run:
+
+     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
+
+--[[smcv]]
+
+--------------------------------------------------------------
+
+
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
 index 08a3d78..c187b98 100644
-- 
cgit v1.2.3


From 9d26a72468fad69d633875b4ffb4aff8abd80023 Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sun, 14 Nov 2010 18:19:46 +0000
Subject: point to my 'transient' branch

---
 ...o-create_tag_pages_according_to_a_template.mdwn |  2 ++
 .../autoindex_should_use_add__95__autofile.mdwn    |  2 ++
 doc/todo/transient_in-memory_pages.mdwn            | 23 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 676e2bc00..e065c4a3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -262,4 +262,6 @@ other pages claim it as an alias. --[[chrysn]]
 
 I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
 
+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
+
 [[!tag done]]
diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
index 517567e58..64f81c82e 100644
--- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
@@ -1,2 +1,4 @@
 `add_autofile` is a generic version of [[plugins/autoindex]]'s code,
 so the latter should probably use the former. --[[smcv]]
+
+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 9808ffdfe..5dbbe4f82 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -18,3 +18,26 @@ This would also be useful for autoindex, as suggested on
 One refinement I'd suggest is that if the transient page is edited,
 its transient contents are evaluated and used as the initial
 content for the edit box; after that, it'd become a static page. --[[smcv]]
+
+--------------------------
+
+[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
+[[!tag patch]]
+
+I had a look at implementing this. It turns out to be harder than I thought
+to have purely in-memory pages (several plugins want to be able to access the
+source file as a file), but I did get this proof-of-concept branch
+to write tag and autoindex pages into an underlay.
+
+This loses the ability to delete the auto-created pages (although they don't
+clutter up git this way, at least), and a lot of the code in autoindex is
+probably now redundant, so this is probably not quite ready for merge, but
+I'd welcome opinions.
+
+Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
+which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
+
+Refinements that could be made if this approach seems reasonable:
+
+* make these options boolean, and have the path always be `.ikiwiki/transient`
+* improve the `remove` plugin so it also deletes from this special underlay
-- 
cgit v1.2.3


From 608cef54d63ba60efd24ae14012dda7ff8d014a9 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 02:01:21 +0000
Subject: theory about differences in speed of memoize and non-memoize patches

---
 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index c4d3a8ecb..43571ead7 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -20,6 +20,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>> is less verbose than Kathryn's patch but also not as
 >>>> fast; I'm not sure why, tbh. --[[smcv]]
 
+>>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
-- 
cgit v1.2.3


From ffeee19216182d633d251852ab62fe79c1367796 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 05:43:56 +0000
Subject: make it more generic?

---
 doc/todo/transient_in-memory_pages.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 5dbbe4f82..816e95c38 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -41,3 +41,8 @@ Refinements that could be made if this approach seems reasonable:
 
 * make these options boolean, and have the path always be `.ikiwiki/transient`
 * improve the `remove` plugin so it also deletes from this special underlay
+
+>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
+>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
+>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
+>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 263cfa7d1e938e3b41d1b6826427f0d613b2b97c Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:08:30 +0000
Subject: aggregate: too long filenames

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/aggregate_generates_long_filenames.mdwn

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
new file mode 100644
index 000000000..cb5e6df73
--- /dev/null
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -0,0 +1,10 @@
+the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
+generate long titles.  Especially once you throw escaping into the mix:
+
+    $ ikiwiki --setup testsetup --aggregate --refresh
+    failed to write ./test/lifestream/Hidden_Features_Of_Perl__44___PHP__44___Javascript__44___C__44___C++__44___C__35____44___Java__44___Ruby___46____46____46__._aggregated.ikiwiki-new: File name too long
+    aggregation failed with code 9216
+    $ echo $?
+    25
+
+-- [[Jon]]
-- 
cgit v1.2.3


From 471ac78068532da53e4dad49d52c5ddccfcbff21 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:09:41 +0000
Subject: typo

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index cb5e6df73..3d98ee8b2 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -1,4 +1,4 @@
-the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
+the [[plugins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
 generate long titles.  Especially once you throw escaping into the mix:
 
     $ ikiwiki --setup testsetup --aggregate --refresh
-- 
cgit v1.2.3


From 85ee24a9e53aec7d70bb4fb758428e59ea76e853 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:11:40 +0000
Subject:

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index 3d98ee8b2..40decb392 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -7,4 +7,7 @@ generate long titles.  Especially once you throw escaping into the mix:
     $ echo $?
     25
 
+It would also appear this abrubtly terminates aggregate processing (if not ikiwiki itself).  Only after moving my test repo to `/tmp` to shorten the filename did I see newer RSS feeds (from a totally different source) picked up.
+
+
 -- [[Jon]]
-- 
cgit v1.2.3


From 5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 15 Nov 2010 11:14:21 +0000
Subject: more discussion

---
 doc/todo/transient_in-memory_pages.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 816e95c38..edf056e4a 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -46,3 +46,21 @@ Refinements that could be made if this approach seems reasonable:
 >> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
 >> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
 >> --[[KathrynAndersen]]
+
+>>> What I had in mind was more like `tag_autocreate_transient => 1` or
+>>> `autoindex_transient => 1`; you might conceivably want tags to be
+>>> checked in but autoindices to be transient, and it's fine for each
+>>> plugin to make its own decision. Going from that to one boolean
+>>> (or just always-transient if people don't think that's too
+>>> astonishing) would be trivial, though.
+>>>
+>>> I don't think relocating the transient underlay really makes sense,
+>>> except for prototyping: you only want one, and `.ikiwiki` is as good
+>>> a place as any (ikiwiki already needs to be able to write there).
+>>>
+>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
+>>> pages always-transient - you can always make a transient page
+>>> permanent by editing it, after all.
+>>>
+>>> Do you think this approach has enough potential that I should
+>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
-- 
cgit v1.2.3


From 53e519931f3a6b7cea0af652d749344757d4e2bc Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:23:01 +0000
Subject: template files being treated as regular pages and the problems that
 can cause

---
 ...c:_mixing_templates_and_creation__95__date.mdwn | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
new file mode 100644
index 000000000..70af505c1
--- /dev/null
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -0,0 +1,58 @@
+I get the following error when building my wiki
+
+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
+
+that line corresponds to
+
+    sub match_creation_year ($$;@) {
+	if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { <-- this one
+		return IkiWiki::SuccessReason->new('creation_year matched');
+	}
+
+A git bisect shows that the offending commit introduced this hunk
+
+
+    --- /dev/null
+    +++ b/templates/all_entry.mdwn
+    @@ -0,0 +1,23 @@
+    +## 
+    +
+    +There
+    +
+    +have been
+    +
+    +were
+    +
+    +[[!pagecount pages="
+    +log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
+    +and creation_year()
+    +and !*.png and !*.jpg
+    +"]] posts
+    +
+    +so far
+    +
+    +in .
+    +
+    +[[!inline pages="
+    +    log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
+    +    and creation_year()
+    +    and !*.png and !*.jpg
+    +    " archive=yes feeds=no]]
+
+The lines which feature creation_year() are most likely the culprits.  That would explain why the error was repeated twice, and would tally with the file in `templates/` being rendered, rather than the inclusionists.
+
+A workaround is to move the template outside of the srcdir into the external templates directory and include the file suffix when using it, e.g.
+
+    \[[!template id=all_entry.tmpl year=2010 current=true]]
+
+An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
+
+
+    \[[!if test="included()" then="""
+    ...template...
+    """ else="""
+    Nothing to see here.
+    """]]
+
+In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-- 
cgit v1.2.3


From da9e1ea667f82d5fca9168dbed19be08040570ff Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:28:05 +0000
Subject: guard templates with the if directive where necessary

---
 doc/ikiwiki/directive/template.mdwn | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index 9e3ae54df..df391f99e 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -60,22 +60,30 @@ few things:
   `text`.
 * To use one block of text if a variable is set and a second if it's not,
   use `textother text`
+* Each template file included in the wiki's source will also generate a regular
+  wiki page.  In many cases you might want to prevent some of your template
+  being interpreted for the regular page.  Use the [[if]] directive with the
+  `included()` test to guard the template code.
 
 Here's a sample template:
 
-        
-        Name: \[[]]

-        Age: 

-        
-        Favorite color: 

-        
-        No favorite color.

-        
-        
-        

-        
-        
-        
+        \[[!if test="included()" then="""
+          
+          Name: \[[]]

+          Age: 

+          
+            Favorite color: 

+          
+            No favorite color.

+          
+          
+            

+            
+          
+          
+        """ else="""
+          This is a template page.
+        """]]
 
 The filled out template will be formatted the same as the rest of the page
 that contains it, so you can include WikiLinks and all other forms of wiki
-- 
cgit v1.2.3


From 9d0ac3170a8f90d2139ef75698e8af21a6435fb4 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:28:50 +0000
Subject: done with commit da9e1ea667f82d5fca916

---
 ...ent_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 70af505c1..5485bba9c 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -56,3 +56,5 @@ An alternative fix is to wrap the entire template inside a test to see whether t
     """]]
 
 In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
+
+> [[done]] with  -- [[Jon]]
-- 
cgit v1.2.3


From 62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:41:40 +0000
Subject: I totally misinterpreted what included() is supposed to be for.

This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff
---
 doc/ikiwiki/directive/template.mdwn | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index df391f99e..9e3ae54df 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -60,30 +60,22 @@ few things:
   `text`.
 * To use one block of text if a variable is set and a second if it's not,
   use `textother text`
-* Each template file included in the wiki's source will also generate a regular
-  wiki page.  In many cases you might want to prevent some of your template
-  being interpreted for the regular page.  Use the [[if]] directive with the
-  `included()` test to guard the template code.
 
 Here's a sample template:
 
-        \[[!if test="included()" then="""
-          
-          Name: \[[]]

-          Age: 

-          
-            Favorite color: 

-          
-            No favorite color.

-          
-          
-            

-            
-          
-          
-        """ else="""
-          This is a template page.
-        """]]
+        
+        Name: \[[]]

+        Age: 

+        
+        Favorite color: 

+        
+        No favorite color.

+        
+        
+        

+        
+        
+        
 
 The filled out template will be formatted the same as the rest of the page
 that contains it, so you can include WikiLinks and all other forms of wiki
-- 
cgit v1.2.3


From 5430d5dc3bc37df92eb01cd65382c0f2be78b8e7 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:43:35 +0000
Subject: not quite done yet: if/included() doesn't work that way.

---
 ...sn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 5485bba9c..83093895b 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -46,8 +46,7 @@ A workaround is to move the template outside of the srcdir into the external tem
 
     \[[!template id=all_entry.tmpl year=2010 current=true]]
 
-An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
-
+I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with the `included()` test, would be an option here, E.g.
 
     \[[!if test="included()" then="""
     ...template...
@@ -55,6 +54,4 @@ An alternative fix is to wrap the entire template inside a test to see whether t
     Nothing to see here.
     """]]
 
-In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-
-> [[done]] with  -- [[Jon]]
+However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
-- 
cgit v1.2.3


From 84fff62948ad7c7aef664585e8afed86398e7fd4 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:46:13 +0000
Subject: note about template inclusion

---
 doc/ikiwiki/directive/if.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
index 2cbf70cdf..492adf499 100644
--- a/doc/ikiwiki/directive/if.mdwn
+++ b/doc/ikiwiki/directive/if.mdwn
@@ -43,6 +43,8 @@ with the following additional tests:
 
 * included()
 
-  Tests whether the page is being included onto another page.
+  Tests whether the page is being included onto another page, for example
+  via [[inline]] or [[map]].  Note that pages inserted into other pages
+  via [[template]] are not matched here.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From f6312319a49cc1860eebbafd937a0f75d8e7baeb Mon Sep 17 00:00:00 2001
From: "http://churchkey.org/author/ian/"
 
Date: Mon, 15 Nov 2010 15:50:37 +0000
Subject: added my reasons for wanting a replace-able template system

---
 doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index c4e78ca0b..8650e4f2a 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -58,3 +58,6 @@ Yes, Template::Toolkit is very powerful. But I think it's somehow overkill for a
 I'd have to agree that Template::Toolkit is overkill and personally I'm not a fan, but it is very popular (there is even a book) and the new version (3) is alleged to be much more nimble than current version.  --[[ajt]]
 
 HTML::Template's HTML-like markup prevents me from editing templates in KompoZer or other WYSIWYG HTML editors.  The editor tries to render the template markup rather than display it verbatim, and large parts of the template become invisible.  A markup syntax that doesn't confuse editors (such as Template::Toolkit's "[% FOO %]") may promote template customization.  The ability to replace the template engine would be within the spirit of ikiwiki's extensibility. --Rocco
+
+
+I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
-- 
cgit v1.2.3


From eb13521f5276cdd21a3f5990b1a1a17234e40174 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 23:00:48 +0000
Subject: modular, not replacement

---
 doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index 8650e4f2a..9725b6541 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -61,3 +61,5 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
 
 
 I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
+
+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 23:23:08 +0000
Subject: further thoughts

---
 doc/todo/transient_in-memory_pages.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index edf056e4a..9c1be7362 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -64,3 +64,11 @@ Refinements that could be made if this approach seems reasonable:
 >>>
 >>> Do you think this approach has enough potential that I should
 >>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
+
+>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
+>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
+>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
+>>>>
+>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
+>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
+>>>> -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From 9a7387a53be2b1e182003f3e86cb76d7f10c4b67 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:19:13 -0400
Subject: thoughts

---
 .../Improving_the_efficiency_of_match__95__glob.mdwn    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 43571ead7..0fc059ad7 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -22,6 +22,23 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 
 >>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
 
+>>>>>> What may be going on is that glob2re is already a fairly fast
+>>>>>> function, so the overhead of memoizing it with the very generic
+>>>>>> `_memoizer` (see its source) swamps the memoization gain. Note
+>>>>>> that the few functions memoized with the Memoizer before were much
+>>>>>> more expensive, so that little overhead was acceptable then.
+>>>>>>
+>>>>>> It also may be that Kathryn's patch is slightly faster due to using
+>>>>>> the construct `$foo =~ $regexp` rather than `$foo =~ /$regexp/`
+>>>>>> (probably avoids a copy or something like that internally) --
+>>>>>> this despite checking both `exists` and `defined` on the hash, which
+>>>>>> should be reundant AFAICS.
+>>>>>>
+>>>>>> My guess is that the best of both worlds would be to move
+>>>>>> the byhand memoization to glob2re and have it return a compiled
+>>>>>> `/^/i` regexp that can be used without further modifiction in most
+>>>>>> cases. --[[Joey]] 
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
-- 
cgit v1.2.3


From 8de7fde49c295a6c9098767b9fdfea79de8476eb Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:24:50 -0400
Subject: already fixed

---
 ...nt_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 83093895b..b1053fc38 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -55,3 +55,6 @@ I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with th
     """]]
 
 However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
+
+> As far as I know, this bug was fixed in
+> 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 2a452ddf146c4148155095e400f56b4674d76953 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:34:41 -0400
Subject: but it already checks length..

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index 40decb392..c38ad6c7b 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -11,3 +11,11 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
 
 
 -- [[Jon]]
+
+> I have to wonder what filesystem you have there where 147 characters
+> is a long filename. Ikiwiki already uses `POSIX::pathconf` on the srcdir
+> to look up `_PC_NAME_MAX`
+> to see if the filename is too long, and shortens it, so it seems
+> that, in additional to having a rather antique long filename limit, your
+> system also doesn't properly expose it via pathconf. Not sure what
+> ikiwiki can do here. --[[Joey]]
-- 
cgit v1.2.3


From 65e726f201d7b9919271cfe7e8a7314a6abf0fc3 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:42:52 -0400
Subject: response

---
 ...place_HTML::Template_with_Template_Toolkit.mdwn | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index 9725b6541..d55fc0aa8 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -5,9 +5,14 @@ features and thus makes it rather hard to give an ikiwiki site a consistent
 look. If you browse the templates provided in the tarball, you'll notice that
 more than one of them contain the `` tag, which is unnecessary.
 
+> Note that is no longer true, and I didn't have to do such an intrusive
+> change to fix it either. --[[Joey]]
+
 Maybe it's just me, I also find HTML::Template cumbersome to use, due in part
 to its use of capital letters.
 
+> Its entirely optional use of capital letters? --[[Joey]]
+
 Finally, the software seems unmaintained: the mailing list and searchable
 archives linked from
 
@@ -62,4 +67,21 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
 
 I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
 
-> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as
+> others have said above, it's overkill for my needs.  However, I also
+> agree that HTML::Template has its own problems too.  The idea of making
+> the template system modular, with a choice of which backend to use - I
+> really like that idea. It would enable me to use some other template
+> system I like better, such as Text::Template or Text::NeatTemplate. But I
+> think it would be a lot of work to implement, though perhaps no more work
+> than making the revision-control backend modular, I guess.  One would
+> need to write an IkiWiki template interface that didn't care what the
+> backend was, and yet is somehow still flexible enough to take advantage
+> of special features of different backends.  There are an *awful lot* of
+> things that use templates - not just the `pagetemplate` and `template`
+> plugins, but a number of others which have specialized templates of their
+> own. -- [[KathrynAndersen]]a
+
+>> A modular template system in ikiwiki is unlikely, as template objects
+>> are part of the API,  notably the `pagetemplate` hook. Unless the other
+>> system has a compatible template object. --[[Joey]] 
-- 
cgit v1.2.3


From b85ca8603aecbd3523201d99edf019db1094b558 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 14:24:15 -0400
Subject: websetup: Fix encoding problem when restoring old setup file.

---
 IkiWiki/Plugin/websetup.pm | 2 +-
 debian/changelog           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0ab18997c..9c032fdc6 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -475,7 +475,7 @@ sub showform ($$) {
 						join(" ", @command), $ret).
 					'
';
 				open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
-				print OUT $oldsetup;
+				print OUT Encode::encode_utf8($oldsetup);
 				close OUT;
 			}
 
diff --git a/debian/changelog b/debian/changelog
index 582a8e36a..91ff0964b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20101113) UNRELEASED; urgency=low
+
+  * websetup: Fix encoding problem when restoring old setup file.
+
+ -- Joey Hess   Tue, 16 Nov 2010 14:23:47 -0400
+
 ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.
-- 
cgit v1.2.3


From 021676e489f9b79a50338635ad654f31eb5575fe Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 14:45:53 -0400
Subject: improve html

display not changed, but I hope this will html2text better in rss2email,
and it's generally better
---
 templates/change.tmpl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 60a9d94b5..d7ec90875 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -27,12 +27,10 @@
 
Date:
 
 

-
- - + [[revert|wikiicons/revert.png]] - - + +
-- cgit v1.2.3 From ec6c1269d251c78d2eef68cb789de6cfc6272464 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:00:04 -0400 Subject: more: Add pages parameter to limit where the more is displayed. (thanks, dark) --- IkiWiki/Plugin/more.pm | 5 ++++- debian/changelog | 2 ++ doc/ikiwiki/directive/more.mdwn | 5 +++++ doc/todo/selective_more_directive.mdwn | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm index 80e339a1b..6880e366d 100644 --- a/IkiWiki/Plugin/more.pm +++ b/IkiWiki/Plugin/more.pm @@ -26,7 +26,10 @@ sub preprocess (@) { $params{linktext} = $linktext unless defined $params{linktext}; - if ($params{page} ne $params{destpage}) { + if ($params{page} ne $params{destpage} && + (! exists $params{pages} || + pagespec_match($params{destpage}, $params{pages}, + location => $params{page}))) { return "\n". htmllink($params{page}, $params{destpage}, $params{page}, linktext => $params{linktext}, diff --git a/debian/changelog b/debian/changelog index 91ff0964b..faabf1993 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * websetup: Fix encoding problem when restoring old setup file. + * more: Add pages parameter to limit where the more is displayed. + (thanks, dark) -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn index 506551910..bda1427f3 100644 --- a/doc/ikiwiki/directive/more.mdwn +++ b/doc/ikiwiki/directive/more.mdwn @@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this: If the `linktext` parameter is omitted it defaults to just "more". +An optional `pages` parameter can be used to specify a +[[ikiwiki/PageSpec]], and then the "more" link will only be displayed +when the page is inlined into a page matching that PageSpec, and otherwise +the full content shown. + Note that you can accomplish something similar using a [[toggle]] instead. [[!meta robots="noindex, follow"]] diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn index 24e6ab568..2a9998205 100644 --- a/doc/todo/selective_more_directive.mdwn +++ b/doc/todo/selective_more_directive.mdwn @@ -24,3 +24,5 @@ I can now call it as I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. -- [[dark]] + +> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] -- cgit v1.2.3 From daf89f59e61d9091fe27dd8738b40db5fa85a5e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:03:03 -0400 Subject: response --- doc/forum/PageSpec_results_from_independent_checkout.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn index 6b2fd6df0..693287d2b 100644 --- a/doc/forum/PageSpec_results_from_independent_checkout.mdwn +++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn @@ -3,3 +3,6 @@ I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk + +> It's not possible to build up enough state without at a minimum +> performing the scan pass of rendering on every page. --[[Joey]] -- cgit v1.2.3 From cedf2c0af568d801fe2cf1917ac0202ce64f838b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:12:52 -0400 Subject: Fix escaping of filenames in historyurl. (Thanks, aj) --- IkiWiki/Render.pm | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 7ea919abc..8e8336b99 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -5,7 +5,6 @@ package IkiWiki; use warnings; use strict; use IkiWiki; -use Encode; my (%backlinks, %rendered); our %brokenlinks; @@ -94,7 +93,8 @@ sub genpage ($$) { } if (defined $config{historyurl} && length $config{historyurl}) { my $u=$config{historyurl}; - $u=~s/\[\[file\]\]/$pagesources{$page}/g; + my $p=uri_escape_utf8($pagesources{$page}); + $u=~s/\[\[file\]\]/$p/g; $template->param(historyurl => $u); $actions++; } diff --git a/debian/changelog b/debian/changelog index faabf1993..00c32e95d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * websetup: Fix encoding problem when restoring old setup file. * more: Add pages parameter to limit where the more is displayed. (thanks, dark) + * Fix escaping of filenames in historyurl. (Thanks, aj) -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From c502b8fe548329d2904e928af3b581456a374a8a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:40:16 -0400 Subject: indentation --- IkiWiki/Plugin/inline.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index c00aed299..3b98bf8dd 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -104,7 +104,7 @@ sub checkconfig () { } sub format (@) { - my %params=@_; + my %params=@_; # Fill in the inline content generated earlier. This is actually an # optimisation. @@ -513,16 +513,16 @@ sub absolute_urls ($$) { my $url=$baseurl; $url=~s/[^\/]+$//; - # what is the non path part of the url? - my $top_uri = URI->new($url); - $top_uri->path_query(""); # reset the path - my $urltop = $top_uri->as_string; + # what is the non path part of the url? + my $top_uri = URI->new($url); + $top_uri->path_query(""); # reset the path + my $urltop = $top_uri->as_string; $content=~s/( Date: Tue, 16 Nov 2010 16:48:42 -0400 Subject: add test case for RSS url munging --- t/rssurls.t | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 t/rssurls.t diff --git a/t/rssurls.t b/t/rssurls.t new file mode 100755 index 000000000..870770496 --- /dev/null +++ b/t/rssurls.t @@ -0,0 +1,37 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 13; + +BEGIN { use_ok("IkiWiki::Plugin::inline"); } + +# Test the absolute_urls function, used to fix up relative urls for rss +# feeds. +sub test { + my $input=shift; + my $baseurl=shift; + my $expected=shift; + $expected=~s/URL/$baseurl/g; + is(IkiWiki::absolute_urls($input, $baseurl), $expected); + # try it with single quoting -- it's ok if the result comes back + # double or single-quoted + $input=~s/"/'/g; + my $expected_alt=$expected; + $expected_alt=~s/"/'/g; + my $ret=IkiWiki::absolute_urls($input, $baseurl); + ok(($ret eq $expected) || ($ret eq $expected_alt), "$ret vs $expected"); +} + +sub unchanged { + test($_[0], $_[1], $_[0]); +} + +my $url="http://example.com/blog/foo/"; +unchanged("foo", $url); +unchanged('', $url, ); +test('', $url, ''); +test('', $url, ''); +test('', $url, ''); +test('', $url, ''); +# off until bug #603736 is fixed +#test('