From d932fc32f33491fc9d0a430518838b04b4eebb01 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Sun, 7 Jun 2009 13:25:14 -0400 Subject: Added a wikilink to the solution. --- doc/todo/support_for_plugins_written_in_other_languages.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/support_for_plugins_written_in_other_languages.mdwn b/doc/todo/support_for_plugins_written_in_other_languages.mdwn index 8476d1b44..006b6fd5e 100644 --- a/doc/todo/support_for_plugins_written_in_other_languages.mdwn +++ b/doc/todo/support_for_plugins_written_in_other_languages.mdwn @@ -1,4 +1,4 @@ -ikiwiki should support writing plugins in other languages +ikiwiki should support [[writing plugins in other languages|plugins/write/external]] > [[done]] !! -- cgit v1.2.3 From f839d996949c568db6f1123b1e2001f3a2855513 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 00:15:53 -0400 Subject: add in new openid forum question --- ...s_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn new file mode 100644 index 000000000..9b7400246 --- /dev/null +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -0,0 +1,22 @@ +### "meta openid" problems + +I have add the followning to _index.mdwn_ on my site. + + \[[!meta openid="http://certifi.ca/lunix" + server="http://certifi.ca/_serve"]] + +This resulted in the following being added to my site + + + + + --> + +Perhaps I have done something wrong but this fails to work when I try to log in to several sites using my sites url as my login. +If I edit index.html and remove the two openid2 lines all works fine. +**Is there a way to only add openid version 1 tags to my index.html ? +Or a way to make it work the way it is ?** + +Cheers +Mick +\_lunix_ -- cgit v1.2.3 From 331cc6cca10cc01dd9730865c5078a24be3deedb Mon Sep 17 00:00:00 2001 From: "http://davide.viti.myopenid.com/" Date: Mon, 8 Jun 2009 03:33:30 -0400 Subject: Instructions to allow .cgi files to execute from anywhere using boa webserver --- doc/tips/dot_cgi.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index 64d7a0757..4532c84cd 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -55,3 +55,9 @@ rule that allow `ikiwiki.cgi` to be executed. **Warning:** I only use this lighttpd configuration on my development server (offline). I am not sure of how secure this approach is. If you have any thought about it, feel free to let me know. + +## boa + +Edit /etc/boa/boa.conf and make sure the following line is not commented: + + AddType application/x-httpd-cgi cgi -- cgit v1.2.3 From 5418385336e7eeab79166e7ddccefa6bdea8c759 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 18:27:40 -0400 Subject: Optimise use of gettext, and avoid ugly warnings if Locale::gettext is not available. The test suite was emitting a lot of ugly gettext warnings; setting LC_ALL didn't solve the problem for all locale setups (since ikiwiki remaps it to LANG, and ikiwiki didn't know about the C locale). People also seem generally annoyed by the messages when Locale::Gettext is not installed, and I suspect will be generally happier if it just silently doesn't localize. The optimisation came about when I noticed that the gettext sub was doing rather a lot of work each call just to see if localisation is needed. We can avoid that work by caching, and the best thing to cache is a version of the gettext sub that does exactly the right thing. This was slightly complicated by the locale setting, which might need to override the original locale (or lack thereof) after gettext has been called. So it needs to invalidate the cache in that case. It used to do it via a global variable, which I am happy to have also gotten rid of. --- IkiWiki.pm | 32 ++++++++++++++++++++------------ debian/changelog | 2 ++ t/basewiki_brokenlinks.t | 2 +- t/permalink.t | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index d7c827c89..a0a61ac64 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -14,7 +14,7 @@ use open qw{:utf8 :std}; use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase %pagestate %wikistate %renderedfiles %oldrenderedfiles %pagesources %destsources %depends %hooks %forcerebuild - $gettext_obj %loaded_plugins}; + %loaded_plugins}; use Exporter q{import}; our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match @@ -459,7 +459,7 @@ sub checkconfig () { if (defined $config{locale}) { if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) { $ENV{LANG}=$config{locale}; - $gettext_obj=undef; + define_gettext(); } } @@ -1704,29 +1704,37 @@ sub file_pruned ($$) { return $file =~ m/$regexp/ && $file ne $base; } -sub gettext { - # Only use gettext in the rare cases it's needed. +sub define_gettext () { + # If translation is needed, redefine the gettext function to do it. + # Otherwise, it becomes a quick no-op. + no warnings 'redefine'; if ((exists $ENV{LANG} && length $ENV{LANG}) || (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) || (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) { - if (! $gettext_obj) { - $gettext_obj=eval q{ + *gettext=sub { + my $gettext_obj=eval q{ use Locale::gettext q{textdomain}; Locale::gettext->domain('ikiwiki') }; - if ($@) { - print STDERR "$@"; - $gettext_obj=undef; + + if ($gettext_obj) { + $gettext_obj->get(shift); + } + else { return shift; } - } - return $gettext_obj->get(shift); + }; } else { - return shift; + *gettext=sub { return shift }; } } +sub gettext { + define_gettext(); + gettext(@_); +} + sub yesno ($) { my $val=shift; diff --git a/debian/changelog b/debian/changelog index 7f8257813..126c1826b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ ikiwiki (3.15) UNRELEASED; urgency=low name, to support several cases including mercurial's long user names on the RecentChanges page, and urls with spaces being handled by the 404 plugin. + * Optimise use of gettext, and avoid ugly warnings if Locale::gettext + is not available. Closes: #532285 -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index 2871b1dd2..fd0037492 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out")); ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); foreach my $plugin ("", "listdirectives") { - ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ". + ok(! system("perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ". # always enabled because pages link to it conditionally, # which brokenlinks cannot handle properly "-plugin smiley ". diff --git a/t/permalink.t b/t/permalink.t index c326e8d27..b49b98338 100755 --- a/t/permalink.t +++ b/t/permalink.t @@ -5,7 +5,7 @@ use Test::More 'no_plan'; ok(! system("mkdir t/tmp")); ok(! system("make -s ikiwiki.out")); -ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -templatedir=templates t/tinyblog t/tmp/out")); +ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -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`); -- cgit v1.2.3 From 375cf730b21b731412181fb6975b4dae0dbc7ceb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 19:08:06 -0400 Subject: response --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 9b7400246..06b4c946e 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -20,3 +20,14 @@ Or a way to make it work the way it is ?** Cheers Mick \_lunix_ + +> Before I think about adding a way to not add the openid 2 tags, +> I'd like to know what the problem is. Is there something +> wrong with the tags? Does your openid provider not support +> openid 2, and the site you are logging into sees the openid 2 tags +> and uses it, not falling back to openid 1? +> +> Since certifi.ca is a public openid provider (run by a +> guy I know even!), I should be +> able to reproduce your problem if you can tell me what +> site(s) you are trying to log into. --[[Joey]] -- cgit v1.2.3 From dabb60d060d897fbaae6523f8f8dc8b3de0e2624 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 20:24:36 -0400 Subject: add my response --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 06b4c946e..7129563ab 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -31,3 +31,17 @@ Mick > guy I know even!), I should be > able to reproduce your problem if you can tell me what > site(s) you are trying to log into. --[[Joey]] + +---------- + +I was using _phpMyID_ and its not _openid2_ compliant so I switched to certifi.ca to counteract that but I really +want to go back to running my own provider. +I can't login to identi.ca.unless I comment out the openid2 lines.(this may be there problem, I get sent to certifi.ca's site and redirected back to identi.ca) +I will test all the different openid enabled sites I log into today and see what happens. +It seems that since I have moved my site to its final location and made it live over night I am able to login to most places now. +I do not have a proper understanding of the inner workings of openid so not exactly sure what part is failing but I think the problem +lays with the consumers not falling back to the openid1 tags when they are openid1 only consumers. --[Mick](http://www.lunix.com.au) + + + + -- cgit v1.2.3 From 3f9dd729b3f89c25689bb96d55d71d3eb232951f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 20:53:23 -0400 Subject: resp --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 7129563ab..1a6d01cd3 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -42,6 +42,8 @@ It seems that since I have moved my site to its final location and made it live I do not have a proper understanding of the inner workings of openid so not exactly sure what part is failing but I think the problem lays with the consumers not falling back to the openid1 tags when they are openid1 only consumers. --[Mick](http://www.lunix.com.au) - - - +> So, just to clarify, certifi.ca works ok (I verified this, logging into identi.ca using it). +> You had the problem running your own openid provider which did not support 2.0, in which case, +> consumers seem justified in not falling back (guess; I don't know the 2.0 spec). +> The only way this seems fixable is to add an option to meta to allow disabling openid 2. Which +> should be easy enough to do. --[[Joey]] -- cgit v1.2.3 From c2cf78dd4b70e9fa379ae0eee9034fa35db1b521 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 21:18:36 -0400 Subject: add my response --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 1a6d01cd3..766eae450 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -47,3 +47,7 @@ lays with the consumers not falling back to the openid1 tags when they are openi > consumers seem justified in not falling back (guess; I don't know the 2.0 spec). > The only way this seems fixable is to add an option to meta to allow disabling openid 2. Which > should be easy enough to do. --[[Joey]] + +I can't log into identi.ca with openid2 tags. strange. I will look at that again today. +Having the option to disable openid2 tags would be perfect. +Thanks Joey. --[Mick](http://www.lunix.com.au) -- cgit v1.2.3 From 7a22ead98ebe231943a9e1a1873640c372f25077 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 21:25:17 -0400 Subject: update --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 1a6d01cd3..a364449f9 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -47,3 +47,9 @@ lays with the consumers not falling back to the openid1 tags when they are openi > consumers seem justified in not falling back (guess; I don't know the 2.0 spec). > The only way this seems fixable is to add an option to meta to allow disabling openid 2. Which > should be easy enough to do. --[[Joey]] + +>> Actually, it seems that identi.ca / certifi.ca do +>> not interoperate when using openid2. It actually +>> fails half the time, and succeeds half the time; +>> seems to be picking openid1 and openid2 randomly and failing +>> on the latter. --[[Joey]] -- cgit v1.2.3 From 6b83aa2550820e9a7e485e78726cd2fe3713f8f3 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 21:25:37 -0400 Subject: add my site. --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index fdae9c047..b9fcc71da 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -121,6 +121,7 @@ Personal sites and blogs * [Simon Kjika'qawej C.](http://simonraven.kisikew.org/ikiwiki/) Please note it might change location at any time (likely wiki.k.o or under /wiki/ at simonraven.k.o). * [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!! * [Natalian - Kai Hendry's personal blog](http://natalian.org/) +* [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au) Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From bf55a7fbb1f27ca815ac1e2ee04867686851a134 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 21:40:06 -0400 Subject: meta: Add openid delegate parameter to allow delegating only openid or openid2. --- IkiWiki/Plugin/meta.pm | 13 +++++++++---- debian/changelog | 4 +++- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 3 +++ doc/ikiwiki/directive/meta.mdwn | 3 +++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index cc5455d64..b2295923e 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -163,17 +163,22 @@ sub preprocess (@) { "\" type=\"text/css\" />"; } elsif ($key eq 'openid') { + my $delegate=0; # both by default + if (exists $params{delegate}) { + $delegate = 1 if lc $params{delegate} eq 'openid'; + $delegate = 2 if lc $params{delegate} eq 'openid2'; + } if (exists $params{server} && safeurl($params{server})) { push @{$metaheaders{$page}}, ''; + '" rel="openid.server" />' if $delegate ne 2; push @{$metaheaders{$page}}, ''; + '" rel="openid2.provider" />' if $delegate ne 1; } if (safeurl($value)) { push @{$metaheaders{$page}}, ''; + '" rel="openid.delegate" />' if $delegate ne 2; push @{$metaheaders{$page}}, ''; + '" rel="openid2.local_id" />' if $delegate ne 1; } if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) { push @{$metaheaders{$page}}, ' Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 16382a936..d926cebed 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -60,3 +60,6 @@ Thanks Joey. --[Mick](http://www.lunix.com.au) >> Not clear to me if identi.ca or certifi.ca is at failt, >> but luckily he runs both.. >> --[[Joey]] + +>> ikiwiki's next release will allow adding 'delegate=1' to the +>> meta directive to only delegate to openid1. --[[Joey]] diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index f29a118bf..7a7b0fa19 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -78,6 +78,9 @@ Supported fields: server="http://www.myopenid.com/server" xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]] + By default this will delegate for both `openid` and `openid2`. To only + delegate for one, add a parameter such as `delegate=openid`. + * link Specifies a link to another page. This can be used as a way to make the -- cgit v1.2.3 From 9874a13fbfb9eef2742ae4a9a9d65972e5587db0 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 21:40:19 -0400 Subject: add my response --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 16382a936..56b1b6830 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -60,3 +60,5 @@ Thanks Joey. --[Mick](http://www.lunix.com.au) >> Not clear to me if identi.ca or certifi.ca is at failt, >> but luckily he runs both.. >> --[[Joey]] +Ahh so it's not just me. +It's handy having contacts in the _right_ places. --[Mick](http://www.lunix.com.au) -- cgit v1.2.3 From df19034d79139814f0d1028db6c02997c4587b0b Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 21:42:26 -0400 Subject: fixed formatting of last response --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 56b1b6830..cdded5d9a 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -60,5 +60,6 @@ Thanks Joey. --[Mick](http://www.lunix.com.au) >> Not clear to me if identi.ca or certifi.ca is at failt, >> but luckily he runs both.. >> --[[Joey]] + Ahh so it's not just me. It's handy having contacts in the _right_ places. --[Mick](http://www.lunix.com.au) -- cgit v1.2.3 From ce85eaab9da23cfaa177b934e4c25d64f6651929 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 21:44:52 -0400 Subject: reorg --- doc/ikiwiki/directive/meta.mdwn | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index 7a7b0fa19..000f461c9 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -68,19 +68,21 @@ Supported fields: * openid Adds html <link> tags to perform OpenID delegation to an external - OpenID server (for `openid` and `openid2`). An optional `xrds-location` + OpenID server. This lets you use an ikiwiki page as your OpenID. + + By default this will delegate for both `openid` and `openid2`. To only + delegate for one, add a parameter such as `delegate=openid`. + + An optional `xrds-location` parameter lets you specify the location of any [eXtensible Resource DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml). - This lets you use an ikiwiki page as your OpenID. Example: + Example: \\[[!meta openid="http://joeyh.myopenid.com/" server="http://www.myopenid.com/server" xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]] - By default this will delegate for both `openid` and `openid2`. To only - delegate for one, add a parameter such as `delegate=openid`. - * link Specifies a link to another page. This can be used as a way to make the -- cgit v1.2.3 From 1a880b7d7bcb8da5b1b07baf0fabecac3892b219 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Mon, 8 Jun 2009 21:50:13 -0400 Subject: add my response and thanks --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index bb250eb42..450785d60 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -66,3 +66,6 @@ It's handy having contacts in the _right_ places. --[Mick](http://www.lunix.com >> ikiwiki's next release will allow adding 'delegate=1' to the >> meta directive to only delegate to openid1. --[[Joey]] + +## awesome. +--[Mick](http://www.lunix.com.au) -- cgit v1.2.3 From 48a5f9f2d8daef8c16b3e4b00511e00eaa0fa024 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Jun 2009 15:39:00 -0400 Subject: Disable the Preferences link if no plugin with an auth hook is enabled. --- IkiWiki/Plugin/passwordauth.pm | 11 +++++++++-- IkiWiki/Render.pm | 3 ++- debian/changelog | 1 + doc/todo/Allow_disabling_edit_and_preferences_links.mdwn | 10 ++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 90e2ca564..8cf5af51e 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -8,9 +8,10 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup); - hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup); - hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder); + hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup); + hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder); hook(type => "sessioncgi", id => "passwordauth", call => \&sessioncgi); + hook(type => "auth", id => "passwordauth", call => \&auth); } sub getsetup () { @@ -337,4 +338,10 @@ sub sessioncgi ($$) { } } +sub auth ($$) { + # While this hook is not currently used, it needs to exist + # so ikiwiki knows that the wiki supports logins, and will + # enable the Preferences page. +} + 1 diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index f4de19378..2da18738d 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -65,7 +65,8 @@ sub genpage ($$) { if (length $config{cgiurl}) { $template->param(editurl => cgiurl(do => "edit", page => $page)) if IkiWiki->can("cgi_editpage"); - $template->param(prefsurl => cgiurl(do => "prefs")); + $template->param(prefsurl => cgiurl(do => "prefs")) + if exists $hooks{auth}; $actions++; } diff --git a/debian/changelog b/debian/changelog index dd24e0bba..06bed479b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low is not available. Closes: #532285 * meta: Add openid delegate parameter to allow delegating only openid or openid2. + * Disable the Preferences link if no plugin with an auth hook is enabled. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn index 5b9cc8742..4277ae899 100644 --- a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn +++ b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn @@ -67,3 +67,13 @@ Patch: >>> Adding a new `canlogin` hook looks like overkill to me. [[Joey]], how >>> about making registration of the `auth` hook mandatory for all plugins >>> making sense of the "Preferences" link? --[[Lunar]] + +>>>> Hmm, using the `auth` hook existance does seem like a nice solution. +>>>> While splitting the preferences code out into its own plugin is +>>>> easily enough done, it has the minor problem of being yet another +>>>> file nearly all ikiwikis will have to load, and also, prefs would +>>>> have to be disabled manually. So I like that using the hook would +>>>> cause it to auto-disable if nothing uses it. It's a bit ugly that +>>>> passwordauth doesn't need an auth hook (it could be reorged to +>>>> use it instead of formbuilder, maybe) and would probably just have an +>>>> empty one. Thanks for the idea. --[[Joey]] [[done]] -- cgit v1.2.3 From 9d0b13bb2b88d625ffafa8d253e03800728dcad2 Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Tue, 9 Jun 2009 18:37:58 -0400 Subject: More NTFS filename compatability problems. --- doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn index 0fccd1dcb..7559e6d0a 100644 --- a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn +++ b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn @@ -68,3 +68,8 @@ Windows does not support filenames containing any of these characters: `/ \ * : >>> ikiwiki on windows, including its assumption that the directory >>> separator is "/". Windows will be supported when someone sends me a >>> comprehansive and not ugly or performance impacting patch. :-) --[[Joey]] + +> Speaking of Windows filename problems, how do I keep directories ending in a +> period from being created? The following didn't seem to work. +> `wiki_file_chars => "-[:alnum:]+/._",` +> `wiki_file_regex => '[-[:alnum:]+_]$',` -- cgit v1.2.3 From df9b11968b73bba8baf6d3a92bc21c48aa9d1915 Mon Sep 17 00:00:00 2001 From: "http://www.lunix.com.au/" Date: Tue, 9 Jun 2009 22:31:42 -0400 Subject: simple format tidyup --- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 450785d60..e952263a3 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -15,11 +15,7 @@ This resulted in the following being added to my site Perhaps I have done something wrong but this fails to work when I try to log in to several sites using my sites url as my login. If I edit index.html and remove the two openid2 lines all works fine. **Is there a way to only add openid version 1 tags to my index.html ? -Or a way to make it work the way it is ?** - -Cheers -Mick -\_lunix_ +Or a way to make it work the way it is ?** --[Mick](http://www.lunix.com.au) > Before I think about adding a way to not add the openid 2 tags, > I'd like to know what the problem is. Is there something -- cgit v1.2.3 From 31bb5268973534d5262bf301864f033f60db39c7 Mon Sep 17 00:00:00 2001 From: bremner Date: Tue, 9 Jun 2009 22:54:28 -0400 Subject: feature request/discussion for highlight options. --- doc/plugins/highlight/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/plugins/highlight/discussion.mdwn diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn new file mode 100644 index 000000000..612fb0fda --- /dev/null +++ b/doc/plugins/highlight/discussion.mdwn @@ -0,0 +1,3 @@ +It would be nice to be able to set a few options for the highlighter object. In particular, today I noticed my tabs were not being expanded correctly, which could +be fixed the command line with --replace-tabs but programmatically needs a call to setPreformatting. I could probably play with this, but what is your preferred way to support +options? something like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, if you want to implement it I won't complain :-). [[DavidBremner]] -- cgit v1.2.3 From dd15cc426f75b4277ae0dbbfee221fe278245d54 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jun 2009 13:58:59 -0400 Subject: Updated French translation. Closes: #532654 --- debian/changelog | 1 + po/fr.po | 77 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06bed479b..dbf8dac88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * meta: Add openid delegate parameter to allow delegating only openid or openid2. * Disable the Preferences link if no plugin with an auth hook is enabled. + * Updated French translation. Closes: #532654 -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/po/fr.po b/po/fr.po index 9724633c0..73864948b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ # Cyril Brulebois , 2007. msgid "" msgstr "" -"Project-Id-Version: ikiwiki 3.04\n" +"Project-Id-Version: ikiwiki 3.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" -"PO-Revision-Date: 2009-03-15 16:10+0100\n" +"POT-Creation-Date: 2009-05-25 09:19+0200\n" +"PO-Revision-Date: 2009-06-08 16:41+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -189,10 +189,10 @@ msgstr "" "blogspam.net/\">blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 -msgid "Discussion" +#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 +#: ../IkiWiki/Render.pm:149 +msgid "discussion" msgstr "Discussion" #: ../IkiWiki/Plugin/brokenlinks.pm:48 @@ -204,68 +204,68 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:185 +#: ../IkiWiki/Plugin/comments.pm:183 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:345 +#: ../IkiWiki/Plugin/comments.pm:343 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:363 +#: ../IkiWiki/Plugin/comments.pm:361 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:370 +#: ../IkiWiki/Plugin/comments.pm:368 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:462 msgid "comment stored for moderation" -msgstr "Le commentaire a été enregistré en attente de modération" +msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:464 msgid "Your comment will be posted after moderator review" -msgstr "Votre commentaire sera publié après que le modérateur l'ait vérifié" +msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:477 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:481 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:574 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:613 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:764 msgid "Comments" msgstr "Commentaires" @@ -341,7 +341,7 @@ msgstr "Vous n'êtes pas autorisé à modifier %s" #: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "Vous ne pouvez utiliser le mode %s pour les fichiers" +msgstr "Vous ne pouvez modifier un fichier dont le mode est %s" #: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" @@ -376,17 +376,19 @@ msgstr "Ce programme n'est pas un programme graphviz valable" #: ../IkiWiki/Plugin/highlight.pm:46 #, perl-format msgid "tohighlight contains unknown file type '%s'" -msgstr "" +msgstr "tohighlight contient un type de fichier inconnu : '%s'" #: ../IkiWiki/Plugin/highlight.pm:57 #, perl-format msgid "Source code: %s" -msgstr "" +msgstr "Code source : %s" #: ../IkiWiki/Plugin/highlight.pm:122 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +"Avertissement : le module perl « highlight » n'est pas disponible. " +"Continuation malgré tout." #: ../IkiWiki/Plugin/img.pm:62 msgid "Image::Magick is not installed" @@ -429,7 +431,7 @@ msgstr "Paramètre « pages » manquant" #: ../IkiWiki/Plugin/inline.pm:196 msgid "Sort::Naturally needed for title_natural sort" -msgstr "" +msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" #: ../IkiWiki/Plugin/inline.pm:207 #, perl-format @@ -445,6 +447,10 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" +#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83 +msgid "Discussion" +msgstr "Discussion" + #: ../IkiWiki/Plugin/inline.pm:596 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -551,7 +557,7 @@ msgstr "Ping reçu" #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "les paramètres 'de' et 'à' sont nécessaires" +msgstr "les paramètres 'from' et 'to' sont nécessaires" #: ../IkiWiki/Plugin/pinger.pm:58 #, perl-format @@ -709,7 +715,7 @@ msgstr "Aucun changement dans le nom du fichier n'a été spécifié" #: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" -msgstr "Appellation non autorisée" +msgstr "Appellation interdite" #: ../IkiWiki/Plugin/rename.pm:73 #, perl-format @@ -732,7 +738,7 @@ msgstr "« SubPages » et attachements renommés." #: ../IkiWiki/Plugin/rename.pm:226 msgid "Only one attachment can be renamed at a time." -msgstr "Une seule pièce jointe peut être renommée à la fois" +msgstr "Modification de pièce jointe : une seule à la fois" #: ../IkiWiki/Plugin/rename.pm:229 msgid "Please select the attachment to rename." @@ -900,7 +906,7 @@ msgstr "" #: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." -msgstr "" +msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." #: ../IkiWiki/Receive.pm:35 #, perl-format @@ -1068,9 +1074,9 @@ msgid "yes" msgstr "oui" #: ../IkiWiki.pm:1865 -#, fuzzy, perl-format +#, perl-format msgid "cannot match pages: %s" -msgstr "Lecture impossible de %s : %s" +msgstr "Impossible de trouver les pages %s" #: ../auto.setup:16 msgid "What will the wiki be named?" @@ -1092,9 +1098,6 @@ 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 "discussion" -#~ msgstr "Discussion" - #~ msgid "

Error: %s exited nonzero (%s)" #~ msgstr "" #~ "

Erreur : %s s'est terminé, valeur de sortie nonzero (%" -- cgit v1.2.3 From ca624a5f2acc330e85ac267feaec23519bdb13ae Mon Sep 17 00:00:00 2001 From: Jérémy Bobbio Date: Thu, 11 Jun 2009 17:15:29 +0200 Subject: Thanks --- doc/todo/Allow_disabling_edit_and_preferences_links.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn index 4277ae899..17f45dda6 100644 --- a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn +++ b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn @@ -77,3 +77,5 @@ Patch: >>>> passwordauth doesn't need an auth hook (it could be reorged to >>>> use it instead of formbuilder, maybe) and would probably just have an >>>> empty one. Thanks for the idea. --[[Joey]] [[done]] + +>>>>> Thanks for implementing it! --[[Lunar]] -- cgit v1.2.3 From ec9b0a628d5daafdff27ef711bda3b22be4b0009 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Fri, 12 Jun 2009 09:42:47 +0100 Subject: add allow_site-wide_meta_definitions.mdwn --- doc/todo/allow_site-wide_meta_definitions.mdwn | 60 ++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 doc/todo/allow_site-wide_meta_definitions.mdwn diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn new file mode 100644 index 000000000..5b7a5bea5 --- /dev/null +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -0,0 +1,60 @@ +I'd like to define [[plugins/meta]] values to apply across all pages +site-wide unless the pages define their own: default values for meta +definitions essentially. + +Here's a patch[[!tag patch]] to achieve this (also in the "defaultmeta" branch of +my github ikiwiki fork): + + diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm + index b229592..a307db4 100644 + --- a/IkiWiki/Plugin/meta.pm + +++ b/IkiWiki/Plugin/meta.pm + @@ -13,6 +13,7 @@ sub import { + hook(type => "needsbuild", id => "meta", call => \&needsbuild); + hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); + hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); + + hook(type => "scan", id => "meta", call => \&scan); + } + + sub getsetup () { + @@ -302,6 +303,15 @@ sub match { + } + } + + +sub scan() { + + my %params = @_; + + my $page = $params{page}; + + foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) { + + $pagestate{$page}{meta}{$type} = $config{"meta_$type"} + + unless defined $pagestate{$page}{meta}{$type}; + + } + +} + + + package IkiWiki::PageSpec; + + sub match_title ($$;@) { + @@ -324,4 +334,5 @@ sub match_copyright ($$;@) { + IkiWiki::Plugin::meta::match("copyright", @_); + } + + + + 1 + diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn + index 000f461..200c4b2 100644 + --- a/doc/ikiwiki/directive/meta.mdwn + +++ b/doc/ikiwiki/directive/meta.mdwn + @@ -12,6 +12,12 @@ also specifies some additional sub-parameters. + The field values are treated as HTML entity-escaped text, so you can include + a quote in the text by writing `"` and so on. + + +You can also define site-wide defaults for meta values by including them + +in your setup file, e.g. + + + + meta_copyright => "Copyright 2007 by Joey Hess", + + meta_license => "GPL v2+", + + + Supported fields: + + * title + +-- [[Jon]] -- cgit v1.2.3 From a407c116260c218e426a1b70945204bd60e7b5b0 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Fri, 12 Jun 2009 13:26:12 +0100 Subject: update diff (one redundant hunk removed) --- doc/todo/allow_site-wide_meta_definitions.mdwn | 41 +++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 5b7a5bea5..4a047befa 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -6,39 +6,38 @@ Here's a patch[[!tag patch]] to achieve this (also in the "defaultmeta" branch o my github ikiwiki fork): diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm - index b229592..a307db4 100644 + index b229592..2894e08 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -13,6 +13,7 @@ sub import { - hook(type => "needsbuild", id => "meta", call => \&needsbuild); - hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); - hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); - + hook(type => "scan", id => "meta", call => \&scan); + hook(type => "needsbuild", id => "meta", call => \&needsbuild); + hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); + hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); + + hook(type => "scan", id => "meta", call => \&scan); } sub getsetup () { - @@ -302,6 +303,15 @@ sub match { - } + @@ -302,6 +303,20 @@ sub match { + } } + +my @metatypes = qw/title description license copyright link + + author authorurl date permalink stylesheet + + openid redir robots guid updated/; + + +sub scan() { - + my %params = @_; - + my $page = $params{page}; - + foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) { - + $pagestate{$page}{meta}{$type} = $config{"meta_$type"} - + unless defined $pagestate{$page}{meta}{$type}; - + } + + my %params = @_; + + my $page = $params{page}; + + + + foreach my $type (grep { exists $config{"meta_$_"} } @metatypes) { + + $pagestate{$page}{meta}{$type} = $config{"meta_$type"} + + unless defined $pagestate{$page}{meta}{$type}; + + } +} + package IkiWiki::PageSpec; sub match_title ($$;@) { - @@ -324,4 +334,5 @@ sub match_copyright ($$;@) { - IkiWiki::Plugin::meta::match("copyright", @_); - } - - + - 1 diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index 000f461..200c4b2 100644 --- a/doc/ikiwiki/directive/meta.mdwn @@ -50,8 +49,8 @@ my github ikiwiki fork): +You can also define site-wide defaults for meta values by including them +in your setup file, e.g. + - + meta_copyright => "Copyright 2007 by Joey Hess", - + meta_license => "GPL v2+", + + meta_copyright => "Copyright 2007 by Joey Hess", + + meta_license => "GPL v2+", + Supported fields: -- cgit v1.2.3 From 9d4f803a01adbd83116b31df6636f0dd487f68f0 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Fri, 12 Jun 2009 16:00:04 +0100 Subject: argh, wrong diff again. third time lucky. --- doc/todo/allow_site-wide_meta_definitions.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 4a047befa..97515a312 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -6,7 +6,7 @@ Here's a patch[[!tag patch]] to achieve this (also in the "defaultmeta" branch o my github ikiwiki fork): diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm - index b229592..2894e08 100644 + index b229592..3132257 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -13,6 +13,7 @@ sub import { @@ -17,19 +17,14 @@ my github ikiwiki fork): } sub getsetup () { - @@ -302,6 +303,20 @@ sub match { + @@ -302,6 +303,15 @@ sub match { } } - +my @metatypes = qw/title description license copyright link - + author authorurl date permalink stylesheet - + openid redir robots guid updated/; - + +sub scan() { + my %params = @_; + my $page = $params{page}; - + - + foreach my $type (grep { exists $config{"meta_$_"} } @metatypes) { + + foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) { + $pagestate{$page}{meta}{$type} = $config{"meta_$type"} + unless defined $pagestate{$page}{meta}{$type}; + } -- cgit v1.2.3 From 90b4d079605b72bb50d1da41402d994960e10937 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 19:24:47 -0400 Subject: aggregate: Fix storing of changed md5. The aggregate state merge code neglected to merge changes to the md5 field of an item. Therefore, if an item's md5 changed after initial aggregation, it would be updated, and rewritten, each time thereafter. This was wasteful and indirectly led to some expire problems. --- IkiWiki/Plugin/aggregate.pm | 6 ++++++ debian/changelog | 1 + 2 files changed, 7 insertions(+) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index e1baae666..60c292d52 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -404,6 +404,7 @@ sub mergestate () { } # New guids can be created during aggregation. + # Guids have a few fields that may be updated during aggregation. # It's also possible that guids were removed from the on-disk state # while the aggregation was in process. That would only happen if # their feed was also removed, so any removed guids added back here @@ -412,6 +413,11 @@ sub mergestate () { if (! exists $guids{$guid}) { $guids{$guid}=$myguids{$guid}; } + else { + foreach my $field (qw{md5}) { + $guids{$guid}->{$field}=$myguids{$guid}->{$field}; + } + } } } diff --git a/debian/changelog b/debian/changelog index dbf8dac88..6444fb8ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low openid or openid2. * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #532654 + * aggregate: Fix storing of changed md5. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From 91513466877df4329567f2cc73b6719999394258 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 19:31:18 -0400 Subject: aggregate: Avoid resetting ctime when an item md5 changes. Besides being wrong to do, this could lead to the wrong item being expired, as follows: If B is added and at the same time A is changed, then A's ctime may be set to the current time, while B's is set to its creation time. Thus the new item, A, is incorrectly removed as older. (This interacted especially badly with the bug fixed by 90b4d079605b72bb50d1da41402d994960e10937.) --- IkiWiki/Plugin/aggregate.pm | 6 ++++-- debian/changelog | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 60c292d52..5a9eb433d 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -650,11 +650,13 @@ sub add_page (@) { # creation time on record for the new page. utime $mtime, $mtime, "$config{srcdir}/".htmlfn($guid->{page}); # Store it in pagectime for expiry code to use also. - $IkiWiki::pagectime{$guid->{page}}=$mtime; + $IkiWiki::pagectime{$guid->{page}}=$mtime + unless exists $IkiWiki::pagectime{$guid->{page}}; } else { # Dummy value for expiry code. - $IkiWiki::pagectime{$guid->{page}}=time; + $IkiWiki::pagectime{$guid->{page}}=time + unless exists $IkiWiki::pagectime{$guid->{page}}; } } diff --git a/debian/changelog b/debian/changelog index 6444fb8ba..9b96eee81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #532654 * aggregate: Fix storing of changed md5. + * aggregate: Avoid resetting ctime when an item md5 changes. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From 86a83a2a69df86879c80759e0df6c517b49e1c57 Mon Sep 17 00:00:00 2001 From: "http://www.larted.org.uk/~dom/" Date: Sat, 13 Jun 2009 07:56:56 -0400 Subject: comment about newer OpenID now being available. --- doc/bugs/support_for_openid2_logins.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index 1d99370f6..f82ceb036 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -15,3 +15,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco > an OpenID 2 implementation (it's the second of the projects > above). I've filed a bug in Debian asking for the package to be > updated. --[[smcv]] + +> Net::OpenID::Consumer 1.x is not in Debian unstable --[[dom]] -- cgit v1.2.3 From 07d26e1db3e7762132ddbf0d95f491c44f276c88 Mon Sep 17 00:00:00 2001 From: "http://www.larted.org.uk/~dom/" Date: Sat, 13 Jun 2009 07:58:13 -0400 Subject: --- doc/users/dom.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/users/dom.mdwn diff --git a/doc/users/dom.mdwn b/doc/users/dom.mdwn new file mode 100644 index 000000000..c75435679 --- /dev/null +++ b/doc/users/dom.mdwn @@ -0,0 +1,3 @@ + + +Just another ikiwiki user. -- cgit v1.2.3 From 6848a2e8821ca4e7621545cf2c8d4d21be5e4d4c Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Sat, 13 Jun 2009 12:12:58 -0400 Subject: Documentation for parameter `template`? --- doc/ikiwiki/directive/inline/discussion.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index e301190bf..9de80bf3e 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -30,3 +30,13 @@ Is there a simple way to exclude images, stylesheets, and other > The [[plugins/filecheck]] plugin adds a 'ispage()' pagespec test that can do that. > --[[Joey]] + +--- + +## Documentation for parameter `template`? + +I would be especially interested in a list of variables which can be used in such a template. + +I have a page template with some structured information as parameters. For example `location="nowhere"` and `price="20"`. Is there a possibility to extract those information, i. e. access the parameters, to compose the item for the inline directive from these information? For example the line »Go to nowhere for 20 bugs.« is shown inlined. + +--[[PaulePanter]] -- cgit v1.2.3 From f67cf324716770572b6671845dc3d4e8058a815e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 14:33:52 -0400 Subject: response --- doc/bugs/support_for_openid2_logins.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index f82ceb036..833f8ee4e 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -16,4 +16,7 @@ However both Perl OpenID 2.x implementations have not been released and are inco > above). I've filed a bug in Debian asking for the package to be > updated. --[[smcv]] -> Net::OpenID::Consumer 1.x is not in Debian unstable --[[dom]] +> Net::OpenID::Consumer 1.x is now in Debian unstable --[[dom]] + +> Would someone with an v2 only openid provider test it and close this bug +> if it works? --[[Joey]] -- cgit v1.2.3 From 6ead2573e91405c268ddd4e4072b3a7b30b6b461 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 14:40:36 -0400 Subject: releasing version 3.141 --- debian/changelog | 4 +- po/bg.po | 77 ++++++++++++++++++----------------- po/cs.po | 77 ++++++++++++++++++----------------- po/da.po | 77 ++++++++++++++++++----------------- po/de.po | 77 ++++++++++++++++++----------------- po/es.po | 77 ++++++++++++++++++----------------- po/fr.po | 120 ++++++++++++++++++++++++++++--------------------------- po/gu.po | 77 ++++++++++++++++++----------------- po/ikiwiki.pot | 77 ++++++++++++++++++----------------- po/pl.po | 77 ++++++++++++++++++----------------- po/sv.po | 77 ++++++++++++++++++----------------- po/vi.po | 77 ++++++++++++++++++----------------- 12 files changed, 474 insertions(+), 420 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b96eee81..8ee065803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.141) UNRELEASED; urgency=low +ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" form, and document the comment directive syntax. @@ -27,7 +27,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * aggregate: Fix storing of changed md5. * aggregate: Avoid resetting ctime when an item md5 changes. - -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 + -- Joey Hess Fri, 12 Jun 2009 19:50:46 -0400 ikiwiki (3.14) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index b9c32cf72..d1dfe6925 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -84,51 +84,51 @@ msgstr "съобщения" msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -190,7 +190,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Дискусия" @@ -358,12 +358,12 @@ msgstr "При използване на приеставката „search” msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -483,12 +483,12 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" @@ -525,31 +525,31 @@ msgstr "Всички страници имат връзки от други ст msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Акаунтът е създаден. Можете да влезете." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Грешка при създаване на акаунта." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -929,59 +929,59 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1006,6 +1006,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1075,11 +1080,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 70336e41b..22d90462d 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -82,50 +82,50 @@ msgstr "příspěvky" msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji zdroj %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít zdroj na %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "zdroj shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -187,7 +187,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskuse" @@ -355,12 +355,12 @@ msgstr "Při používání vyhledávacího modulu musíte zadat %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -473,12 +473,12 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "zdroj nebyl nalezen" @@ -515,31 +515,31 @@ msgstr "Na každou stránku vede odkaz z jiné stránky." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Chyba při vytváření účtu." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Nepodařilo se odeslat email." -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -911,59 +911,59 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "zpracovávám %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -988,6 +988,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1055,11 +1060,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "nemohu číst %s: %s" diff --git a/po/da.po b/po/da.po index c94b71feb..e2bbc0b1b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-05-28 14:58+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -88,50 +88,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../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:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../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:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -193,7 +193,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -358,11 +358,11 @@ msgstr "Skal angive %s når google søgeudvidelsen bruges" msgid "Failed to parse url, cannot determine domain name" msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -476,11 +476,11 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" @@ -516,32 +516,32 @@ msgstr "Alle sider henvises til fra andre sider." msgid "bad or missing template" msgstr "dårlig eller manglende skabelon" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Konto korrekt oprettet. Nu kan du logge på." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Fejl ved kontooprettelse." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Afsendelse af mail mislykkedes" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Ukorrekt adgangskodenumstillings-URL" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "adgangskodenulstilling afvist" @@ -911,7 +911,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -920,52 +920,52 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan ikke danne %s" @@ -990,6 +990,11 @@ msgstr "revisionskontrolsystem %s ikke understøttet" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1058,11 +1063,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index ee779c795..f4e795094 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.06\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-03-02 15:39+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" @@ -84,50 +84,50 @@ msgstr "Beiträge" msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "zuletzt überprüft am %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Feed %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "konnte Feed unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "Feed nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8-Zeichen wurde aus dem Feed entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(Feed-Entitäten maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "Feed führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" @@ -189,7 +189,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -359,11 +359,11 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "" "Verarbeiten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." @@ -477,11 +477,11 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" @@ -517,33 +517,33 @@ msgstr "Alle Seiten sind von anderen Seiten aus verlinkt." msgid "bad or missing template" msgstr "fehlerhafte oder fehlende Vorlage" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Konto konnte nicht erstellt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Keine E-Mail-Adresse angegeben; deshalb können keine Anweisungen zum " "Zurücksetzen des Passworts via E-Mail versandt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Es konnte keine E-Mail versandt werden" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Fehlerhafte URL zum Zurücksetzen des Passworts" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "Zurücksetzen des Passworts abgelehnt" @@ -917,7 +917,7 @@ msgstr "Kann ID des nicht vertrauenswürdigen Bearbeiters %s nicht feststellen" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -926,52 +926,52 @@ msgstr "" "Symbolischer Verweis im Quellverzeichnis (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "erzeuge %s, die auf %s verlinkt" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rücklinks zu aktualisieren" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -997,6 +997,11 @@ msgstr "Nicht unterstütztes Versionskontrollsystem %s" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1067,11 +1072,11 @@ 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:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kann %s nicht lesen: %s" diff --git a/po/es.po b/po/es.po index dda242df9..5b556501a 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-05-25 09:30+0200\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -91,50 +91,50 @@ msgstr "entradas" msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, 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:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -196,7 +196,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Comentarios" @@ -364,11 +364,11 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "" "Error en el análisis del URL, no puedo determinar el nombre del dominio" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." @@ -486,11 +486,11 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" @@ -526,35 +526,35 @@ msgstr "Todas las páginas están referenciadas entre sí." msgid "bad or missing template" msgstr "plantilla errónea ó no existente" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Error creando la cuenta de usuario." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "No tengo dirección de correo electrónica, así que no puedo enviar " "instrucciones para reiniciar la contraseña" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "No he podido enviar el mensaje de correo electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" "Las instrucciones para reiniciar la contraseña se le han enviado por correo " "electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "el url para reiniciar la contraseña es incorrecto" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "reinicio de contraseña denegado" @@ -926,7 +926,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -935,54 +935,54 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "convirtiendo %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1007,6 +1007,11 @@ msgstr "el sistema de control de versiones %s no está soportado" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1079,11 +1084,11 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 73864948b..2e79e8e99 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 09:19+0200\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-06-08 16:41+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -86,50 +86,50 @@ msgstr "Articles" msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -189,10 +189,10 @@ msgstr "" "blogspam.net/\">blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26 -#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 -#: ../IkiWiki/Render.pm:149 -msgid "discussion" +#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +msgid "Discussion" msgstr "Discussion" #: ../IkiWiki/Plugin/brokenlinks.pm:48 @@ -204,68 +204,68 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:129 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:183 +#: ../IkiWiki/Plugin/comments.pm:185 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:343 +#: ../IkiWiki/Plugin/comments.pm:345 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:361 +#: ../IkiWiki/Plugin/comments.pm:363 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:368 +#: ../IkiWiki/Plugin/comments.pm:370 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:462 +#: ../IkiWiki/Plugin/comments.pm:464 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:466 msgid "Your comment will be posted after moderator review" msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:477 +#: ../IkiWiki/Plugin/comments.pm:479 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:481 +#: ../IkiWiki/Plugin/comments.pm:483 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:574 +#: ../IkiWiki/Plugin/comments.pm:576 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:613 +#: ../IkiWiki/Plugin/comments.pm:615 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:764 +#: ../IkiWiki/Plugin/comments.pm:766 msgid "Comments" msgstr "Commentaires" @@ -356,11 +356,11 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « google »." msgid "Failed to parse url, cannot determine domain name" msgstr "Impossible d'analyser l'url, pas de nom de domaine" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -447,10 +447,6 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83 -msgid "Discussion" -msgstr "Discussion" - #: ../IkiWiki/Plugin/inline.pm:596 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -479,11 +475,11 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" @@ -519,35 +515,35 @@ msgstr "Toutes les pages sont liées à d'autres pages." msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -919,7 +915,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -928,52 +924,52 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "Reconstruction de %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1000,6 +996,11 @@ msgstr "Système de contrôle de version non reconnu : %s" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1069,11 +1070,11 @@ 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:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1098,6 +1099,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 "discussion" +#~ msgstr "Discussion" + #~ msgid "

Error: %s exited nonzero (%s)" #~ msgstr "" #~ "

Erreur : %s s'est terminé, valeur de sortie nonzero (%" diff --git a/po/gu.po b/po/gu.po index fe42deed4..c8cf72bb6 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -83,50 +83,50 @@ msgstr "પોસ્ટ" msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -188,7 +188,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "ચર્ચા" @@ -356,12 +356,12 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -473,12 +473,12 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" @@ -515,31 +515,31 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "ખાતું બનાવવામાં ક્ષતિ." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -911,59 +911,59 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -988,6 +988,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1055,11 +1060,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d5e54f468..4ca908807 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -83,50 +83,50 @@ msgstr "" msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "" @@ -186,7 +186,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "" @@ -351,11 +351,11 @@ msgstr "" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -464,11 +464,11 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "" @@ -504,31 +504,31 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -894,59 +894,59 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -971,6 +971,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1038,11 +1043,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/pl.po b/po/pl.po index 16f3a18b1..425ec2c00 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -86,51 +86,51 @@ msgstr "wpisy" msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, 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:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -192,7 +192,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Dyskusja" @@ -360,12 +360,12 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -486,12 +486,12 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" @@ -528,31 +528,31 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Konto założone pomyślnie. Teraz można zalogować się." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Błąd w trakcie zakładania konta." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -935,59 +935,59 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "renderowanie %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1012,6 +1012,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1081,11 +1086,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 1951cb91d..c7729a221 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -83,51 +83,51 @@ msgstr "inlägg" msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -189,7 +189,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -357,12 +357,12 @@ msgstr "Måste ange %s när sökinsticket används" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -479,12 +479,12 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" @@ -521,31 +521,31 @@ msgstr "Alla sidor länkas till av andra sidor." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Kontot har skapats. Du kan nu logga in." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Fel vid skapandet av konto." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -924,59 +924,59 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "ritar upp %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1001,6 +1001,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1068,11 +1073,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/vi.po b/po/vi.po index 1415269f6..e93349c91 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: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -84,51 +84,51 @@ msgstr "bài" msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -190,7 +190,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Thảo luận" @@ -358,12 +358,12 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -480,12 +480,12 @@ 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:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" @@ -522,31 +522,31 @@ msgstr "Mọi trang được liên kết với trang khác." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -925,59 +925,59 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %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:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1002,6 +1002,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1069,11 +1074,11 @@ 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:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From 908de091f98d83511d6dca37ecaceb25150f1c3f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 14:41:31 -0400 Subject: add news item for ikiwiki 3.141 --- doc/news/version_3.141.mdwn | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/news/version_3.141.mdwn diff --git a/doc/news/version_3.141.mdwn b/doc/news/version_3.141.mdwn new file mode 100644 index 000000000..90221b868 --- /dev/null +++ b/doc/news/version_3.141.mdwn @@ -0,0 +1,28 @@ +ikiwiki 3.141 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * comment: Make comment directives no longer use the internal "\_comment" + form, and document the comment directive syntax. + * Avoid relying on translators preserving the case when translating + "discussion", which caused Discussion pages to get unwanted Discussion + links. + * Tighten up matching of bare words inside directives; do not + allow an unterminated """ string to be treated as a series + of bare words. Fixes runaway regexp recursion/backtracking + in strange situations. + * Setup automator: Check that each plugin added to the generated + setup file can be loaded and that its config is ok. If a plugin + fails for any reason, disable it in the generated file. + Closes: [532001](http://bugs.debian.org/532001) + * pagecount: Fix broken optimisation for * pagespec. + * goto: Support being passed a page title that is not a valid page + name, to support several cases including mercurial's long user + names on the RecentChanges page, and urls with spaces being handled + by the 404 plugin. + * Optimise use of gettext, and avoid ugly warnings if Locale::gettext + is not available. Closes: #[532285](http://bugs.debian.org/532285) + * meta: Add openid delegate parameter to allow delegating only + openid or openid2. + * Disable the Preferences link if no plugin with an auth hook is enabled. + * Updated French translation. Closes: #[532654](http://bugs.debian.org/532654) + * aggregate: Fix storing of changed md5. + * aggregate: Avoid resetting ctime when an item md5 changes."""]] \ No newline at end of file -- cgit v1.2.3 From 2303c83da4f2ca57883a174ff45c4863510860b5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 15:05:49 -0400 Subject: fixup --- doc/news/version_3.141.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/news/version_3.141.mdwn b/doc/news/version_3.141.mdwn index 90221b868..ac76ce023 100644 --- a/doc/news/version_3.141.mdwn +++ b/doc/news/version_3.141.mdwn @@ -6,7 +6,7 @@ ikiwiki 3.141 released with [[!toggle text="these changes"]] "discussion", which caused Discussion pages to get unwanted Discussion links. * Tighten up matching of bare words inside directives; do not - allow an unterminated """ string to be treated as a series + allow an unterminated triple string to be treated as a series of bare words. Fixes runaway regexp recursion/backtracking in strange situations. * Setup automator: Check that each plugin added to the generated @@ -25,4 +25,4 @@ ikiwiki 3.141 released with [[!toggle text="these changes"]] * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #[532654](http://bugs.debian.org/532654) * aggregate: Fix storing of changed md5. - * aggregate: Avoid resetting ctime when an item md5 changes."""]] \ No newline at end of file + * aggregate: Avoid resetting ctime when an item md5 changes."""]] -- cgit v1.2.3 From e0c7fed8e682e4f11a1e90eb98c81ed7087809fe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 21:08:32 -0400 Subject: tested yahoo working --- doc/bugs/support_for_openid2_logins.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index 833f8ee4e..139a53760 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -18,5 +18,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco > Net::OpenID::Consumer 1.x is now in Debian unstable --[[dom]] -> Would someone with an v2 only openid provider test it and close this bug -> if it works? --[[Joey]] +> I've tested with yahoo, and it works with the updated module. Sweet and +> [[done]] --[[Joey]] -- cgit v1.2.3 From 4f4de892f327a4aa9365ab4f268405cc494061c4 Mon Sep 17 00:00:00 2001 From: Víctor Moral Date: Sun, 14 Jun 2009 12:46:03 +0200 Subject: updated spanish translation --- po/es.po | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/po/es.po b/po/es.po index 5b556501a..73db2b4d9 100644 --- a/po/es.po +++ b/po/es.po @@ -1,4 +1,3 @@ -# translation of es.po to spanish # translation of es.po to # ikiwiki spanish translation # Copyright (C) 2007, 2009 The Free Software Foundation, Inc @@ -11,9 +10,9 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-12 19:52-0400\n" -"PO-Revision-Date: 2009-05-25 09:30+0200\n" -"Last-Translator: Víctor Moral \n" -"Language-Team: spanish \n" +"PO-Revision-Date: 2009-06-14 12:32+0200\n" +"Last-Translator: Victor Moral \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,8 +33,7 @@ msgstr "" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" -"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" +msgstr "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." @@ -71,8 +69,7 @@ msgstr "Contenido añadido activado vía web." #: ../IkiWiki/Plugin/aggregate.pm:93 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 !" +msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -361,8 +358,7 @@ msgstr "" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "" -"Error en el análisis del URL, no puedo determinar el nombre del dominio" +msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio" #: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" @@ -392,8 +388,7 @@ msgid "Source code: %s" msgstr "Código fuente: %s" #: ../IkiWiki/Plugin/highlight.pm:122 -msgid "" -"warning: highlight perl module not available; falling back to pass through" +msgid "warning: highlight perl module not available; falling back to pass through" msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " @@ -472,8 +467,7 @@ msgstr "La página %s está bloqueada y no puede modificarse" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "" -"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" +msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format @@ -895,8 +889,7 @@ msgid "plugins" msgstr "complementos" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "" -"The configuration changes shown below require a wiki rebuild to take effect." +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." @@ -1010,7 +1003,7 @@ msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "" +msgstr "** Desactivando el complemento %s dado que está fallando con este mensaje:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1019,8 +1012,7 @@ msgstr "el programa %s no parece ser ejecutable" #: ../IkiWiki/Wrapper.pm:20 msgid "cannot create a wrapper that uses a setup file" -msgstr "" -"no puedo crear un programa envoltorio que utiliza un archivo de configuración" +msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración" #: ../IkiWiki/Wrapper.pm:24 msgid "wrapper filename not specified" @@ -1115,5 +1107,3 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" -#~ msgid "discussion" -#~ msgstr "comentarios" -- cgit v1.2.3 From 1d38a99874ccb82ccf3ee52ac03171e3fe6df0fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Jun 2009 17:16:18 -0400 Subject: response from a shady glen --- doc/ikiwiki/directive/inline/discussion.mdwn | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index 9de80bf3e..3f62c2767 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -11,7 +11,7 @@ take it as far as implementing "replies" to other comments. -- Marcelo -> See [[todo/discussion_page_as_blog]] for some of my own thoughts on this +> See [[plugins/comments]] > --[[Joey]] --- @@ -37,6 +37,22 @@ Is there a simple way to exclude images, stylesheets, and other I would be especially interested in a list of variables which can be used in such a template. -I have a page template with some structured information as parameters. For example `location="nowhere"` and `price="20"`. Is there a possibility to extract those information, i. e. access the parameters, to compose the item for the inline directive from these information? For example the line »Go to nowhere for 20 bugs.« is shown inlined. +> I try to keep ikiwiki's templates self-documenting, so if you take +> a look at a template used by inline, such as the default `/usr/share/ikiwiki/template/inlinepage.tmpl`, +> you can see all or nearly all the template variables in use in it. + +I have a page template with some structured information as parameters. For +example `location="nowhere"` and `price="20"`. Is there a possibility to +extract those information, i. e. access the parameters, to compose the item +for the inline directive from these information? For example the line »Go +to nowhere for 20 bugs.« is shown inlined. --[[PaulePanter]] + +> Let's not confuse the template directive with the templates used by inline. +> When a page is inlined, any template directives in it are first expanded, +> using the user-defined templates for that. Then, the inline directive's +> template is used to insert it into the inlining page. +> +> So no, you can't reference template directive parameters inside inline's +> template, because it's already expanded at that point. --[[Joey]] -- cgit v1.2.3 From 0b2e512d3648993ce24717d02be000862fc996c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Jun 2009 17:34:05 -0400 Subject: response --- doc/plugins/highlight/discussion.mdwn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn index 612fb0fda..7d3cabea9 100644 --- a/doc/plugins/highlight/discussion.mdwn +++ b/doc/plugins/highlight/discussion.mdwn @@ -1,3 +1,12 @@ -It would be nice to be able to set a few options for the highlighter object. In particular, today I noticed my tabs were not being expanded correctly, which could -be fixed the command line with --replace-tabs but programmatically needs a call to setPreformatting. I could probably play with this, but what is your preferred way to support -options? something like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, if you want to implement it I won't complain :-). [[DavidBremner]] +It would be nice to be able to set a few options for the highlighter +object. In particular, today I noticed my tabs were not being expanded +correctly, which could be fixed the command line with --replace-tabs but +programmatically needs a call to setPreformatting. I could probably play +with this, but what is your preferred way to support options? something +like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, +if you want to implement it I won't complain :-). [[DavidBremner]] + +> I don't know about tab replacement, which I can't really see the point +> of, but if there are multiple options, giving each its own nane would +> word better for websetup than would putting all the options in a +> sub-hash. --[[Joey]] -- cgit v1.2.3 From 53f93ad6e3c2022421fbdc0b62c090d99402b18f Mon Sep 17 00:00:00 2001 From: "http://ptecza.myopenid.com/" Date: Mon, 15 Jun 2009 04:16:53 -0400 Subject: * Now ikiwiki backports for Ubuntu Jaunty --- doc/download.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/download.mdwn b/doc/download.mdwn index 448bdeeb9..015c87f1b 100644 --- a/doc/download.mdwn +++ b/doc/download.mdwn @@ -21,7 +21,7 @@ There is a backport of a recent version of ikiwiki for Debian 4.0 at Fedora versions 8 and newer have RPMs of ikiwiki available. -There is also an unofficial backport of ikiwiki for Ubuntu Intrepid, provided by +There is also an unofficial backport of ikiwiki for Ubuntu Jaunty, provided by [[Paweł_Tęcza|users/ptecza]], at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html). -- cgit v1.2.3 From fb5d7f2dc2062d5c255ebac75c11784ddd84cb57 Mon Sep 17 00:00:00 2001 From: "http://ptecza.myopenid.com/" Date: Mon, 15 Jun 2009 04:33:14 -0400 Subject: * Version mistake? --- doc/news/version_3.141/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/news/version_3.141/discussion.mdwn diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn new file mode 100644 index 000000000..8807c34b0 --- /dev/null +++ b/doc/news/version_3.141/discussion.mdwn @@ -0,0 +1,2 @@ +Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15? +--[[Paweł|users/ptecza]] -- cgit v1.2.3 From 5a57d9a767dfe93844b2edb77aa9caa6a8be4005 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 10:25:22 +0100 Subject: guess at versioning scheme --- doc/news/version_3.141/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn index 8807c34b0..97a07a8a0 100644 --- a/doc/news/version_3.141/discussion.mdwn +++ b/doc/news/version_3.141/discussion.mdwn @@ -1,2 +1,4 @@ Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15? --[[Paweł|users/ptecza]] + +> I suspect the next version will be 3.1415 ;) -- [[Jon]] -- cgit v1.2.3 From c5dd7927490914e60c0f565fcc3224bb66ebfd67 Mon Sep 17 00:00:00 2001 From: "http://ptecza.myopenid.com/" Date: Mon, 15 Jun 2009 06:58:19 -0400 Subject: * Response --- doc/news/version_3.141/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn index 97a07a8a0..b6039312e 100644 --- a/doc/news/version_3.141/discussion.mdwn +++ b/doc/news/version_3.141/discussion.mdwn @@ -2,3 +2,6 @@ Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15? --[[Paweł|users/ptecza]] > I suspect the next version will be 3.1415 ;) -- [[Jon]] + +>> And next 3.14159, 3.141592, etc. :) I think that version schema +>> should be patented by Joey ;) --[[Paweł|users/ptecza]] -- cgit v1.2.3 From 816a772037ffb904dac96120227f11124c1f8623 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Mon, 15 Jun 2009 07:17:38 -0400 Subject: Knuth to the rescue! --- doc/news/version_3.141/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn index b6039312e..be3c03cd1 100644 --- a/doc/news/version_3.141/discussion.mdwn +++ b/doc/news/version_3.141/discussion.mdwn @@ -5,3 +5,9 @@ Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15? >> And next 3.14159, 3.141592, etc. :) I think that version schema >> should be patented by Joey ;) --[[Paweł|users/ptecza]] + +>>> That's not exactly new; quoting from : +>>> +>>>> The latest and best TeX is currently version 3.1415926 (and plain.tex is version 3.141592653); METAFONT is currently version 2.718281 (and plain.mf is version 2.71). My last will and testament for TeX and METAFONT is that their version numbers ultimately become $\pi$ and $e$, respectively. At that point they will be completely error-free by definition. +>>> +>>> --[[tschwinge]] -- cgit v1.2.3 From d17bce8bb2b2cf375e1acd13d9f5ea706f13215f Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:22:02 +0100 Subject: new bug: map doesn't close UL for empty list --- .../map_fails_to_close_ul_element_for_empty_list.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn new file mode 100644 index 000000000..c786c5f68 --- /dev/null +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -0,0 +1,16 @@ +input: + + before. + \[[!map pages="sdfsdfsdfsd/*"]] + after. + +Presuming that the pagespec does not match, output: + + <p>before. + <div class="map"> + <ul> + </div></p> + +The UL element is not closed. + +-- [[Jon]] -- cgit v1.2.3 From 82cc6ff4dadefa57c920c77ceb6a481afe6f0be9 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:28:36 +0100 Subject: patch for this bug --- .../map_fails_to_close_ul_element_for_empty_list.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index c786c5f68..28960b9d7 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -13,4 +13,23 @@ Presuming that the pagespec does not match, output: The UL element is not closed. +Patch[[!tag patch]]: + + --- /usr/share/perl5/IkiWiki/Plugin/map.pm 2009-05-06 00:56:55.000000000 +0100 + +++ IkiWiki/Plugin/map.pm 2009-06-15 12:23:54.000000000 +0100 + @@ -137,11 +137,11 @@ + $openli=1; + $parent=$item; + } + - while ($indent > 0) { + + while ($indent > 1) { + $indent--; + $map .= "\n\n"; + } + - $map .= "\n"; + + $map .= "\n\n"; + return $map; + } + + -- [[Jon]] -- cgit v1.2.3 From 04964d3ac0ccb6e9cebcb33708463a0ccb84cee7 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:29:23 +0100 Subject: don't escape <> (done for us) --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index 28960b9d7..b1f8ed2b3 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -6,10 +6,10 @@ input: Presuming that the pagespec does not match, output: - <p>before. - <div class="map"> - <ul> - </div></p> +

before. +

+
    +

The UL element is not closed. -- cgit v1.2.3 From dc2d9b0752420e08d91ca5fb41893c9ad7778c09 Mon Sep 17 00:00:00 2001 From: "http://ptecza.myopenid.com/" Date: Mon, 15 Jun 2009 09:27:59 -0400 Subject: * Reply --- doc/news/version_3.141/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn index be3c03cd1..1f5f39282 100644 --- a/doc/news/version_3.141/discussion.mdwn +++ b/doc/news/version_3.141/discussion.mdwn @@ -11,3 +11,6 @@ Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15? >>>> The latest and best TeX is currently version 3.1415926 (and plain.tex is version 3.141592653); METAFONT is currently version 2.718281 (and plain.mf is version 2.71). My last will and testament for TeX and METAFONT is that their version numbers ultimately become $\pi$ and $e$, respectively. At that point they will be completely error-free by definition. >>> >>> --[[tschwinge]] + +>>>> Thanks for the info, Thomas! I didn't know about it. Sorry Joey, +>>>> but Don Knuth was faster. What a pity... ;) --[[Paweł|users/ptecza]] -- cgit v1.2.3 From ff55f5225649c3bd8091d379733065a41053f547 Mon Sep 17 00:00:00 2001 From: "http://openid.steve.org.uk/" Date: Mon, 15 Jun 2009 12:52:16 -0400 Subject: --- doc/sandbox/test.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/test.mdwn diff --git a/doc/sandbox/test.mdwn b/doc/sandbox/test.mdwn new file mode 100644 index 000000000..db20a2fbc --- /dev/null +++ b/doc/sandbox/test.mdwn @@ -0,0 +1 @@ +testing my openid provider @ www.steve.org.uk -- cgit v1.2.3 From e94289e9e4109e20e90a21fa6574f2156e502423 Mon Sep 17 00:00:00 2001 From: "http://www.steve.org.uk/" Date: Mon, 15 Jun 2009 13:01:46 -0400 Subject: --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 4b6b9f270..bb486bd2c 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -2,6 +2,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v ---- +Testing OpenID some more.. + test more test [[中文显示]] -- cgit v1.2.3 From a648c439f3467571374daf597e9b3a659ea2008f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 16 Jun 2009 17:15:06 +0100 Subject: img plugin: do not emit a redundant double-quote before alt attribute --- IkiWiki/Plugin/img.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index a697fea19..a186abdfc 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -121,7 +121,7 @@ sub preprocess (@) { my $imgtag=''.$params{alt}.' Date: Tue, 16 Jun 2009 12:22:24 -0400 Subject: bug report + patch --- doc/bugs/img_with_alt_has_extra_double_quote.mdwn | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 doc/bugs/img_with_alt_has_extra_double_quote.mdwn diff --git a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn new file mode 100644 index 000000000..18aea6841 --- /dev/null +++ b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn @@ -0,0 +1,30 @@ +The [[ikiwiki/directive/img]] directive emits an extra double quote if alt=x is +specified (as is necessary for valid HTML). This results in malformed HTML, +like this: + + A + ^ + +This [[patch]] is available from the img-bugfix branch in my git repository: + + commit a648c439f3467571374daf597e9b3a659ea2008f + Author: Simon McVittie + Date: 2009-06-16 17:15:06 +0100 + + img plugin: do not emit a redundant double-quote before alt attribute + + diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm + index a697fea..a186abd 100644 + --- a/IkiWiki/Plugin/img.pm + +++ b/IkiWiki/Plugin/img.pm + @@ -121,7 +121,7 @@ sub preprocess (@) { + my $imgtag=''.$params{alt}.' Date: Tue, 16 Jun 2009 12:36:17 -0400 Subject: feature addition + patch --- doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn new file mode 100644 index 000000000..c482087d9 --- /dev/null +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn @@ -0,0 +1,12 @@ +A [[patch]] in my git repository (the inline-pagenames branch) adds the following +parameter to the [[ikiwiki/directives/inline]] directive: + +> * `pagenames` - If given instead of `pages`, this is interpreted as a +> space-separated list of links to pages (with the same +> [[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined +> in exactly the order given: the `sort` and `pages` parameters cannot be used +> in conjunction with this one. + +This is on my [[wishlist]] for my [[plugins/contrib/album]] plugin, which currently +uses it internally (as it has already collected the pages in order). It could also +be useful for other things, like [[todo/wikitrails]]. --[[smcv]] -- cgit v1.2.3 From c94dce8afaab602978a2856155c310b8fc3947cd Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:07:58 -0400 Subject: --- doc/plugins/contrib/album.mdwn | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 doc/plugins/contrib/album.mdwn diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn new file mode 100644 index 000000000..94d5789d7 --- /dev/null +++ b/doc/plugins/contrib/album.mdwn @@ -0,0 +1,100 @@ +[[!template id=plugin name=album author="[[Simon_McVittie|smcv]]"]] +[[!tag type/chrome]] + +Available from [[smcv]]'s git repository, in the `album` branch +([[users/smcv/gallery|users/smcv/gallery]] contains some older +thoughts about this plugin). + +This plugin formats a collection of images into a photo album, +in the same way as many websites: good examples include the +PHP application [Gallery](http://gallery.menalto.com/), Flickr, +and Facebook's Photos "application". I've called it `album` +to distinguish it from [[contrib/gallery|plugins/contrib/gallery]], +although `gallery` might well be a better name for this functionality. + +The web UI I'm trying to achieve consists of one +[HTML page of thumbnails](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/) +as an entry point to the album, where each thumbnail links to +[a "viewer" HTML page](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/img_0068/) +with a full size image, next/previous thumbnail links, and +[[plugins/comments]]. + +(The Summer of Code [[plugins/contrib/gallery]] plugin does the +next/previous UI in Javascript using Lightbox, which means that +individual photos can't be bookmarked in a meaningful way, and +the best it can do as a fallback for non-Javascript browsers +is to provide a direct link to the image.) + +## Writing the viewers + + \[[!albumimage image=foo.jpg album=myalbum + title=... + caption=... + copyright=... + size=... + viewertemplate=... + ]] + +Each viewer contains one `\[[!albumimage]]` directive. This +sets the `image` filename, the `album` in which this image appears, +and an optional `caption`, and can override the `size` at which to +display the image and the `viewertemplate` to use to display the +image. + +It can also have `title`, `copyright` and `date` parameters, which +are short-cuts for [[ikiwiki/directive/meta]] directives. + +The viewer can also have any other content, but typically the +directive will be the only thing there. + +Eventually, there will be a specialized CGI user interface to +edit all the photos of an album at once, upload a new photo +(which will attach the photo but also write out a viewer page +for it), or mark an already-uploaded photo as a member of an +album (which is done by writing out a viewer page for it). + +The `\[[!albumimage]]` directive is replaced by an +[[ikiwiki/directive/img]], wrapped in some formatting using a +template (by default `albumviewer.tmpl`). The template can (and +should) also include "next photo", "previous photo" and +"up to gallery" links. + +The next/previous links are themselves implemented by +[[inlining|ikiwiki/directive/inline]] the next or previous +photo, using a special template (by default `albumnext.tmpl` +or `albumprev.tmpl`), in `archive`/`quick` mode. + +## Writing the album + +The album contains one `\[[!album]]` directive. It may also +contain any number of `\[[!albumsection]]` directives, for +example the demo album linked above could look like: + + \[[!album]] + + + ## Gamarra + + \[[!albumsection filter="link(gamarra)"]] + + + ## Smokescreen + + \[[!albumsection filter="link(smokescreen)"]] + + + ... + +The `\[[!album]]` directive is replaced by an +[[ikiwiki/directive/inline]] which automatically includes every +page that has an `\[[!albumimage]]` directive linking it to this +album, except those that will appear in an `\[[!albumsection]]`. + +The `inline` is in `archive`/`quick` mode, but includes some +extra information about the images, including file size and a +thumbnail (again, made using [[ikiwiki/directive/img]]). The +default template is `albumitem.tmpl`, which takes advantage +of these things. + +Each `\[[!albumsection]]` is replaced by a similar inline, which +selects a subset of the photos in the album. -- cgit v1.2.3 From 171af6cbbce01fa43c5a1fbe14e3384aadcd4875 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:10:10 -0400 Subject: Fix links --- doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn index c482087d9..ed47b05c7 100644 --- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn @@ -3,7 +3,7 @@ parameter to the [[ikiwiki/directives/inline]] directive: > * `pagenames` - If given instead of `pages`, this is interpreted as a > space-separated list of links to pages (with the same -> [[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined +> [[ikiwiki/SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined > in exactly the order given: the `sort` and `pages` parameters cannot be used > in conjunction with this one. -- cgit v1.2.3 From dbc641e1ff69bfd48891db1dbe8987dd1f541805 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:11:07 -0400 Subject: Fix links --- doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn index ed47b05c7..04d3833df 100644 --- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn @@ -1,5 +1,5 @@ A [[patch]] in my git repository (the inline-pagenames branch) adds the following -parameter to the [[ikiwiki/directives/inline]] directive: +parameter to the [[ikiwiki/directiveb/inline]] directive: > * `pagenames` - If given instead of `pages`, this is interpreted as a > space-separated list of links to pages (with the same -- cgit v1.2.3 From 37617af685aaf2d0d47dd86e6a45e48570bc9ca9 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:13:45 -0400 Subject: grr, another typo --- doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn index 04d3833df..fc575e013 100644 --- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn @@ -1,5 +1,5 @@ A [[patch]] in my git repository (the inline-pagenames branch) adds the following -parameter to the [[ikiwiki/directiveb/inline]] directive: +parameter to the [[ikiwiki/directive/inline]] directive: > * `pagenames` - If given instead of `pages`, this is interpreted as a > space-separated list of links to pages (with the same -- cgit v1.2.3 From a7ae9d0b7e16153c389360e8b8b67d3e70488bf4 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:36:55 -0400 Subject: there's more than one way to do it --- doc/todo/wikitrails/discussion.mdwn | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/doc/todo/wikitrails/discussion.mdwn b/doc/todo/wikitrails/discussion.mdwn index 327e61491..3ef52c197 100644 --- a/doc/todo/wikitrails/discussion.mdwn +++ b/doc/todo/wikitrails/discussion.mdwn @@ -4,6 +4,8 @@ one-photo-per-page galleries, where each page has previous|up|next links (\[[!inline]] with a specially modified template perhaps). I'll watch this with interest! --[[smcv]] +---- + This is a nice idea, I do have my gripes about the imeplementation. Assuming that the index's list is in mdwn format is not ideal. I guess the @@ -22,3 +24,62 @@ breadcrums to be automatically inserted at the top of every page on the trail. (You'd have to use a directive to define the index for that to work.) --[[Joey]] + +---- + +Revisiting this, after effectively reimplementing a small version of it +in [[plugins/contrib/album]]: it occurs to me that might be a more +"ikiwiki-like" way we could get this functionality. + +In the index page, you either want an [[ikiwiki/directive/inline]], or +a list of links. In the former case, maybe we could extend inline like +this: + + \[[!inline ... blah blah ... trail=yes]] + +to make it remember the pages it inlined, in order, in the pagestate; +in the latter case, we could replace the wikilinks with a directive, +an operation something like this in diff notation: + + - [[one]] - the unit + - [[two]] - the base of binary + - [[three|3]] - is a crowd + + \[[!trailitem one]] - the unit + + \[[!trailitem two]] - the base of binary + + \[[!trailitem three|3]] - is a crowd + +and have that directive remember the pages in order. + +In both cases, a scan() hook could clear the list before starting to +scan, then the inline or trailitem preprocessor directive could run in +the scan stage as well as the render stage (in the case of inline, +there'd be a very early return if trail=yes was not given, and +an early return after collecting and sorting the pages if not +actually rendering). + +This would mean that the contents of the trail, and a list of +trails in which each page can be found, would already be in +the pagestate by the time any page was rendered, so we'd be able +to use them for output, either in a pagetemplate() hook or +a \[[!trail]] preprocessor directive. + +This way, my album plugin could be turned inside out: instead +of precomputing the pages to be inlined, then using +[[pagenames|todo/inline plugin: specifying ordered page names]] +to get them into the inline, it could just do the inline, then +incorporate the output of \[[!trail]] into the template rendered +for \[[!albumimage]] on each viewer page. (Also, the viewers +wouldn't necessarily need to reference the album, only the other +way round.) + +Using a pagetemplate() hook to stuff the next/previous links +into page.tmpl would actually be a bit unfortunate for \[[!album]], +because that plugin definitely wants to style the next/previous +links as a thumbnail, which means there'd have to be a way to +affect the style - perhaps by arranging for album's pagetemplate +hook to run *after* trail's, or perhaps by having trail's +pagetemplate hook disable itself for pages that contain +a \[[!trail]] directive. + +Does this sound viable? Should I think about implementing it? +--[[smcv]] -- cgit v1.2.3 From 64e714cee4d1e12ec7ab3250ddc48e83b4f09e15 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:42:34 -0400 Subject: revisiting with implementation experience --- doc/users/smcv/gallery.mdwn | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/users/smcv/gallery.mdwn b/doc/users/smcv/gallery.mdwn index b6b8de79f..d80fc3ba1 100644 --- a/doc/users/smcv/gallery.mdwn +++ b/doc/users/smcv/gallery.mdwn @@ -1,8 +1,5 @@ -[[!template id=plugin name=smcvgallery author="[[Simon_McVittie|smcv]]"]] -[[!tag type/chrome]] - -This plugin has not yet been written; this page is an experiment in -design-by-documentation :-) +This plugin has now been implemented as [[plugins/contrib/album]]; this +page has older thoughts about it. ## Requirements @@ -124,6 +121,8 @@ an option!) ### Synthesize source pages for viewers +(Edited to add: this is what [[plugins/contrib/album]] implements. --[[smcv]]) + Another is to synthesize source pages for the viewers. This means they can have tags and metadata, but trying to arrange for them to be scanned etc. correctly without needing another refresh run is somewhat terrifying. @@ -145,6 +144,10 @@ in that directory during the refresh hook. The source pages could be in the underlay until they are edited (e.g. tagged), at which point they would be copied into the source-code-controlled version in the usual way. +> Coming back to this: a specialized web UI to mark attachments as part of +> the gallery would make this easy too - you'd put the photos in the +> underlay, then go to the CGI and say "add all". --[[smcv]] + The synthetic source pages can be very simple, using the same trick as my [[plugins/comments]] plugin (a dedicated [[directive|ikiwiki/directives]] encapsulating everything the plugin needs). If the plugin automatically @@ -153,6 +156,9 @@ only the human-edited information and a filename reference need to be present in the source page; with some clever lookup rules based on the filename of the source page, not even the photo's filename is necessarily needed. +> Coming back to this later: the clever lookup rules make dependency tracking +> hard, though. --[[smcv]] + \[[!meta title="..."]] \[[!meta date="..."]] \[[!meta copyright="..."]] -- cgit v1.2.3 From 3aa4eba5e6d8aa45a06558efe3a8272b6c2cf6a1 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:44:44 -0400 Subject: disarm wikilinks --- doc/todo/wikitrails/discussion.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/todo/wikitrails/discussion.mdwn b/doc/todo/wikitrails/discussion.mdwn index 3ef52c197..b2a0937ad 100644 --- a/doc/todo/wikitrails/discussion.mdwn +++ b/doc/todo/wikitrails/discussion.mdwn @@ -41,9 +41,9 @@ to make it remember the pages it inlined, in order, in the pagestate; in the latter case, we could replace the wikilinks with a directive, an operation something like this in diff notation: - - [[one]] - the unit - - [[two]] - the base of binary - - [[three|3]] - is a crowd + - \[[one]] - the unit + - \[[two]] - the base of binary + - \[[three|3]] - is a crowd + \[[!trailitem one]] - the unit + \[[!trailitem two]] - the base of binary + \[[!trailitem three|3]] - is a crowd -- cgit v1.2.3 From d25c4acfdb06d1c5529be8e3cd10e87f6a816bc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Jun 2009 15:09:49 -0400 Subject: img: Fix extra double quote with alt text. (smcv) --- debian/changelog | 6 ++++++ doc/bugs/img_with_alt_has_extra_double_quote.mdwn | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8ee065803..86aeb0b7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1415) UNRELEASED; urgency=low + + * img: Fix extra double quote with alt text. (smcv) + + -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" diff --git a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn index 18aea6841..81bbe7fb5 100644 --- a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn +++ b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn @@ -28,3 +28,5 @@ This [[patch]] is available from the img-bugfix branch in my git repository: (exists $params{id} ? ' id="'.$params{id}.'"' : ''). --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From c077e4b6e78bb671912675c795a3d6215defa24e Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Thu, 18 Jun 2009 11:36:38 -0400 Subject: an improvement in this direction --- doc/todo/should_optimise_pagespecs.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 0ef8a7847..02d7483c2 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -79,4 +79,13 @@ I can think about reducung the size of my wiki source and making it available on > > --[[Joey]] -[[!tag wishlist]] +>> I've been looking at optimizing ikiwiki for a site using +>> [[plugins/contrib/album]] (which produces a lot of pages) and it seems +>> that checking which pages depend on which pages does take a significant +>> amount of time. The optimize-depends branch in my git repository +>> avoids using `pagespec_merge()` for this (indeed it's no longer used +>> at all), and instead represents dependencies as a list of pagespecs +>> rather than a single pagespec. This does turn out to be faster, although +>> not as much as I'd like. --[[smcv]] + +[[!tag wishlist patch]] -- cgit v1.2.3 From 7fe5002e07532adea09292e84d15d71d97585d7e Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Thu, 18 Jun 2009 16:06:16 -0400 Subject: feature addition + patch --- ...ts:_ability_to_limit_to_links_from_certain_pages.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn diff --git a/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn b/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn new file mode 100644 index 000000000..abf7c3fea --- /dev/null +++ b/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn @@ -0,0 +1,16 @@ +The `among` branch in my git repository refactors IkiWiki::Render a +bit, then uses this refactoring to add a [[ikiwiki/directive/pagestats]] +parameter `among` that will only count links from pages that match a +given [[ikiwiki/PageSpec]]. From its documentation: + +> The optional `among` parameter limits counting to pages that match a +> [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog +> entries, you could use: +> +> \[[!pagestats pages="tags/*" among="blog/posts/*"]] +> +> or to display a cloud of tags related to Linux, you could use: +> +> \[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]] + +Suggestions for a better parameter name are welcome. --[[smcv]] -- cgit v1.2.3 From 81bcfd94544b431c318507464550b85e7af33aa3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Jun 2009 22:02:53 -0400 Subject: add Mick Pollard --- doc/tipjar.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn index e678053bb..787df9bf7 100644 --- a/doc/tipjar.mdwn +++ b/doc/tipjar.mdwn @@ -12,6 +12,7 @@ Thanks to the following people for their kind contributions: * Adam Shand * Martin Krafft * Paweł Tęcza +* Mick Pollard (Note that this page is locked to prevent anyone from tampering with the PayPal button. If you prefer your donation *not* be listed here, let [[Joey]] know.) -- cgit v1.2.3 From c25371b3114137368a89b5c77c92e316f0d16475 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Fri, 19 Jun 2009 14:19:45 +0100 Subject: speeding up ikiwiki: advice sought --- doc/forum/speeding_up_ikiwiki.mdwn | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 doc/forum/speeding_up_ikiwiki.mdwn diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn new file mode 100644 index 000000000..c9ccc6fb1 --- /dev/null +++ b/doc/forum/speeding_up_ikiwiki.mdwn @@ -0,0 +1,75 @@ +My website takes a fairly long time to render. It takes a long time to do +things like add pages, too. I'd like to try and understand what takes the +time and what I might be able to do to speed things up. + +I have 1,234 objects on my site (yikes!). 717 are items under "/log" which +I think might be the main culprit because there are some complex pagespecs +operating in that area (e.g. log/YYYY/MM/DD, YYYY/MM and YYYY for YYYY >= +2003, YYYY <= 2008 which include every page under log/ which was modified +in the corresponding YYYY or YYYY/MM or YYYY/MM/DD). There is very little +linking between the world outside of /log and that within it. + +I was interested in generating a graphical representation of ikiwiki's idea of +page inter-dependencies. I started by looking at the '%links' hash using the +following plugin: + + #!/usr/bin/perl + package IkiWiki::Plugin::deps; + + use warnings; + use strict; + use IkiWiki 3.00; + + + sub import { + hook(type => "format", id => "deps", call => \&fooble); + } + + my $hasrun = 0; + + sub fooble ($$) { + if(0 == $hasrun) { + $hasrun = 1; + open MYFILE, ">/home/jon/deps.dot"; + foreach my $key (keys %links) { + my $arrref = $links{$key}; + foreach my $page (@$arrref) { + print MYFILE "$key -> $page;\n"; + } + } + close MYFILE; + } + } + + 1 + +The resulting file was enormous: 2,734! This turns out to be because of the following code in scan() in Render.pm: + + if ($config{discussion}) {$ + # Discussion links are a special case since they're + # not in the text of the page, but on its template. + $links{$page}=[ $page."/".gettext("discussion") ]; + +Worst case (no existing discussion pages) this will double the number of link +relationships. Filtering out all of those, the output drops to 1,657. This +number is still too large to really visualize: the graphviz PNG and PDF output +engines segfault for me, the PS one works but I can't get any PS software to +render it without exploding. + +Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at that data structure / where I might be able to add some debugging foo to generate a graph of it? + +Once I've figured out that I might be able to optimize some pagespecs. I +understand pagespecs are essentially translated into sequential perl code. I +might gain some speed if I structure my complex pagespecs so that the tests +which have the best time complexity vs. "pages ruled out" ratio are performed +first. + +I might also be able to find some dependencies which shouldn't be there and +remove the dependency. + +In general any advice people could offer on profiling ikiwiki would be great. +I did wonder about invoking the magic profiling arguments to perl via the CGI +wrapper. + + +-- [[Jon]] -- cgit v1.2.3 From 9a5e3fac022dc5745eac51dd45f79b07f7e24eba Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 20 Jun 2009 14:14:36 -0400 Subject: explain %depends and suggest [[!inline quick=yes]] --- doc/forum/speeding_up_ikiwiki.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn index c9ccc6fb1..e390f7b71 100644 --- a/doc/forum/speeding_up_ikiwiki.mdwn +++ b/doc/forum/speeding_up_ikiwiki.mdwn @@ -73,3 +73,19 @@ wrapper. -- [[Jon]] + +> Dependencies go in the `%IkiWiki::depends` hash, which is not exported. It +> can also be dumped out as part of the wiki state - see [[tips/inside_dot_ikiwiki]]. +> +> It's a map from page name to increasingly complex pagespec, although +> the `optimize-depends` branch in my git repository changes that to a +> map from a page name to a *list* of pagespecs which are automatically +> or'd together for use (this at least means duplicates can be weeded out). +> +> See [[todo/should_optimize_pagespecs]] for more on that. +> +> I've been hoping to speed up IkiWiki too - making a lot of photo albums +> with my [[plugins/contrib/album]] plugin makes it pretty slow. +> +> One thing that I found was a big improvement was to use `quick=yes` on all +> my `archive=yes` [[ikiwiki/directive/inline]]s. --[[smcv]] -- cgit v1.2.3 From 9cd86bc2db838bb2f0191dfcec9125ba222615a5 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 20 Jun 2009 14:15:31 -0400 Subject: correct link spelling --- doc/forum/speeding_up_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn index e390f7b71..0b2164238 100644 --- a/doc/forum/speeding_up_ikiwiki.mdwn +++ b/doc/forum/speeding_up_ikiwiki.mdwn @@ -82,7 +82,7 @@ wrapper. > map from a page name to a *list* of pagespecs which are automatically > or'd together for use (this at least means duplicates can be weeded out). > -> See [[todo/should_optimize_pagespecs]] for more on that. +> See [[todo/should_optimise_pagespecs]] for more on that. > > I've been hoping to speed up IkiWiki too - making a lot of photo albums > with my [[plugins/contrib/album]] plugin makes it pretty slow. -- cgit v1.2.3 From 2b722cfd689f789b786624c36046f8992fabefe9 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Mon, 22 Jun 2009 06:27:56 -0400 Subject: templating question --- doc/ikiwiki/directive/inline/discussion.mdwn | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index 3f62c2767..f7f091a4f 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -56,3 +56,34 @@ to nowhere for 20 bugs.« is shown inlined. > > So no, you can't reference template directive parameters inside inline's > template, because it's already expanded at that point. --[[Joey]] + +## meta parameters are not enough + +I think I have the same problem as Paule, as I want extra arbitary parameters in my template. + +This is what I am doing currently, which makes my skin crawl. In `wgts/foo.mdwn` +I have resorted to using AUTHORURL as the location of this widgets icon: + + [[!meta authorurl="/ico/aHR0cDovL2JvbmRpLm9tdHAub3JnL3dpZGdldHMvYmF0dGVyeQ==.png" ]] + +In templates I have a file called `wgtlist.tmpl`: + +
+ + + + +
+ +
+ + Posted +
+ +My index page has: + + [[!inline pages="./wgts/*" show=5 feeds=no actions=no rootpage="wgts" archive="yes" template=wgtlist]] + +Else can you please suggest a smarter way of getting certain data out from pages for a inline index? + +--[[hendry]] -- cgit v1.2.3 From 0d76893483f961755dc181d4a2fd2ee3af1373ea Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 22 Jun 2009 06:57:00 -0400 Subject: bug report + patches --- .../openid_no_longer_pretty-prints_OpenIDs.mdwn | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn new file mode 100644 index 000000000..a2bb5893a --- /dev/null +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -0,0 +1,23 @@ +The git commit (in my `openid` branch) says it all: + + Update IkiWiki::openiduser to work with Net::OpenID 2.x + + openiduser previously used a constructor that no longer works in 2.x. + However, all we actually want is the (undocumented) DisplayOfURL function + that is invoked by the display method, so try to use that. + +This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). + +Relatedly, the other commit on the same branch would be nice to have: + + Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser + + On various sites I have two IkiWiki instances running from the same + repository: one accessible via http and only accepting openid logins, + and one accessible via authenticated https and only accepting httpauth. + Ideally, the https version should still pretty-print OpenIDs seen in + git history. + +--[[smcv]] + +[[!tag patch]] -- cgit v1.2.3 From 7ad6541a87bff64c84dcbb02f820c73d55f44845 Mon Sep 17 00:00:00 2001 From: "http://mjr.towers.org.uk/" Date: Mon, 22 Jun 2009 13:57:18 -0400 Subject: Home site is MIA. Where is it? --- doc/plugins/contrib/mediawiki/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/plugins/contrib/mediawiki/discussion.mdwn diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn new file mode 100644 index 000000000..505b0189e --- /dev/null +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -0,0 +1 @@ +Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop -- cgit v1.2.3 From 46bdb84eb1e44ac967dce697757b01fb91922f2e Mon Sep 17 00:00:00 2001 From: "http://johnsu01.livejournal.com/" Date: Mon, 22 Jun 2009 14:23:22 -0400 Subject: FSF uses it internally. --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index b9fcc71da..a8e5a69fd 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -45,6 +45,7 @@ Projects & Organizations * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) * The [GNU Hurd](http://www.gnu.org/software/hurd/)'s web pages +* The [Free Software Foundation](http://fsf.org) uses it for their internal wiki, with subversion. Personal sites and blogs ======================== -- cgit v1.2.3 From 6b9549b53a2e75fb2262611ddecad2583e2daa73 Mon Sep 17 00:00:00 2001 From: simonraven Date: Mon, 22 Jun 2009 15:06:14 -0400 Subject: --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index a8e5a69fd..05a6fc91a 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -119,7 +119,7 @@ Personal sites and blogs * [Per Bothner's blog](http://per.bothner.com/blog/) * [Bernd Zeimetz (bzed)](http://bzed.de/) * [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch) -* [Simon Kjika'qawej C.](http://simonraven.kisikew.org/ikiwiki/) Please note it might change location at any time (likely wiki.k.o or under /wiki/ at simonraven.k.o). +* [Simon Kjika'qawej C.](http://simonraven.kisikew.org/) - several other sites, too. * [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!! * [Natalian - Kai Hendry's personal blog](http://natalian.org/) * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au) -- cgit v1.2.3 From b5edd6d4d8f2e3b50213b91f1696195f8a83e97d Mon Sep 17 00:00:00 2001 From: simonraven Date: Mon, 22 Jun 2009 17:09:26 -0400 Subject: --- doc/plugins/contrib/mediawiki/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn index 505b0189e..07e6e8cdd 100644 --- a/doc/plugins/contrib/mediawiki/discussion.mdwn +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -1 +1,3 @@ Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop + +> I ended up doing a backassward way of doing it, as described at the [convert discussion page](http://ikiwiki.info/tips/convert_mediawiki_to_ikiwiki/discussion/). -[[simonraven]] -- cgit v1.2.3 From 4877b201c06eb84c081cf17cea88cea812d9589f Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Tue, 23 Jun 2009 00:13:46 -0400 Subject: Add a ref to some other discussion which may, or may not, be relevant. --- doc/todo/should_optimise_pagespecs.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 02d7483c2..5bbfc0aca 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -88,4 +88,6 @@ I can think about reducung the size of my wiki source and making it available on >> rather than a single pagespec. This does turn out to be faster, although >> not as much as I'd like. --[[smcv]] +>>> I just wanted to note that there is a whole long discussion of dependencies and pagespecs on the [[todo/tracking_bugs_with_dependencies]] page. -- [[Will]] + [[!tag wishlist patch]] -- cgit v1.2.3 From 1380ef73e7ee95b3476f26fe311a45e62e60328a Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 23 Jun 2009 06:15:45 -0400 Subject: --- doc/todo/should_optimise_pagespecs.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 5bbfc0aca..c5485477f 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -90,4 +90,10 @@ I can think about reducung the size of my wiki source and making it available on >>> I just wanted to note that there is a whole long discussion of dependencies and pagespecs on the [[todo/tracking_bugs_with_dependencies]] page. -- [[Will]] +>>>> Yeah, I had a look at that (as the only other mention of `pagespec_merge`). +>>>> I think I might have solved some of the problems mentioned there, +>>>> actually - `pagespec_merge` no longer needs to exist in my branch (although +>>>> I haven't actually deleted it), because the "or" operation is now done in +>>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]] + [[!tag wishlist patch]] -- cgit v1.2.3 From 7aec8e12acb00520259d91280500e1b39e85bdfc Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Tue, 23 Jun 2009 11:30:47 +0100 Subject: link to mirror of mediawiki.pm --- doc/plugins/contrib/mediawiki.mdwn | 2 ++ doc/plugins/contrib/mediawiki/discussion.mdwn | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn index c0a23254f..7bf1ba0df 100644 --- a/doc/plugins/contrib/mediawiki.mdwn +++ b/doc/plugins/contrib/mediawiki.mdwn @@ -3,3 +3,5 @@ [The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to process pages written using MediaWiki markup. + +Available at diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn index 07e6e8cdd..5066d9de5 100644 --- a/doc/plugins/contrib/mediawiki/discussion.mdwn +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -1,3 +1,5 @@ Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop > I ended up doing a backassward way of doing it, as described at the [convert discussion page](http://ikiwiki.info/tips/convert_mediawiki_to_ikiwiki/discussion/). -[[simonraven]] + +>> I've mirrored it at . -- [[Jon]] -- cgit v1.2.3 From 1f25194934c5c2d8e3a9207f1c62fe864aa7e28f Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Tue, 23 Jun 2009 09:13:35 -0400 Subject: --- doc/todo/enable-htaccess-files.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index e3b295123..2aae3b9b9 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -47,4 +47,8 @@ but I use ikiwiki with a very small group of people collaborating so svn/web acc and htaccess is for limiting access to some areas of wiki. It should be off by default of course. --Max +--- ++1 I want `.htaccess` so I can rewrite some old Wordpress URLs to make feeds work again. --[[hendry]] + + [[!tag patch]] -- cgit v1.2.3 From 4ec70ba46981958444a85dfc7b03154c43fc2c94 Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Tue, 23 Jun 2009 12:18:15 -0400 Subject: --- doc/todo/enable-htaccess-files.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index 2aae3b9b9..15efab70c 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -50,5 +50,7 @@ It should be off by default of course. --Max --- +1 I want `.htaccess` so I can rewrite some old Wordpress URLs to make feeds work again. --[[hendry]] +--- ++1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]] [[!tag patch]] -- cgit v1.2.3 From 2d01a51aab8753d3985b23c81cfe73cfe217d8da Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Sun, 28 Jun 2009 17:30:18 -0400 Subject: Further question on how to format or specify what `inline` should display. --- doc/ikiwiki/directive/inline/discussion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index f7f091a4f..02530ce08 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -57,6 +57,23 @@ to nowhere for 20 bugs.« is shown inlined. > So no, you can't reference template directive parameters inside inline's > template, because it's already expanded at that point. --[[Joey]] +>> Thank you for the explanation. Can you think of another way to accomplish +>> my goals? +>> +>> Right now, I only see the option to edit the title with the +>> `[[/ikiwiki/directive/meta]]` directive and the field `title`. +>> +>> How could a solution look like? +>> +>> 1. The possibility to add custom fields to the `meta` directive. +>> 1. The possibility to specify in a page, how the page should be displayed +>> when used by inlined. That could be done by a new directive `cinlined` +>> (for »custom inlined«) which is chosen by the `inline` directive to +>> display if told to do so. +>> +>> [[!cinlined text="""Text which can also use Parameter, bla blubb …"""]] +>> --[[PaulePanter]] + ## meta parameters are not enough I think I have the same problem as Paule, as I want extra arbitary parameters in my template. -- cgit v1.2.3 From 137c70aeb3d6f87f4ba65410dbc10f3d153fc7e7 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 29 Jun 2009 07:48:30 -0400 Subject: try using conditional? --- doc/ikiwiki/directive/inline/discussion.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index 02530ce08..be0665d04 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -73,6 +73,26 @@ to nowhere for 20 bugs.« is shown inlined. >> >> [[!cinlined text="""Text which can also use Parameter, bla blubb …"""]] >> --[[PaulePanter]] +>>> You can make the body of a page change depending on whether it's being +>>> inlined, with the [[ikiwiki/directive/if]] directive from the +>>> [[plugins/conditional]] plugin: +>>> +>>> \[[!if test="inlined()" +>>> then="""[[!template id=productsummary +>>> location="Warehouse 23" price=20 +>>> ]]""" +>>> else="""[[!template id=productdetail +>>> location="Warehouse 23" price=20 +>>> description="Every home should have one" +>>> ]]""" +>>> ]] +>>> +>>> Perhaps that does some of what you want? +>>> +>>> If you want to go beyond that, my inclination would be to write +>>> a simple plugin to deal with whatever it is you want to do (bug +>>> metadata or product metadata or whatever) rather than prematurely +>>> generalizing. --[[smcv]] ## meta parameters are not enough -- cgit v1.2.3 From 7cba8bd3759576c8e0454efa32feeb3c22b8e12f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Jun 2009 14:51:49 -0400 Subject: Updated French debconf templates translation. Closes: #535103 --- debian/changelog | 1 + po/fr.po | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 86aeb0b7a..c119dea8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.1415) UNRELEASED; urgency=low * img: Fix extra double quote with alt text. (smcv) + * Updated French debconf templates translation. Closes: #535103 -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 diff --git a/po/fr.po b/po/fr.po index 2e79e8e99..49784e42b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ # Cyril Brulebois , 2007. msgid "" msgstr "" -"Project-Id-Version: ikiwiki 3.14\n" +"Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-12 19:52-0400\n" -"PO-Revision-Date: 2009-06-08 16:41+0200\n" +"PO-Revision-Date: 2009-06-29 16:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgid "" "via http, not https" msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " -"de vous connecter avec http et non https" +"de vous connecter avec http au lieu de https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" @@ -1000,6 +1000,8 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" +"** désactivation du greffon %s, car échec de l'installation, avec le message " +"suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format -- cgit v1.2.3 From 3bb2260fc46c38a7933e379f1a0b5e66df154aec Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Wed, 1 Jul 2009 08:50:42 -0400 Subject: prettydate creates Last edited in the wee hours of Tuesday night, July 1st, 2009 --- doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn new file mode 100644 index 000000000..40aab55ac --- /dev/null +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -0,0 +1 @@ +Prettydate creates strings like this: _Last edited in the wee hours of Tuesday night, July 1st, 2009_. However, July 1st is a Wednesday, so either date or Weekday should be modified. In the spirit is probably _Tuesday night, June 30th_. --ulrik -- cgit v1.2.3 From 2db694603760f547b5fe910d005f0b304d690987 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Jul 2009 13:45:28 -0400 Subject: typo --- IkiWiki/Plugin/prettydate.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm index e155dd39b..82d8a3df3 100644 --- a/IkiWiki/Plugin/prettydate.pm +++ b/IkiWiki/Plugin/prettydate.pm @@ -33,7 +33,7 @@ sub default_timetable { gettext("%A evening"), # 6 "", # 7 gettext("late %A evening"), # 8 - "", # 9 # 9 + "", # 9 gettext("%A night"), # 10 "", # 11 ]; -- cgit v1.2.3 From c4978bfb31bbc2c248db9fc45d69487206dfd852 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Jul 2009 13:47:30 -0400 Subject: response --- ...prettydate_with_weekday-date_inconsistency.mdwn | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 40aab55ac..807ba479d 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -1 +1,28 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday night, July 1st, 2009_. However, July 1st is a Wednesday, so either date or Weekday should be modified. In the spirit is probably _Tuesday night, June 30th_. --ulrik + +> The default prettydate times are fairly idiosyncratic to +> how [[Joey]] thinks about time. Specifically, it's still +> Tuesday night until he wakes up Wednesday morning -- which +> could be in the afternoon. :-P But, Joey also realizes +> that dates change despite his weird time sense, and so +> July 1st starts at midnight on Tuesday and continues +> through Tuesday night and part of Wednesday. +> +> (This might not be as idiosyncratic as I make it out to be.. +> I think that many people would agree that in the wee hours +> of New Years Eve, when they're staggering home ahead of +> the burning daylight, the date is already January 1st.) +> +> I think the bug here is that prettydate can't represent +> all views of time. While the times +> of day can be configured, and it's possible to configure it +> to call times after midnight "Wednesday morning, July 1st", +> it is not possible to configure the date or weekday based +> on the time of day. +> +> In order to do so, prettydate's timetable would need to be +> extended to include the "%B %o, %Y" part, and that extended +> to include "%B-", "%o-", and "%Y-" to refer to the day +> before. +> +> --[[Joey]] -- cgit v1.2.3 From 0c15865aeebcdf7f42c02f51d5bad0a1dd554b90 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Thu, 2 Jul 2009 14:19:35 -0400 Subject: >> fair enough, I think I can get converted to a warped time perspective. --ulrik --- doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 807ba479d..111ade8dd 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -26,3 +26,5 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday n > before. > > --[[Joey]] + +>> fair enough, I think I can get converted to a warped time perspective. --ulrik -- cgit v1.2.3 From c3b066b062f7ab37d2ff54f62084ddbd6c95fb65 Mon Sep 17 00:00:00 2001 From: "https://stanberka.myopenid.com/" Date: Thu, 2 Jul 2009 18:15:52 -0400 Subject: --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index bb486bd2c..02b636c09 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -101,3 +101,5 @@ testing -- [[!toc levels=2]] + +[[Mamma Mia]] -- cgit v1.2.3 From e96f28a31ef38fd886d35150ba76adffeeaa3838 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Sat, 4 Jul 2009 03:50:50 -0400 Subject: rst support for WikiLinks via native syntax --- doc/plugins/rst/discussion.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index a792b670f..db1ba6fc9 100644 --- a/doc/plugins/rst/discussion.mdwn +++ b/doc/plugins/rst/discussion.mdwn @@ -29,4 +29,12 @@ An exhaustive list of differences between prest and "standard" reST follows: * csv directive doesn't require csv.py * references directive doesn't allow options -There may be a few others; my eyes glazed over. --Ethan \ No newline at end of file +There may be a few others; my eyes glazed over. --Ethan + +rst support for ikiwiki seems to be on hold. rst is much more elegant +than markdown in my opinion, so I tried it out in ikiwiki. I found out +in other places that some directives work just fine, like [[meta]] and +[[tag]], others work fine if you wrap them in `.. raw::`, like [[inline]]. + +But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or such since they are inline elements in the text.. But images work fine in rst's syntax.. what about using rst syntax for wikilinks as well? +Is it possible to inject something into the parser to turn unmached links ` `WikiLink`_ ` into ikiwiki links? --ulrik -- cgit v1.2.3 From cb151da23313d9591dfdec244ceaae29aa3a1660 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Sat, 4 Jul 2009 03:52:58 -0400 Subject: rst support for WikiLinks via native syntax (syntax tweak) --- doc/plugins/rst/discussion.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index db1ba6fc9..9909784d5 100644 --- a/doc/plugins/rst/discussion.mdwn +++ b/doc/plugins/rst/discussion.mdwn @@ -36,5 +36,8 @@ than markdown in my opinion, so I tried it out in ikiwiki. I found out in other places that some directives work just fine, like [[meta]] and [[tag]], others work fine if you wrap them in `.. raw::`, like [[inline]]. -But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or such since they are inline elements in the text.. But images work fine in rst's syntax.. what about using rst syntax for wikilinks as well? -Is it possible to inject something into the parser to turn unmached links ` `WikiLink`_ ` into ikiwiki links? --ulrik +But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or +such since they are inline elements in the text.. But images work fine in +rst's syntax.. what about using rst syntax for wikilinks as well? +Is it possible to inject something into the parser to turn unmached links +``WikiLink`_` into ikiwiki links? --ulrik -- cgit v1.2.3 From 24f22973f0db9d2a5a1964264eaf7992f21af270 Mon Sep 17 00:00:00 2001 From: "http://adam.shand.net/" Date: Tue, 7 Jul 2009 07:19:22 -0400 Subject: --- .../Can_OpenID_users_be_adminusers__63__.mdwn | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn new file mode 100644 index 000000000..2e24b3e06 --- /dev/null +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -0,0 +1,23 @@ +I've just finished an upgrade to 3.141 and am trying to give myself admin rights to play with the new webadmin features. My login is via OpenID but from reading on the wiki I believe that OpenID users should be able to be granted admin rights. However I'm obviously doing something wrong as when I click on the "Preferences" link at the top of the page I don't see any admin features. + +My login is: http://adam.shand.net/ + +In .ikiwiki/userdb I see: + +> adam@shand.net +> email
+> password
+> locked_pages
+> banned
+> 1229722296
+> regdate
+> http://adam.shand.net/
+ +And in my config file I have: + +> adminuser => [qw{http://adam.shand.net/}], + +Any pointers to what I'm doing wrong would be much appreciated. + +Thanks, +Adam. -- cgit v1.2.3 From f35f7358e0d86e20031e74ab25f61ae03352fdc6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 13:35:24 -0400 Subject: response --- doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn index 2e24b3e06..83c95d65d 100644 --- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -21,3 +21,15 @@ Any pointers to what I'm doing wrong would be much appreciated. Thanks, Adam. + +> This is certianly supposed to work. For example, the admin +> user on my ikiwikis is `http://joey.kitenet.net/` +> +> The only caveat I know of to make it work is that the +> adminuser openid url has to exactly match the openid url that +> ikiwiki sees when you log in. Including any trailing slash, +> and the `http://`. +> +> Hmm, it's possible that the new version of the openid library +> has broken it. I also no longer show up as admin. There's a related +> bug [[bugs/openid_no_longer_pretty-prints_OpenIDs]]. --[[Joey]] -- cgit v1.2.3 From ea4686a565067b8c9a4cd1f1a76c205c7a38bfed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 21 Jun 2009 12:12:30 +0100 Subject: Update IkiWiki::openiduser to work with Net::OpenID 2.x openiduser previously used a constructor that no longer works in 2.x. However, all we actually want is the (undocumented) DisplayOfURL function that is invoked by the display method, so try to use that. (cherry picked from commit c3dd0ff5c7c10743107f203a5b456fdcd1b171df) --- IkiWiki/Plugin/openid.pm | 14 ++++++++++++-- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 5424c57e2..87569915b 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -189,8 +189,18 @@ sub openiduser ($) { if ($user =~ m!^https?://! && eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) { - my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); - my $display=$oid->display; + my $display; + + if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { + # this works in at least 2.x + $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); + } + else { + # this only works in 1.x + my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); + $display=$oid->display; + } + # Convert "user.somehost.com" to "user [somehost.com]" # (also "user.somehost.co.uk") if ($display !~ /\[/) { diff --git a/debian/changelog b/debian/changelog index c119dea8e..bb33f25f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.1415) UNRELEASED; urgency=low * img: Fix extra double quote with alt text. (smcv) * Updated French debconf templates translation. Closes: #535103 + * openid: Support Net::OpenID 2.x when pretty-printing + openids. (smcv) -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 -- cgit v1.2.3 From df6430afae4632c000cee2b6bfbcd5c8c759dd83 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 13:40:17 -0400 Subject: response --- doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn index a2bb5893a..1e2030b23 100644 --- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -8,6 +8,8 @@ The git commit (in my `openid` branch) says it all: This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). +> Cherry picked, thanks. --[[Joey]] + Relatedly, the other commit on the same branch would be nice to have: Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser @@ -20,4 +22,8 @@ Relatedly, the other commit on the same branch would be nice to have: --[[smcv]] +> I wonder if an option is the best approach. Maybe it would be better to +> simply move `openiduser` into `userlink`, and thus always support openid +> usernames whether the plugin is enabled or not. --[[Joey]] + [[!tag patch]] -- cgit v1.2.3 From 272ec592936e76eded7be390a401ac84598351fa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 13:40:53 -0400 Subject: I was wrong about it being broken for me. --- doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn index 83c95d65d..01137db37 100644 --- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -28,8 +28,4 @@ Adam. > The only caveat I know of to make it work is that the > adminuser openid url has to exactly match the openid url that > ikiwiki sees when you log in. Including any trailing slash, -> and the `http://`. -> -> Hmm, it's possible that the new version of the openid library -> has broken it. I also no longer show up as admin. There's a related -> bug [[bugs/openid_no_longer_pretty-prints_OpenIDs]]. --[[Joey]] +> and the `http://`. --[[Joey]] -- cgit v1.2.3 From fe7b5b2405f049201f0f99eea907bbf5381f3bb8 Mon Sep 17 00:00:00 2001 From: Djoume Date: Tue, 7 Jul 2009 13:49:50 -0400 Subject: added neted raw included inlines bug. --- doc/bugs/nested_raw_included_inlines.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/nested_raw_included_inlines.mdwn diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn new file mode 100644 index 000000000..6cb4a973d --- /dev/null +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -0,0 +1,26 @@ +I have the following structure: + +## page0 + # Page 0 + [[!inline raw="yes" pages="page1"]] + +## page1 + # Page 1 + [[!inline pages="page2"]] + +## page2 + # Page 2 + test + +In this situation, a change in page 2 will trigger a rebuild of page1 but not of page0. + + refreshing wiki.. + scanning page2.mdwn + rendering page2.mdwn + rendering page1.mdwn, which depends on page2 + done + +In my real world situation, page1 is actually listing all pages that match a certain tag and page0 is the home page. +Whenever a page got tagged, it will appear on page1 but not on page0. + +Am I missing something? Is this a bug or Ikiwiki not supposed to support this use case? -- cgit v1.2.3 From f7f4353f14794f958505f3209d546ad1a7cf87dc Mon Sep 17 00:00:00 2001 From: Djoume Date: Tue, 7 Jul 2009 14:44:17 -0400 Subject: fixed formatting --- doc/bugs/nested_raw_included_inlines.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn index 6cb4a973d..792bc843c 100644 --- a/doc/bugs/nested_raw_included_inlines.mdwn +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -2,11 +2,11 @@ I have the following structure: ## page0 # Page 0 - [[!inline raw="yes" pages="page1"]] + \[[!inline raw="yes" pages="page1"]] ## page1 # Page 1 - [[!inline pages="page2"]] + \[[!inline pages="page2"]] ## page2 # Page 2 -- cgit v1.2.3 From feae031a80805550b38cb4fd9694d01ce7ef0627 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 16:31:18 -0400 Subject: highlight: Fix utf-8 encoding bug. Closes: #535028 --- IkiWiki/Plugin/highlight.pm | 3 ++- debian/changelog | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 20f79ef57..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -69,7 +70,7 @@ sub htmlizefallback { return; } - return highlight($langfile, shift); + return Encode::decode_utf8(highlight($langfile, shift)); } my %ext2lang; diff --git a/debian/changelog b/debian/changelog index bb33f25f3..239b22b42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -ikiwiki (3.1415) UNRELEASED; urgency=low +ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) * Updated French debconf templates translation. Closes: #535103 * openid: Support Net::OpenID 2.x when pretty-printing openids. (smcv) + * highlight: Fix utf-8 encoding bug. Closes: #535028 - -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + -- Joey Hess Tue, 07 Jul 2009 16:25:05 -0400 ikiwiki (3.141) unstable; urgency=low -- cgit v1.2.3 From 8891e3d0a43df1a7ec9286f00dc5aa125f4edff6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 16:35:02 -0400 Subject: releasing version 3.1415 --- po/es.po | 33 ++++++++++++++++++++------------- po/ikiwiki.pot | 8 ++++---- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/po/es.po b/po/es.po index 73db2b4d9..5b11c5200 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: 2009-06-12 19:52-0400\n" +"POT-Creation-Date: 2009-07-07 16:32-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -33,7 +33,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" -msgstr "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" +msgstr "" +"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." @@ -69,7 +70,8 @@ msgstr "Contenido añadido activado vía web." #: ../IkiWiki/Plugin/aggregate.pm:93 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 !" +msgstr "" +"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -358,7 +360,8 @@ msgstr "" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio" +msgstr "" +"Error en el análisis del URL, no puedo determinar el nombre del dominio" #: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" @@ -377,18 +380,19 @@ 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:46 +#: ../IkiWiki/Plugin/highlight.pm:47 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:57 +#: ../IkiWiki/Plugin/highlight.pm:58 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:122 -msgid "warning: highlight perl module not available; falling back to pass through" +#: ../IkiWiki/Plugin/highlight.pm:123 +msgid "" +"warning: highlight perl module not available; falling back to pass through" msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " @@ -467,7 +471,8 @@ msgstr "La página %s está bloqueada y no puede modificarse" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" +msgstr "" +"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format @@ -889,7 +894,8 @@ msgid "plugins" msgstr "complementos" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "The configuration changes shown below require a wiki rebuild to take effect." +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." @@ -1003,7 +1009,8 @@ msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "** Desactivando el complemento %s dado que está fallando con este mensaje:" +msgstr "" +"** Desactivando el complemento %s dado que está fallando con este mensaje:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1012,7 +1019,8 @@ msgstr "el programa %s no parece ser ejecutable" #: ../IkiWiki/Wrapper.pm:20 msgid "cannot create a wrapper that uses a setup file" -msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración" +msgstr "" +"no puedo crear un programa envoltorio que utiliza un archivo de configuración" #: ../IkiWiki/Wrapper.pm:24 msgid "wrapper filename not specified" @@ -1106,4 +1114,3 @@ msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" - diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4ca908807..74ffd1c74 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: 2009-06-12 19:52-0400\n" +"POT-Creation-Date: 2009-07-07 16:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -368,17 +368,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:46 +#: ../IkiWiki/Plugin/highlight.pm:47 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:57 +#: ../IkiWiki/Plugin/highlight.pm:58 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:122 +#: ../IkiWiki/Plugin/highlight.pm:123 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -- cgit v1.2.3 From bc5854a5834f84483c0adda8fb759d136ec89f9c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 16:39:15 -0400 Subject: add news item for ikiwiki 3.1415 --- doc/news/version_3.11.mdwn | 23 ----------------------- doc/news/version_3.12.mdwn | 19 ------------------- doc/news/version_3.1415.mdwn | 7 +++++++ 3 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 doc/news/version_3.11.mdwn delete mode 100644 doc/news/version_3.12.mdwn create mode 100644 doc/news/version_3.1415.mdwn diff --git a/doc/news/version_3.11.mdwn b/doc/news/version_3.11.mdwn deleted file mode 100644 index 2d1dc7063..000000000 --- a/doc/news/version_3.11.mdwn +++ /dev/null @@ -1,23 +0,0 @@ -ikiwiki 3.11 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Avoid using python-support. Closes: #[525086](http://bugs.debian.org/525086) - * websetup: Display stderr in browser if ikiwiki setup fails. - * blogspam: Load RPC::XML library in checkconfig, so that an - error can be printed at that point if it's not available, - allowing the admin to see it during wiki setup. - Closes: #[520015](http://bugs.debian.org/520015) - * websetup: If setup fails, restore old setup file. - * relativedate: Deal with clock skew. - * Add IkiWiki::ErrorReason objects, and modify pagespecs to return - them in cases where they fail to match due to a configuration or syntax - error. - * pagespec\_match\_list: New API function, matches pages in a list - and throws an error if the pagespec is bad. - * inline, brokenlinks, calendar, linkmap, map, orphans, pagecount, - pagestate, postsparkline: Display a handy error message if the pagespec - is erronious. - * comments: Add link to comment post form to allow user to sign in - if they wish to, if the configuration makes signin optional - for commenting. - * Updated Danish translation from Jonas Smedegaard. Closes: #[525751](http://bugs.debian.org/525751) - * translation.mdwn: Typo fixes. Closes: #[525753](http://bugs.debian.org/525753)"""]] diff --git a/doc/news/version_3.12.mdwn b/doc/news/version_3.12.mdwn deleted file mode 100644 index 1e1862bb0..000000000 --- a/doc/news/version_3.12.mdwn +++ /dev/null @@ -1,19 +0,0 @@ -You may want to run `ikiwiki-transition deduplinks my.setup` -after upgrading to this version of ikiwiki. This command will -optimise your wiki's saved state, removing duplicate information -that can slow ikiwiki down. - -ikiwiki 3.12 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Re-enable python-support and add python:Depends to control file. - * ikiwiki-makerepo: Avoid using abs_path, as it apparently - fails on nonexistant directories with some broken perl - versions. - * inline: Minor optimisation. - * add_link: New function, which plugins should use rather than - modifying %links directly, to avoid it accumulating duplicates. - * ikiwiki-transition: Add a deduplinks action, that can be used - to remove duplicate links and optimise a wiki w/o rebuilding it. - * external: Fix pagespec_match and pagespec_match_list. - Closes: #527281 -"""]] diff --git a/doc/news/version_3.1415.mdwn b/doc/news/version_3.1415.mdwn new file mode 100644 index 000000000..93310bc64 --- /dev/null +++ b/doc/news/version_3.1415.mdwn @@ -0,0 +1,7 @@ +ikiwiki 3.1415 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * img: Fix extra double quote with alt text. (smcv) + * Updated French debconf templates translation. Closes: #[535103](http://bugs.debian.org/535103) + * openid: Support Net::OpenID 2.x when pretty-printing + openids. (smcv) + * highlight: Fix utf-8 encoding bug. Closes: #[535028](http://bugs.debian.org/535028)"""]] \ No newline at end of file -- cgit v1.2.3 From bdc5b9c8443e08a48cafde3d8e79c0699f2a21e9 Mon Sep 17 00:00:00 2001 From: "http://adam.shand.net/" Date: Wed, 8 Jul 2009 02:59:00 -0400 Subject: --- doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn index 01137db37..6f0d931df 100644 --- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -29,3 +29,5 @@ Adam. > adminuser openid url has to exactly match the openid url that > ikiwiki sees when you log in. Including any trailing slash, > and the `http://`. --[[Joey]] + +>> Hrm, it's not working. I'm sure I've made a silly mistake somewhere but I've looked and looked and just can't find it. Any suggestions on where to look for debugging information would be much appreciated. -- [[Adam]] -- cgit v1.2.3 From 98ae5a15da8223f4a2952d9aad94c7dc1708e6cc Mon Sep 17 00:00:00 2001 From: Djoume Date: Wed, 8 Jul 2009 12:46:47 -0400 Subject: added web file rename when using svn bug --- ...a_the_web_is_failing_when_using_subversion.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn new file mode 100644 index 000000000..4f2257891 --- /dev/null +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -0,0 +1,24 @@ +I'm using ikiwiki 3.12 on Mac OS X (installed via mac ports) + +When trying to rename a file via the web interface (using the rename plugin) I get the following error: + +Error: Undefined subroutine &IkiWiki::Plugin::svn::dirname called at /opt/local/lib/perl5/vendor_perl/5.8.9/IkiWiki/Plugin/svn.pm line 246. + +Applying the following patch fixed it: + + --- IkiWiki/Plugin/svn.pm.orig 2009-07-08 12:25:23.000000000 -0400 + +++ IkiWiki/Plugin/svn.pm 2009-07-08 12:28:36.000000000 -0400 + @@ -243,10 +243,10 @@ + + if (-d "$config{srcdir}/.svn") { + # Add parent directory for $dest + - my $parent=dirname($dest); + + my $parent=IkiWiki::dirname($dest); + if (! -d "$config{srcdir}/$parent/.svn") { + while (! -d "$config{srcdir}/$parent/.svn") { + - $parent=dirname($dest); + + $parent=Ikiwiki::dirname($dest); + } + if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { + warn("svn add $parent failed\n"); + -- cgit v1.2.3 From 499c807ea740bb6e675b0d28bc5b603b2d4dd58e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2009 13:08:52 -0400 Subject: response --- .../Can_OpenID_users_be_adminusers__63__.mdwn | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn index 6f0d931df..ca80c93f4 100644 --- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -29,5 +29,39 @@ Adam. > adminuser openid url has to exactly match the openid url that > ikiwiki sees when you log in. Including any trailing slash, > and the `http://`. --[[Joey]] + +>> Hrm, it's not working. I'm sure I've made a silly mistake somewhere but +>> I've looked and looked and just can't find it. Any suggestions on where +>> to look for debugging information would be much appreciated. -- [[Adam]] ->> Hrm, it's not working. I'm sure I've made a silly mistake somewhere but I've looked and looked and just can't find it. Any suggestions on where to look for debugging information would be much appreciated. -- [[Adam]] +>>> Well, you could use this patch to add debugging info about admin +>>> username comparisons: + +
+diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
+index 0bf100a..77b467a 100644
+--- a/IkiWiki/UserInfo.pm
++++ b/IkiWiki/UserInfo.pm
+@@ -71,6 +71,8 @@ sub userinfo_setall ($$) {
+ sub is_admin ($) {
+ 	my $user_name=shift;
+ 
++	print STDERR "is_admin test @{$config{adminuser}} vs $user_name: ".(grep { $_ eq $user_name } @{$config{adminuser}})."\n";
++
+ 	return grep { $_ eq $user_name } @{$config{adminuser}};
+ }
+ 
+
+ +>>>> After applying that change to what is probably +>>>> `/usr/share/perl5/IkiWiki/UserInfo.pm` on your system, +>>>> when you go to the preferences page it should log in your web server's +>>>> error.log, something like this: + + [Wed Jul 08 12:54:35 2009] [error] [client 127.0.1.1] is_admin test http://joey.kitenet.net/ vs http://joey.kitenet.net/: 1 + +>>>> So you can see if the two usernames/openids match. If the end is "0", +>>>> they don't match. If nothing is logged, you have not enabled the websetup plugin. +>>>> If the end if "1" you should see the "Wiki Setup" button, if not the +>>>> problem is not in determining if you're an admin, but elsewhere.. +>>>> --[[Joey]] -- cgit v1.2.3 From 0c6a47e9e4c6a5508868b730bed0ac2d0c358ae4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2009 13:13:23 -0400 Subject: svn: Fix rcs_rename to properly scope call to dirname. --- IkiWiki/Plugin/svn.pm | 4 ++-- debian/changelog | 6 ++++++ ...enaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index fe55e7d08..06b987f51 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -243,10 +243,10 @@ sub rcs_rename ($$) { if (-d "$config{srcdir}/.svn") { # Add parent directory for $dest - my $parent=dirname($dest); + my $parent=IkiWiki::dirname($dest); if (! -d "$config{srcdir}/$parent/.svn") { while (! -d "$config{srcdir}/$parent/.svn") { - $parent=dirname($dest); + $parent=IkiWiki::dirname($dest); } if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); diff --git a/debian/changelog b/debian/changelog index 239b22b42..e83e570d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1416) UNRELEASED; urgency=low + + * svn: Fix rcs_rename to properly scope call to dirname. + + -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn index 4f2257891..1a737df0a 100644 --- a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -22,3 +22,7 @@ Applying the following patch fixed it: if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); + +> Thank you very much for the patch, which I've applied. I wonder how +> that snuck in (aside from the obvious, that the svn plugin is not often +> used and the code was added w/o being tested..). [[done]] --[[Joey]] -- cgit v1.2.3 From 3054f1916e68648a1c483a0e0a1248106d7654b4 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Thu, 9 Jul 2009 19:41:13 -0400 Subject: minor: fixed a wikilink. --- doc/plugins/anonok.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/anonok.mdwn b/doc/plugins/anonok.mdwn index a3fec4d89..497ca07c8 100644 --- a/doc/plugins/anonok.mdwn +++ b/doc/plugins/anonok.mdwn @@ -6,7 +6,7 @@ anonymous web users, who have not signed in, to edit any page in the wiki by default. The plugin also has a configuration setting, `anonok_pagespec`. This -[[PageSpec]] can be used to allow anonymous editing of matching pages. +[[ikiwiki/PageSpec]] can be used to allow anonymous editing of matching pages. If you're using the [[comments]] plugin, you can allow anonymous comments to be posted by setting: -- cgit v1.2.3 From 78b6a8cc76a6fc515d2edba4959594c765df3da0 Mon Sep 17 00:00:00 2001 From: "http://adam.shand.net/" Date: Fri, 10 Jul 2009 01:19:40 -0400 Subject: --- doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn index ca80c93f4..7599e71e5 100644 --- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn +++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn @@ -65,3 +65,5 @@ index 0bf100a..77b467a 100644 >>>> If the end if "1" you should see the "Wiki Setup" button, if not the >>>> problem is not in determining if you're an admin, but elsewhere.. >>>> --[[Joey]] + +I was being incredibly stupid and missed that websetup is a **plugin** and thus needed to be enabled. Many thanks for your patient assistance, by helping me eliminate the unlikely it eventually led me to the obvious. Cheers. -- [[Adam]] -- cgit v1.2.3 From e12b7f5e54730325c751a889ed2e08580b5ef6ba Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Jul 2009 18:41:16 +0100 Subject: Move OpenID pretty-printing from openid plugin to core On various sites I have two IkiWiki instances running from the same repository: one accessible via http and only accepting openid logins, and one accessible via authenticated https and only accepting httpauth. The https version should still pretty-print OpenIDs seen in git history, even though it does not itself accept OpenID logins. --- IkiWiki.pm | 35 +++++++++++++++++++++++++++++++++++ IkiWiki/Plugin/openid.pm | 39 --------------------------------------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index a0a61ac64..0cb3bf143 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1063,6 +1063,41 @@ sub htmllink ($$$;@) { return "$linktext"; } +sub openiduser ($) { + my $user=shift; + + if ($user =~ m!^https?://! && + eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) { + my $display; + + if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { + # this works in at least 2.x + $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); + } + else { + # this only works in 1.x + my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); + $display=$oid->display; + } + + # Convert "user.somehost.com" to "user [somehost.com]" + # (also "user.somehost.co.uk") + if ($display !~ /\[/) { + $display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/; + } + # Convert "http://somehost.com/user" to "user [somehost.com]". + # (also "https://somehost.com/user/") + if ($display !~ /\[/) { + $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/; + } + $display=~s!^https?://!!; # make sure this is removed + eval q{use CGI 'escapeHTML'}; + error($@) if $@; + return escapeHTML($display); + } + return; +} + sub userlink ($) { my $user=shift; diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 87569915b..dc0e0f48e 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -180,43 +180,4 @@ sub getobj ($$) { ); } -package IkiWiki; - -# This is not used by this plugin, but this seems the best place to put it. -# Used elsewhere to pretty-display the name of an openid user. -sub openiduser ($) { - my $user=shift; - - if ($user =~ m!^https?://! && - eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) { - my $display; - - if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { - # this works in at least 2.x - $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); - } - else { - # this only works in 1.x - my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); - $display=$oid->display; - } - - # Convert "user.somehost.com" to "user [somehost.com]" - # (also "user.somehost.co.uk") - if ($display !~ /\[/) { - $display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/; - } - # Convert "http://somehost.com/user" to "user [somehost.com]". - # (also "https://somehost.com/user/") - if ($display !~ /\[/) { - $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/; - } - $display=~s!^https?://!!; # make sure this is removed - eval q{use CGI 'escapeHTML'}; - error($@) if $@; - return escapeHTML($display); - } - return; -} - 1 -- cgit v1.2.3 From 1c614914cc7b5fe187298dad88bafa0bdf8f106c Mon Sep 17 00:00:00 2001 From: "smcv@" Date: Fri, 10 Jul 2009 18:56:47 +0100 Subject: Close bug (joeyh merged my patch), split out feature request, provide alternative patch --- .../openid_no_longer_pretty-prints_OpenIDs.mdwn | 22 +++++--------------- .../pretty-print_OpenIDs_even_if_not_enabled.mdwn | 24 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn index 1e2030b23..85a206bc0 100644 --- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -8,22 +8,10 @@ The git commit (in my `openid` branch) says it all: This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). -> Cherry picked, thanks. --[[Joey]] +> Cherry picked, thanks. --[[Joey]] -Relatedly, the other commit on the same branch would be nice to have: +Relatedly, the other commit on the same branch would be nice to have +(edited to add: I've now moved it, and its discussion, to +[[todo/pretty-print_OpenIDs_even_if_not_enabled]]). --[[smcv]] - Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser - - On various sites I have two IkiWiki instances running from the same - repository: one accessible via http and only accepting openid logins, - and one accessible via authenticated https and only accepting httpauth. - Ideally, the https version should still pretty-print OpenIDs seen in - git history. - ---[[smcv]] - -> I wonder if an option is the best approach. Maybe it would be better to -> simply move `openiduser` into `userlink`, and thus always support openid -> usernames whether the plugin is enabled or not. --[[Joey]] - -[[!tag patch]] +[[!tag done]] diff --git a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn new file mode 100644 index 000000000..373c120a6 --- /dev/null +++ b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn @@ -0,0 +1,24 @@ +A feature I originally requested on +[[a_related_bug|bugs/openid_no_longer_pretty-prints_OpenIDs]]: + + Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser + + On various sites I have two IkiWiki instances running from the same + repository: one accessible via http and only accepting openid logins, + and one accessible via authenticated https and only accepting httpauth. + Ideally, the https version should still pretty-print OpenIDs seen in + git history. + +--[[smcv]] + +> I wonder if an option is the best approach. Maybe it would be better to +> simply move `openiduser` into `userlink`, and thus always support openid +> usernames whether the plugin is enabled or not. --[[Joey]] + +>> OK, implemented that as 'smcv/always-openid'; if you don't think that's +>> bloating the IkiWiki core too much, please consider merging. The poll on +>> [[news/openid]] indicates fairly strong support for *only* accepting OpenID +>> logins, so I think recognising OpenIDs can reasonably be considered core +>> functionality! --[[smcv]] + +[[!tag patch]] -- cgit v1.2.3 From f58b5c798a7a5ad4ae2a85833766e761a407f02d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Jul 2009 19:08:38 +0100 Subject: dependency inheritance considered scary, although my branch might help --- doc/bugs/nested_raw_included_inlines.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn index 792bc843c..33433e235 100644 --- a/doc/bugs/nested_raw_included_inlines.mdwn +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -24,3 +24,11 @@ In my real world situation, page1 is actually listing all pages that match a cer Whenever a page got tagged, it will appear on page1 but not on page0. Am I missing something? Is this a bug or Ikiwiki not supposed to support this use case? + +> Perhaps the inline plugin isn't being clever enough about dependencies - +> strictly speaking, when a page is inlined with full content, the inlining +> page should probably inherit all the inlined page's dependencies. +> That might be prohibitively slow in practise due to the way IkiWiki +> currently merges pagespecs, though - maybe the patches I suggested for +> [[separating_and_uniquifying_pagespecs|todo/should_optimise_pagespecs]] +> would help? --[[smcv]] -- cgit v1.2.3 From a13038458fc5712ec651f8afb6a58fe3c4fb21f8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Jul 2009 19:21:02 +0100 Subject: attempt to clear up the bugs list a bit --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 5 +++++ doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 2 ++ 2 files changed, 7 insertions(+) diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index b1f8ed2b3..4ce257252 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -33,3 +33,8 @@ Patch[[!tag patch]]: -- [[Jon]] + +> Strictly speaking, a `
    ` with no `
  • `s isn't valid HTML either... +> could `map` instead delay emitting the first `
      ` until it determines that +> it will have at least one item? Perhaps refactoring that function into +> something easier to regression-test would be useful. --[[smcv]] diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 111ade8dd..430d65a3f 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -28,3 +28,5 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday n > --[[Joey]] >> fair enough, I think I can get converted to a warped time perspective. --ulrik + +>>> Perhaps we can consider this [[done]], then? --[[smcv]] -- cgit v1.2.3 From b1b7a2100f6b32ef6bf75e9992e10ed7d28f8525 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Jul 2009 00:33:19 -0400 Subject: img: Pass the align parameter through to the generated img tag. --- IkiWiki/Plugin/img.pm | 1 + debian/changelog | 1 + doc/ikiwiki/directive/img.mdwn | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index a186abdfc..78e378917 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -123,6 +123,7 @@ sub preprocess (@) { '" height="'.$im->Get("height").'"'. (exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : ''). + (exists $params{align} ? ' align="'.$params{align}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : ''). ' />'; diff --git a/debian/changelog b/debian/changelog index e83e570d3..5001031df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.1416) UNRELEASED; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. + * img: Pass the align parameter through to the generated img tag. -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn index 1d1f29bea..66efd008e 100644 --- a/doc/ikiwiki/directive/img.mdwn +++ b/doc/ikiwiki/directive/img.mdwn @@ -18,9 +18,9 @@ making the image smaller than the specified size. You can also specify only the width or the height, and the other value will be calculated based on it: "200x", "x200" -You can also pass `alt`, `title`, `class` and `id` parameters. These are -passed through unchanged to the html img tag. If you include a `caption` -parameter, the caption will be displayed centered beneath the image. +You can also pass `alt`, `title`, `class`, `align` and `id` parameters. +These are passed through unchanged to the html img tag. If you include a +`caption` parameter, the caption will be displayed centered beneath the image. The `link` parameter is used to control whether the scaled down image links to the full size version. By default it does; set "link=somepage" to link -- cgit v1.2.3 From b9f4708f682be0002c0ece9029860c17333590e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Jul 2009 15:56:02 -0400 Subject: Move OpenID pretty-printing from openid plugin to core (smcv) --- debian/changelog | 1 + doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5001031df..d57158c1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.1416) UNRELEASED; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. * img: Pass the align parameter through to the generated img tag. + * Move OpenID pretty-printing from openid plugin to core (smcv) -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 diff --git a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn index 373c120a6..3d4338a78 100644 --- a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn +++ b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn @@ -21,4 +21,9 @@ A feature I originally requested on >> logins, so I think recognising OpenIDs can reasonably be considered core >> functionality! --[[smcv]] +>>> That seemed easier than expected, [[done]]. +>>> (I do wonder if the call to openiduser still needs to be evaled -- +>>> it was probably only evaled before in case it was not available, but +>>> I have not carefully checked it to make sure it doesn't ever die. --[[Joey]] + [[!tag patch]] -- cgit v1.2.3 From 0e6ac3d45ec2c99e6df23bf5066d9c20b6d53339 Mon Sep 17 00:00:00 2001 From: aldebrn Date: Sun, 12 Jul 2009 01:18:46 -0400 Subject: Prerequisite modules not found for non-root user --- doc/install/discussion.mdwn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index c1129a435..9a0591975 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -228,3 +228,26 @@ For ubuntu 8.04: I was just trying to get the latest version. In any case, thanks for the help, and thanks for the superb software. I really like it a lot. + +--- + +## Prerequisite modules not found for non-root user +Hi, I'm a non-root user trying to use IkiWiki on an academic webserver with Perl 5.8.8 but several missing modules, so I grab them from CPAN: + + cd ~; PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")' + +That puts a lot of files in ~/.cpan. Then when I go into the directory where I untarred IkiWiki and try to run the Perl makefile: + + cd ~/ikiwiki; perl Makefile.PL PREFIX=$HOME/ikiwiki + +I get warnings that all the modules needed were not found: + +Warning: prerequisite CGI::FormBuilder not found. +Warning: prerequisite CGI::Session 0 not found. +Warning: prerequisite Date::Parse 0 not found. +Warning: prerequisite HTML::Scrubber 0 not found. +Warning: prerequisite HTML::Template 0 not found. +Warning: prerequisite Mail::Sendmail 0 not found. +Warning: prerequisite Text::Markdown 0 not found. + +I've tried various combinations of PERL5LIB and PERL_MM_USE_DEFAULT to run this Makefile.PL but I'm not knowledgeable enough in Perl to get it to find the files in ~/.cpan. Thanks for any help! -- cgit v1.2.3 From 6b009c4041eb156756285088d2fefd5e459083c6 Mon Sep 17 00:00:00 2001 From: aldebrn Date: Sun, 12 Jul 2009 01:28:27 -0400 Subject: --- 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 9a0591975..28b1eafd7 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -232,9 +232,9 @@ In any case, thanks for the help, and thanks for the superb software. I really --- ## Prerequisite modules not found for non-root user -Hi, I'm a non-root user trying to use IkiWiki on an academic webserver with Perl 5.8.8 but several missing modules, so I grab them from CPAN: +Hi, I'm a non-root user trying to use IkiWiki on an academic webserver with Perl 5.8.8 but several missing modules, so I grab them from CPAN (edited): - cd ~; PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")' + cd ~; PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")' That puts a lot of files in ~/.cpan. Then when I go into the directory where I untarred IkiWiki and try to run the Perl makefile: -- cgit v1.2.3 From 759becd40c39344a1cb2564ca58ad1b753e504c4 Mon Sep 17 00:00:00 2001 From: aldebrn Date: Sun, 12 Jul 2009 02:44:14 -0400 Subject: --- doc/install/discussion.mdwn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 28b1eafd7..72406f70b 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -250,4 +250,10 @@ Warning: prerequisite HTML::Template 0 not found. Warning: prerequisite Mail::Sendmail 0 not found. Warning: prerequisite Text::Markdown 0 not found. -I've tried various combinations of PERL5LIB and PERL_MM_USE_DEFAULT to run this Makefile.PL but I'm not knowledgeable enough in Perl to get it to find the files in ~/.cpan. Thanks for any help! +CORRECTION 1: I played around with CPAN and got the installation to the point of succeeding with >99% of tests in "make test". An attempt of "make install" failed while trying to put files in /etc/IkiWiki but per the output's instructions, I reran "make install" and that seemed to work, until this error, which doesn't seem to be satisfiable: + + Warning: You do not have permissions to install into /usr/lib/perl5/site_perl/5.8.8/i386-linux-thread-multi at /usr/lib/perl5/5.8.8/ExtUtils/Install.pm line 114. + Installing /usr/lib/perl5/site_perl/5.8.8/IkiWiki.pm + mkdir /usr/lib/perl5/site_perl/5.8.8/IkiWiki: Permission denied at /usr/lib/perl5/5.8.8/ExtUtils/Install.pm line 176 + +Any suggestions? Whew! -- cgit v1.2.3 From 78ab937dbf7d33b77076907539ed463ba4df1337 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 16:31:09 -0400 Subject: Details of oddness under boa --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index a40a454c1..005e5ccce 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -67,3 +67,10 @@ Why do they appear two times with conflicting values in the very same hashes? >>>> (reported as [[!debbug 437927]] and [[!debbug 437932]]) --[[JeremieKoenig]] Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] + +I'm getting some odd behaviour with boa. When I edit a page and click "Save +Page", the URL I get taken to produces a 403 - Forbidden error until I reload +it. For example, it brings me back to page `http://localhost/~pdw/iki/?updated`, +I see a 403 error message, then I hit Ctrl-R, and then the page displays +correctly, with the same URL that gave an error a moment ago. This is with boa +0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. -- cgit v1.2.3 From 15e61fe2a7b6b500bf09d34d703e3b447fbd5e08 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 17:07:16 -0400 Subject: Add more detail to problem with ikiwiki under boa. --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 005e5ccce..2240f5dc3 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -69,8 +69,12 @@ Why do they appear two times with conflicting values in the very same hashes? Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] I'm getting some odd behaviour with boa. When I edit a page and click "Save -Page", the URL I get taken to produces a 403 - Forbidden error until I reload -it. For example, it brings me back to page `http://localhost/~pdw/iki/?updated`, -I see a 403 error message, then I hit Ctrl-R, and then the page displays -correctly, with the same URL that gave an error a moment ago. This is with boa -0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. +Page", the URL I get taken to produces a 403 - Forbidden error until I recompile +the wiki. For example, after editing the root page of the wiki it brings me back to +`http://localhost/~pdw/iki/?updated`, and I see a 403 error message. Then, if +I open up a terminal and type `ikiwiki --setup ikiwiki.setup`, and then go back +to the browser and hit Ctrl-R, the page displays correctly, with the same URL +that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox +3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; +any suggestions where to start looking? This is a very basic setup, so feel +free to ask. --Paul -- cgit v1.2.3 From fe45beae71c97938f2cb067e0ec22c1c7760eacf Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Jul 2009 17:57:19 -0400 Subject: response - you are correct, ULs require >= 1 LI children --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index 4ce257252..a3bd3cc01 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -38,3 +38,10 @@ Patch[[!tag patch]]: > could `map` instead delay emitting the first `
        ` until it determines that > it will have at least one item? Perhaps refactoring that function into > something easier to regression-test would be useful. --[[smcv]] + +>> You are right (just checked 4.01 DTD to confirm). I suspect refactoring +>> the function would be wise. From my brief look at it to formulate the +>> above I thought it was a bit icky. I'm not a good judge of what would +>> be regression-test friendly but I might have a go at reworking it. With +>> this variety of problem I have a strong inclination to use things like +>> map. - [[Jon]] -- cgit v1.2.3 From de754113b5fb4e4e6e5ead5c450d679aefdbb1d3 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Jul 2009 17:58:36 -0400 Subject: clarify which map I mena --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index a3bd3cc01..0edba438c 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -43,5 +43,5 @@ Patch[[!tag patch]]: >> the function would be wise. From my brief look at it to formulate the >> above I thought it was a bit icky. I'm not a good judge of what would >> be regression-test friendly but I might have a go at reworking it. With ->> this variety of problem I have a strong inclination to use things like ->> map. - [[Jon]] +>> this variety of problem I have a strong inclination to use HOFs like map, +>> grep. - [[Jon]] -- cgit v1.2.3 From 1eda850d12a37d68d8443c4009515f608cb174e2 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 18:31:35 -0400 Subject: Found fix to problem under boa, added details and request for etiquette guidance. --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 2240f5dc3..7cfc53741 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -78,3 +78,16 @@ that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; any suggestions where to start looking? This is a very basic setup, so feel free to ask. --Paul + +Tried setting up a git repository back-end for the wiki, in case the `post-update` +hook caused the right updates to happen; it didn't. (But I do now have my wiki +in git!) + +Turns out that `.../destdir/index.html` was being recreated after a web edit, or +at least having its permissions modified, and being left without world-read +permissions. Boa was then rightly refusing to serve the page. Adding the +`umask 022` config option to `ikiwiki.setup` fixed everything, and all +appears to be working fine now. --Paul. + +(I'm new to wiki etiquette - would it be more polite to leave these details on the +wiki, or to remove them and only leave a short summary? Thanks. --Paul) -- cgit v1.2.3 From 95590417cf9b72cd943c2544bc2e80872da840e3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Jul 2009 21:27:50 -0400 Subject: response --- doc/install/discussion.mdwn | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 72406f70b..02cdb29c9 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -250,10 +250,22 @@ Warning: prerequisite HTML::Template 0 not found. Warning: prerequisite Mail::Sendmail 0 not found. Warning: prerequisite Text::Markdown 0 not found. -CORRECTION 1: I played around with CPAN and got the installation to the point of succeeding with >99% of tests in "make test". An attempt of "make install" failed while trying to put files in /etc/IkiWiki but per the output's instructions, I reran "make install" and that seemed to work, until this error, which doesn't seem to be satisfiable: +CORRECTION 1: I played around with CPAN and got the installation to the point of succeeding with >99% of tests in "make test". + +> What was the magic CPAN rune that worked for you? --[[Joey]] + +An attempt of "make install" failed while trying to put files in /etc/IkiWiki but per the output's instructions, I reran "make install" and that seemed to work, until this error, which doesn't seem to be satisfiable: Warning: You do not have permissions to install into /usr/lib/perl5/site_perl/5.8.8/i386-linux-thread-multi at /usr/lib/perl5/5.8.8/ExtUtils/Install.pm line 114. Installing /usr/lib/perl5/site_perl/5.8.8/IkiWiki.pm mkdir /usr/lib/perl5/site_perl/5.8.8/IkiWiki: Permission denied at /usr/lib/perl5/5.8.8/ExtUtils/Install.pm line 176 Any suggestions? Whew! + +> When you build ikiwiki, try doing it like this to make it +> install to your home directory. Then you can run `~/bin/ikiwiki` +> --[[Joey]] + + perl Makefile.PL INSTALL_BASE=$HOME PREFIX= + make + make install -- cgit v1.2.3 From a41a12ab9a7206d324ad198e287a37fc17172f18 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Jul 2009 21:32:24 -0400 Subject: response --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 7cfc53741..3f80bbbd6 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -68,6 +68,8 @@ Why do they appear two times with conflicting values in the very same hashes? Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] +---- + I'm getting some odd behaviour with boa. When I edit a page and click "Save Page", the URL I get taken to produces a 403 - Forbidden error until I recompile the wiki. For example, after editing the root page of the wiki it brings me back to @@ -89,5 +91,15 @@ permissions. Boa was then rightly refusing to serve the page. Adding the `umask 022` config option to `ikiwiki.setup` fixed everything, and all appears to be working fine now. --Paul. +> Since others seem to have gotten ikiwiki working with boa, +> I'm guessing that this is not a generic problem with boa, but that +> your boa was started from a shell that had an unusual umask and inherited +> that. --[[Joey]] + (I'm new to wiki etiquette - would it be more polite to leave these details on the wiki, or to remove them and only leave a short summary? Thanks. --Paul) + +> Well, I just try to keep things understandable and clear, whether than +> means deleting bad old data or not. That said, this page is a bug report, +> that was already closed. It's generally better to open a new bug report +> rather than edit an old closed one. --[[Joey]] -- cgit v1.2.3 From 354c8d424d5588fbdc4c5442d098b146d7bb8e7f Mon Sep 17 00:00:00 2001 From: "http://geoffrey.wu.myopenid.com/" Date: Mon, 13 Jul 2009 05:01:09 -0400 Subject: --- doc/sandbox.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 02b636c09..40484f011 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,13 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +---- +2009/7/13 Monday Blue...\\ +While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site. + +* I thought that creole markup is used by ikiwiki... +* Thought about using //SVN/CVS// server, however with different idea +* Kinda curious why **Tcl** does not show her face in this Wiki arena + ---- Testing OpenID some more.. -- cgit v1.2.3 From 934b5073604770a6a65b3edef994df0a1a8124ec Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~ssm" Date: Mon, 13 Jul 2009 05:14:17 -0400 Subject: link change for debian popcon --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 05a6fc91a..8155790d7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -126,7 +126,7 @@ Personal sites and blogs Please feel free to add your own ikiwiki site! -See also: [Debian ikiwiki popcon graph](http://popcon.debian.org/~igloo/popcon-graphs/index.php?packages=ikiwiki) +See also: [Debian ikiwiki popcon graph](http://qa.debian.org/popcon.php?package=ikiwiki) and [google search for ikiwiki powered sites](http://www.google.com/search?q=%22powered%20by%20ikiwiki%22). While nothing makes me happier than knowing that ikiwiki has happy users, dropping some change in the [[TipJar]] is a nice way to show extra appreciation. -- cgit v1.2.3 From 546a6286f1943adc098910929645cda65f5d86fc Mon Sep 17 00:00:00 2001 From: "http://geoffrey.wu.myopenid.com/" Date: Mon, 13 Jul 2009 06:30:21 -0400 Subject: --- doc/sandbox.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 40484f011..5e9c05225 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -4,9 +4,15 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v 2009/7/13 Monday Blue...\\ While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site. +<<<<<<< HEAD:doc/sandbox.mdwn * I thought that creole markup is used by ikiwiki... * Thought about using //SVN/CVS// server, however with different idea * Kinda curious why **Tcl** does not show her face in this Wiki arena +======= +* Thought about using //SVN/CVS// server, however with different idea +* Kinda curious why **Tcl** does not show her face in this Wiki arena +* It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup. +>>>>>>> 55c1a37cce91d4fd01bf80fcaeeaf56535218a5c:doc/sandbox.mdwn ---- -- cgit v1.2.3 From 8c4800b55de32a84af1f0a1d8872eca315836852 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Mon, 13 Jul 2009 16:28:31 -0400 Subject: Trim previous "bug" report --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 47 ++++++++++++++------------ 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 3f80bbbd6..e4b0fd448 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -70,36 +70,39 @@ Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] ---- -I'm getting some odd behaviour with boa. When I edit a page and click "Save -Page", the URL I get taken to produces a 403 - Forbidden error until I recompile -the wiki. For example, after editing the root page of the wiki it brings me back to -`http://localhost/~pdw/iki/?updated`, and I see a 403 error message. Then, if -I open up a terminal and type `ikiwiki --setup ikiwiki.setup`, and then go back -to the browser and hit Ctrl-R, the page displays correctly, with the same URL -that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox -3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; -any suggestions where to start looking? This is a very basic setup, so feel -free to ask. --Paul - -Tried setting up a git repository back-end for the wiki, in case the `post-update` -hook caused the right updates to happen; it didn't. (But I do now have my wiki -in git!) - -Turns out that `.../destdir/index.html` was being recreated after a web edit, or -at least having its permissions modified, and being left without world-read -permissions. Boa was then rightly refusing to serve the page. Adding the -`umask 022` config option to `ikiwiki.setup` fixed everything, and all -appears to be working fine now. --Paul. +I'm using boa and getting some odd behaviour if I don't set the `umask` +option in the config file. Editing a page through the web interface and +hitting "Save Page" regenerates the `index.html` file with no world-read +permissions. As a result, the server serves a "403 - Forbidden" error page +instead of the page I was expecting to return to. + +There are only two ways I found to work around this: adding a `umask 022` +option to the config file, or re-compiling the wiki from the command line +using `ikiwiki --setup`. Setting up a git back-end and re-running `ikiwiki +--setup` from inside a hook had no effect; it needed to be at the terminal. +--Paul > Since others seem to have gotten ikiwiki working with boa, > I'm guessing that this is not a generic problem with boa, but that > your boa was started from a shell that had an unusual umask and inherited > that. --[[Joey]] -(I'm new to wiki etiquette - would it be more polite to leave these details on the -wiki, or to remove them and only leave a short summary? Thanks. --Paul) +>> That's right; once I'd worked out what was wrong, it was clear that any +>> webserver should have been refusing to serve the page. I agree about the +>> inherited umask; I hadn't expected that. Even if it's unusual, though, it +>> probably won't be uncommon - this was a stock Ubuntu 9.04 install. --Paul + +(I'm new to wiki etiquette - would it be more polite to leave these details +on the wiki, or to remove them and only leave a short summary? Thanks. +--Paul) > Well, I just try to keep things understandable and clear, whether than > means deleting bad old data or not. That said, this page is a bug report, > that was already closed. It's generally better to open a new bug report > rather than edit an old closed one. --[[Joey]] + +>> Thanks for the feedback, I've tidied up my comment accordingly. I see +>> your point about the bug; sorry for cluttering the page up. I doubt it's +>> worth opening a new page at this stage, but will do so if there's a next +>> time. The solution seems worth leaving, though, in case anyone else in my +>> situation picks it up. --Paul -- cgit v1.2.3 From 295a9e11cd58f92b105107398e9b78081ed55253 Mon Sep 17 00:00:00 2001 From: "http://adam.shand.net/" Date: Wed, 15 Jul 2009 06:14:31 -0400 Subject: --- doc/forum/Accessing_meta_values_in_pages__63__.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Accessing_meta_values_in_pages__63__.mdwn diff --git a/doc/forum/Accessing_meta_values_in_pages__63__.mdwn b/doc/forum/Accessing_meta_values_in_pages__63__.mdwn new file mode 100644 index 000000000..78594f912 --- /dev/null +++ b/doc/forum/Accessing_meta_values_in_pages__63__.mdwn @@ -0,0 +1,8 @@ +If I set a meta value on a page (lets say \[[!meta author="Adam Shand"]] is there some way to retrieve the value of author and put it somewhere visible on the page? Eg. can I write: + +author: $author + +I know I can update the raw templates but it'd be nice to be able to do this in the pages them selves. + +Cheers, +Adam. -- cgit v1.2.3 From 8f971999c6cbf7025500a84ef5125019d373d8cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Jul 2009 14:44:17 -0400 Subject: releasing version 3.14159 --- debian/changelog | 4 ++-- po/ikiwiki.pot | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index d57158c1a..05b7be70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ikiwiki (3.1416) UNRELEASED; urgency=low +ikiwiki (3.14159) unstable; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. * img: Pass the align parameter through to the generated img tag. * Move OpenID pretty-printing from openid plugin to core (smcv) - -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + -- Joey Hess Thu, 16 Jul 2009 14:37:22 -0400 ikiwiki (3.1415) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 74ffd1c74..c914fd69d 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: 2009-07-07 16:32-0400\n" +"POT-Creation-Date: 2009-07-16 14:38-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 msgid "Error" msgstr "" @@ -1038,16 +1038,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1201 +#: ../IkiWiki.pm:1236 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1741 +#: ../IkiWiki.pm:1776 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1873 +#: ../IkiWiki.pm:1908 #, perl-format msgid "cannot match pages: %s" msgstr "" -- cgit v1.2.3 From f07bb9b48be6b706ddd9fbb368265fce41ac5f6d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Jul 2009 14:46:50 -0400 Subject: add news item for ikiwiki 3.14159 --- doc/news/version_3.13.mdwn | 24 ------------------------ doc/news/version_3.14159.mdwn | 5 +++++ 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 doc/news/version_3.13.mdwn create mode 100644 doc/news/version_3.14159.mdwn diff --git a/doc/news/version_3.13.mdwn b/doc/news/version_3.13.mdwn deleted file mode 100644 index 0c8f7ab8b..000000000 --- a/doc/news/version_3.13.mdwn +++ /dev/null @@ -1,24 +0,0 @@ -News for ikiwiki 3.13: - - The `ikiwiki-transition deduplinks` command introduced in the - last release was buggy. If you followed the NEWS file instructions - and ran it, you should run `ikiwiki -setup` to rebuild your wiki - to fix the problem. - -ikiwiki 3.13 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * ikiwiki-transition: If passed a nonexistant srcdir, or one not - containing .ikiwiki, abort with an error rather than creating it. - * Allow underlaydir to be overridden without messing up inclusion - of other underlays via add\_underlay. - * More friendly display of markdown, textile in edit form selector - (jmtd) - * Allow curly braces to be used in pagespecs, and avoid a whole class - of potential security problems, by avoiding performing any string - interpolation on user-supplied data when translating pagespecs. - * ikiwiki-transition: Allow setup files to be passed to all subcommands - that need a srcdir. - * ikiwiki-transition: deduplinks was broken and threw away all - metadata stored by plugins in the index. Fix this bug. - * listdirectives: Avoid listing \_comment directives and generally - assume any directive starting with \_ is likewise internal."""]] \ No newline at end of file diff --git a/doc/news/version_3.14159.mdwn b/doc/news/version_3.14159.mdwn new file mode 100644 index 000000000..21f91fdb4 --- /dev/null +++ b/doc/news/version_3.14159.mdwn @@ -0,0 +1,5 @@ +ikiwiki 3.14159 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * svn: Fix rcs\_rename to properly scope call to dirname. + * img: Pass the align parameter through to the generated img tag. + * Move OpenID pretty-printing from openid plugin to core (smcv)"""]] \ No newline at end of file -- cgit v1.2.3 From fe88c81562bbcca202ca28dc765d6b07febfb3d8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 17 Jul 2009 20:36:08 +0100 Subject: Try to help with some code review --- doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn | 3 +++ doc/todo/source_link.mdwn | 5 +++++ ...ables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn index 95c38f794..be4249460 100644 --- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn +++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn @@ -1,5 +1,8 @@ This patch adds function bestdir() which returns best directory from the directory structure. This is in addition to the bestlink() function which is there in IkiWiki.pm +> Um, what is this for? :-) It would probably be a lot easier to review if it +> had documentation, and/or a plugin that used it. --[[smcv]] + ------- Index: IkiWiki.pm diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn index b051361a8..9d9ec9697 100644 --- a/doc/todo/source_link.mdwn +++ b/doc/todo/source_link.mdwn @@ -4,6 +4,11 @@ How about a direct link from the page header to the source of the latest version I just implemented this. There is one [[patch]] to the default page template, and a new plugin. -- [[Will]] +> The use of sessioncgi here seems undesirable: on wikis where anonymity is +> not allowed, you'll be asked to log in. Couldn't you achieve the same thing +> by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does? +> --[[smcv]] + ---- diff --git a/templates/page.tmpl b/templates/page.tmpl diff --git a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn index b28469993..d292a1184 100644 --- a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn +++ b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn @@ -33,6 +33,12 @@ ManojSrivastava > > directory, which is not very easy for a plain ol' user. Not everyone is the > > sysadmin of their own machines with access to system dirs. --ManojSrivastava +>>> It seems worth mentioning here that the `libdir` configuration parameter +>>> lets you install additional plugins in a user-controlled directory +>>> (*libdir*`/IkiWiki/Plugin`), avoiding needing root; indeed, a full local +>>> ikiwiki installation without any involvement from the sysadmin is +>>> [[possible|tips/DreamHost]]. --[[smcv]] + 
                         varioki => {'motto'    => '"Manoj\'s musings"',
                         'arrayvar' => '[0, 1, 2, 3]',
-- 
cgit v1.2.3


From d2b1264546fa412db8c1591bc8bb14aba04b960d Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sat, 18 Jul 2009 13:06:04 +0100
Subject: Tag patches with the plugin to which they apply, or core

---
 doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn         | 4 +++-
 doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn      | 6 ++++--
 doc/bugs/search_for_locale_data_in_the_installed_location.mdwn     | 2 +-
 doc/patch/core.mdwn                                                | 7 +++++++
 doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn              | 2 +-
 doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn            | 2 +-
 doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn     | 2 +-
 doc/todo/allow_site-wide_meta_definitions.mdwn                     | 4 +++-
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn        | 2 +-
 doc/todo/blogpost_plugin.mdwn                                      | 2 +-
 doc/todo/enable-htaccess-files.mdwn                                | 4 +---
 doc/todo/format_escape.mdwn                                        | 2 +-
 .../hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn     | 2 +-
 doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn         | 6 ++++--
 doc/todo/inline_postform_autotitles.mdwn                           | 3 +--
 doc/todo/meta_rcsid.mdwn                                           | 2 +-
 doc/todo/missingparents.pm.mdwn                                    | 2 +-
 doc/todo/passwordauth:_sendmail_interface.mdwn                     | 2 +-
 doc/todo/should_optimise_pagespecs.mdwn                            | 2 +-
 doc/todo/tracking_bugs_with_dependencies.mdwn                      | 2 ++
 doc/todo/unaccent_url_instead_of_encoding.mdwn                     | 2 +-
 21 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 doc/patch/core.mdwn

diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
index 0edba438c..ceedbbdaa 100644
--- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
+++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
@@ -1,3 +1,5 @@
+[[!tag plugins/map patch]]
+
 input:
 
     before.
@@ -13,7 +15,7 @@ Presuming that the pagespec does not match, output:
 
 The UL element is not closed.
 
-Patch[[!tag patch]]:
+Patch:
 
     --- /usr/share/perl5/IkiWiki/Plugin/map.pm  2009-05-06 00:56:55.000000000 +0100
     +++ IkiWiki/Plugin/map.pm   2009-06-15 12:23:54.000000000 +0100
diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index 042d6a20c..be14e5126 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -1,3 +1,5 @@
+[[!tag patch plugins/inline patch/core]]
+
 The `IkiWiki::pagetitle` function does not respect title changes via `meta.title`. It really should, so that links rendered with `htmllink` get the proper title in the link text.
 
 --[[madduck]]
@@ -5,7 +7,7 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title
 ----
 
 It is possible to set a Page-Title in the meta-plugin, but that one isn't
-reused in parentlinks. This [[patch]] may fix it.
+reused in parentlinks. This patch may fix it.
 
 
          
 
        •  I give pagetitle the full path to a page.
@@ -132,7 +134,7 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki
 >
 >> It was actually more complicated than expected. A working prototype is
 >> now in my `meta` branch, see my userpage for the up-to-date url.
->> Thus tagging [[patch]]. --[[intrigeri]]
+>> Thus tagging patch. --[[intrigeri]]
 >>
 >>> Joey, please consider merging my `meta` branch. --[[intrigeri]]
 
diff --git a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
index dace2ca19..08af5fe2c 100644
--- a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
+++ b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
@@ -11,7 +11,7 @@ It seems like gettext only searches for locale information in /usr/share/locale,
                     return $gettext_obj->get(shift);
             }
 
-[[!tag patch]]
+[[!tag patch patch/core]]
 -- [[ThomasBleher]]
 
 > According to my testing, this patch makes ikiwiki's localisation fail for
diff --git a/doc/patch/core.mdwn b/doc/patch/core.mdwn
new file mode 100644
index 000000000..fcf0bdb72
--- /dev/null
+++ b/doc/patch/core.mdwn
@@ -0,0 +1,7 @@
+Some [[patches|patch]] affect the ikiwiki core, rather than just a plugin.
+This tag collects those patches. Please tag such patches with 'patch/core'
+as well as 'patch'.
+
+[[!inline pages="(todo/* or bugs/*) and link(patch/core)
+    and !link(bugs/done) and !link(todo/done) and !*/Discussion"
+  rootpage="todo" archive="yes"]]
diff --git a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
index 8ecdf36d0..e5ac391c3 100644
--- a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
+++ b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
@@ -83,4 +83,4 @@ regenerate this one against that).
 	-- 
 	1.5.2.2
 
-[[!tag patch]]
+[[!tag patch patch/core plugins/inline]]
diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
index be4249460..bf8de16cd 100644
--- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
+++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
@@ -48,4 +48,4 @@ This patch adds function bestdir() which returns best directory from the directo
 ---- 
 -[[users/arpitjain]]
 
-[[!tag patch]]
+[[!tag patch patch/core]]
diff --git a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
index 89167c084..4bc828e6e 100644
--- a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
+++ b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
@@ -1,4 +1,4 @@
-[[!tag patch]]
+[[!tag patch plugins/calendar]]
 
 Here's my next version of the patch - still a work in progress.
 
diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 97515a312..893498f2c 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -1,8 +1,10 @@
+[[!tag plugins/meta patch]]
+
 I'd like to define [[plugins/meta]] values to apply across all pages
 site-wide unless the pages define their own: default values for meta
 definitions essentially.
 
-Here's a patch[[!tag patch]] to achieve this (also in the "defaultmeta" branch of
+Here's a patch to achieve this (also in the "defaultmeta" branch of
 my github ikiwiki fork):
 
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
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 f60fc3d6e..f1d33114f 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
@@ -4,7 +4,7 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte
 
 Also see:  and 
 
-[[!tag wishlist]]
+[[!tag wishlist plugins/tag patch]]
 
 I would love to see this as well. -- dato
 
diff --git a/doc/todo/blogpost_plugin.mdwn b/doc/todo/blogpost_plugin.mdwn
index bb91ffd02..69df27271 100644
--- a/doc/todo/blogpost_plugin.mdwn
+++ b/doc/todo/blogpost_plugin.mdwn
@@ -153,4 +153,4 @@ Index: IkiWiki.pm
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
        -[[!tag patch]] +[[!tag patch patch/core]] diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index 15efab70c..968279113 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -12,7 +12,7 @@ qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//], wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/, -[[!tag patch]] +[[!tag patch patch/core]] This lets the site administrator have a `.htaccess` file in their underlay directory, say, then get it copied over when the wiki is built. Without @@ -52,5 +52,3 @@ It should be off by default of course. --Max --- +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]] - -[[!tag patch]] diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn index 574883d1b..762f16646 100644 --- a/doc/todo/format_escape.mdwn +++ b/doc/todo/format_escape.mdwn @@ -97,7 +97,7 @@ I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-fo --Ryan Koppenhaver ## Original patch -[[!tag patch]] +[[!tag patch patch/core plugins/rst]] 
         Index: debian/changelog
diff --git a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
index a6a6ec1e1..7cf37fbb9 100644
--- a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
+++ b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
@@ -12,7 +12,7 @@ while the default stays as it is now.
 > INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not
 > adding new variables where MakeMaker already has them. --[[Joey]]
 
-[[!tag patch]]
+[[!tag patch patch/core]]
 
 
         
diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index fc575e013..336ae38d6 100644
--- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
+++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
@@ -1,5 +1,5 @@
-A [[patch]] in my git repository (the inline-pagenames branch) adds the following
-parameter to the [[ikiwiki/directive/inline]] directive:
+A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
+the following parameter to the [[ikiwiki/directive/inline]] directive:
 
 > * `pagenames` - If given instead of `pages`, this is interpreted as a
 >    space-separated list of links to pages (with the same
@@ -10,3 +10,5 @@ parameter to the [[ikiwiki/directive/inline]] directive:
 This is on my [[wishlist]] for my [[plugins/contrib/album]] plugin, which currently
 uses it internally (as it has already collected the pages in order). It could also
 be useful for other things, like [[todo/wikitrails]]. --[[smcv]]
+
+[[!tag plugins/inline]]
diff --git a/doc/todo/inline_postform_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn
index 5005208be..b3366f60e 100644
--- a/doc/todo/inline_postform_autotitles.mdwn
+++ b/doc/todo/inline_postform_autotitles.mdwn
@@ -1,5 +1,4 @@
-[[!tag wishlist]]
-[[!tag patch]]
+[[!tag wishlist patch plugins/inline]]
 
 for postforms in inlines of pages which follow a certain scheme, it might not
 be required to set the title for each individual post, but to automatically set
diff --git a/doc/todo/meta_rcsid.mdwn b/doc/todo/meta_rcsid.mdwn
index 158edea6e..9e112317f 100644
--- a/doc/todo/meta_rcsid.mdwn
+++ b/doc/todo/meta_rcsid.mdwn
@@ -1,4 +1,4 @@
-The following patch adds an 'rcsid' parameter to the Meta plugin, to allow inclusion 
+The following patch adds an 'rcsid' parameter to the [[!taglink plugins/Meta]] plugin, to allow inclusion 
 of CVS/SVN-style keywords (like '$Id$', etc.) from the source file in the page template.
 
 > So the idea is you'd write something like:
diff --git a/doc/todo/missingparents.pm.mdwn b/doc/todo/missingparents.pm.mdwn
index c5f2ab535..cecac7a94 100644
--- a/doc/todo/missingparents.pm.mdwn
+++ b/doc/todo/missingparents.pm.mdwn
@@ -258,4 +258,4 @@ Index: IkiWiki.pm
  	my $page=shift;
 
        
 
-[[!tag patch]]
+[[!tag patch patch/core]]
diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn
index 9598af234..770c4825a 100644
--- a/doc/todo/passwordauth:_sendmail_interface.mdwn
+++ b/doc/todo/passwordauth:_sendmail_interface.mdwn
@@ -1,4 +1,4 @@
-[[!tag wishlist]]
+[[!tag wishlist plugins/passwordauth]]
 
 For sending out password reminder emails, the [[plugins/passwordauth]] plugin currently uses
 the *[Mail::Sendmail](http://search.cpan.org/perldoc?Mail::Sendmail)* module.
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index c5485477f..61458d972 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -96,4 +96,4 @@ I can think about reducung the size of my wiki source and making it available on
 >>>> I haven't actually deleted it), because the "or" operation is now done in
 >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]]
 
-[[!tag wishlist patch]]
+[[!tag wishlist patch patch/core]]
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 3a761731b..80aaf3c39 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -1,3 +1,5 @@
+[[!tag patch patch/core]]
+
 I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so on several wikis.  However, as far as I can tell, ikiwiki has no functionality which can represent dependencies between bugs and allow pagespecs to select based on dependencies.  For instance, I can't write a pagespec which selects all bugs with no dependencies on bugs not marked as done.  --[[JoshTriplett]]
 
 > I started having a think about this.  I'm going to start with the idea that expanding
diff --git a/doc/todo/unaccent_url_instead_of_encoding.mdwn b/doc/todo/unaccent_url_instead_of_encoding.mdwn
index 1be150a82..d74b632bd 100644
--- a/doc/todo/unaccent_url_instead_of_encoding.mdwn
+++ b/doc/todo/unaccent_url_instead_of_encoding.mdwn
@@ -6,4 +6,4 @@ This is a one liner change, but requires a bit of reordering in the code.
 
 [[cstamas]]
 
-[[!tag wishlist patch]]
+[[!tag wishlist patch patch/core]]
-- 
cgit v1.2.3


From 900d428e5f28f6b7f98afd36f3e261b3b89b8033 Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sat, 18 Jul 2009 13:08:13 +0100
Subject: Some more attempts to review patches

---
 .../Add_space_before_slash_in_parent_links.mdwn    |  5 +++++
 doc/todo/allow_site-wide_meta_definitions.mdwn     | 17 ++++++++++++++++
 doc/todo/enable-htaccess-files.mdwn                |  7 +++++++
 .../language_definition_for_the_meta_plugin.mdwn   | 12 +++++++++++
 doc/todo/passwordauth:_sendmail_interface.mdwn     |  7 +++++++
 doc/todo/tmplvars_plugin.mdwn                      | 23 ++++++++++++++++++++++
 6 files changed, 71 insertions(+)

diff --git a/doc/todo/Add_space_before_slash_in_parent_links.mdwn b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
index 40a334032..9eb8e5364 100644
--- a/doc/todo/Add_space_before_slash_in_parent_links.mdwn
+++ b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
@@ -8,6 +8,11 @@ This [[patch]] adds a space before the forward-slash in the the parent links. Th
 
 >>> Yes, please.  This seems to be something a lot of people want to customize.  (I certainly do -- a forward slash only looks natural to Unix users)  --[[sabr]]
 
+>> Joey, would I be right to summarize your position on this as "people who
+>> want to change the text of the templates should maintain their own version
+>> of the `.tmpl` files"? It's not clear to me how this todo item could be
+>> closed in a way acceptable to you, except perhaps as WONTFIX. --[[smcv]]
+
 Before:
 
     ikiwiki/ todo/ Add space before slash in parent links
diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 893498f2c..492a8d747 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -54,3 +54,20 @@ my github ikiwiki fork):
      * title
 
 -- [[Jon]]
+
+> This doesn't support multiple-argument meta directives like
+> `link=x rel=y`, or meta directives with special side-effects like
+> `updated`.
+>
+> The first could be solved (if you care) by a syntax like this:
+>
+>     meta_defaults => [
+>         { copyright => "© me" },
+>         { link => "about:blank", rel => "silly", },
+>     ]
+>
+> The second could perhaps be solved by invoking `meta::preprocess` from within
+> `scan` (which might be a simplification anyway), although this is complicated
+> by the fact that some (but not all!) meta headers are idempotent.
+> 
+> --[[smcv]]
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 968279113..e302a49ed 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -39,6 +39,13 @@ access and such .htaccess files should not be accessible through wiki cgi. Of co
 
 > See [[!debbug 447267]] for a patch for this.
 
+>> It looks to me as though this functionality won't be included in ikiwiki
+>> unless someone who wants it takes responsibility for updating the patch
+>> from that Debian bug to be applicable to current versions, so that there's a
+>> setup file parameter for extra filenames to allow, defaulting to none
+>> (i.e. a less simplistic patch than the one at the top of this page).
+>> Joey, is this an accurate summary? --[[smcv]]
+
 ---
 
 bump! I would like to see some form of this functionality included in ikiwiki. I use a patched version, but
diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 4ac4e2e25..8c4b45141 100644
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -81,4 +81,16 @@ This may be useful for sites with a few pages in different languages, but no ful
 > Please resolve lang somewhere reusable rather than within meta plugin: It is certainly usable outside
 > the scope of the meta plugin as well. --[[JonasSmedegaard]]
 
+>> I don't see any problem with having this in meta? meta is on by default, and
+>> other plugins are free to use it or even depend on it (e.g. inline does).
+>>
+>> My only comments on this patch beyond what Joey said are that the page
+>> language could usefully go into `$pagestate{$page}{meta}{lang}` for other
+>> plugins to be able to see it (is that what you meant?), and that
+>> restricting to 2 characters is too restrictive (HTML 4.01 mentions
+>> `en`, `en-US` and `i-navajo` as possible language codes).
+>> This slightly complicates parsing the locale to get the default language:
+>> it'll need `tr/_/-/` after the optional `.encoding` is removed.
+>> --[[smcv]]
+
 [[!tag wishlist patch plugins/meta translation]]
diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn
index 770c4825a..29f28ca32 100644
--- a/doc/todo/passwordauth:_sendmail_interface.mdwn
+++ b/doc/todo/passwordauth:_sendmail_interface.mdwn
@@ -52,3 +52,10 @@ Remaining TODOs:
 > lost it. --[[Joey]]
 
 Resent.  --[[tschwinge]]
+
+> Debian now has Mail::Sender, Mail::SendEasy, and Email::Sender
+> (which, according to its dpkg description, "replaces the old and sometimes
+> problematic Email::Send library, which did a decent job at handling very
+> simple email sending tasks, but was not suitable for serious use, for a
+> variety of reasons"). Are any of those any better? It's unfortunate that
+> there doesn't seem to be a clear "best practice"... --[[smcv]]
diff --git a/doc/todo/tmplvars_plugin.mdwn b/doc/todo/tmplvars_plugin.mdwn
index 644cf23aa..2fe819682 100644
--- a/doc/todo/tmplvars_plugin.mdwn
+++ b/doc/todo/tmplvars_plugin.mdwn
@@ -2,6 +2,29 @@ A simple plugin to allow per-page customization of a template by passing paramat
 
 [[!tag patch]]
 
+> The implementation looks fine to me (assuming it works with current ikiwiki),
+> apart from the "XXX" already noted in the patch. The design could reasonably
+> be considered premature generalization, though - how often do you actually
+> need to define new tmplvars?
+>
+> As for the page/destpage/preview thing, it would be good if the preprocess
+> hook could distinguish between software-supplied and user-supplied
+> parameters (the [[plugins/tag]] plugin could benefit from this too). Perhaps
+> the IkiWiki core could be modified so that
+> `hook(type => "preprocess", splitparams => 1, ...)` would invoke preprocess
+> with { page => "foo", destpage => "bar", ... } as a special first argument,
+> and the user-supplied parameters as subsequent arguments? Then plugins like
+> tag could use:
+>
+>     my $ikiparams = shift;
+>     my %params = @_;
+>
+>     add_tags($ikiparams->{page}, keys %params);
+>
+> --[[smcv]]
+
+----
+
     #!/usr/bin/perl
     package IkiWiki::Plugin::tmplvars;
 
-- 
cgit v1.2.3


From bf2bf18a792efde4f359875c98f2768a7da5558c Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sat, 18 Jul 2009 13:29:24 +0100
Subject: Advertise my 'among' branch for review

---
 doc/todo/backlinks_result_is_lossy.mdwn         | 10 ++++++++++
 doc/todo/pagestats_among_a_subset_of_pages.mdwn | 26 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 doc/todo/backlinks_result_is_lossy.mdwn
 create mode 100644 doc/todo/pagestats_among_a_subset_of_pages.mdwn

diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
new file mode 100644
index 000000000..7b64a4f2c
--- /dev/null
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -0,0 +1,10 @@
+[[!tag patch patch/core]]
+
+IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
+lossy transformation (to get it in the form that page templates want), making
+it more difficult to use in other contexts (like pagestats).
+
+A commit on my `among` branch splits it into IkiWiki::backlink_pages
+(which returns the keys of $backlinks{$page}, and might be suitable for
+exporting) and IkiWiki::backlinks (which calls backlink_pages, then performs
+the same lossy transformation as before on the result).
diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
new file mode 100644
index 000000000..f131b5283
--- /dev/null
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -0,0 +1,26 @@
+[[!tag patch plugins/pagestats]]
+
+My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
+to provide pagestats for links from a subset of pages. From the docs included
+in the patch:
+
+> The optional `among` parameter limits counting to pages that match a
+> [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
+> entries, you could use:
+>
+> 	\[[!pagestats pages="tags/*" among="blog/posts/*"]]
+>
+> or to display a cloud of tags related to Linux, you could use:
+> 
+> 	\[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
+
+I use this on my tag pages on one site, with the following template:
+
+    \[[!pagestats pages="tags/* and !tags/
+        and !tags/photogallery"
+      among="tagged()"]]
+
+    \[[!inline pages="tagged()"
+      archive="yes" quick="yes" reverse="yes" timeformat="%x"]]
+
+--[[smcv]]
-- 
cgit v1.2.3


From 6680572dad4845499c1fc163ee317f4070f69f7b Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sat, 18 Jul 2009 13:30:30 +0100
Subject: oops, remove duplicate

---
 ...ts:_ability_to_limit_to_links_from_certain_pages.mdwn | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn

diff --git a/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn b/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn
deleted file mode 100644
index abf7c3fea..000000000
--- a/doc/todo/pagestats:_ability_to_limit_to_links_from_certain_pages.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-The `among` branch in my git repository refactors IkiWiki::Render a
-bit, then uses this refactoring to add a [[ikiwiki/directive/pagestats]]
-parameter `among` that will only count links from pages that match a
-given [[ikiwiki/PageSpec]]. From its documentation:
-
-> The optional `among` parameter limits counting to pages that match a
-> [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
-> entries, you could use:
-> 
->        \[[!pagestats pages="tags/*" among="blog/posts/*"]]
-> 
-> or to display a cloud of tags related to Linux, you could use:
-> 
->        \[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
-
-Suggestions for a better parameter name are welcome. --[[smcv]]
-- 
cgit v1.2.3


From 87eb384bb31a212ef23ae696817fc16dbfc2dded Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 09:47:03 -0400
Subject: Fix escaping-via-indentation of example

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

diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index f131b5283..1c1656b4e 100644
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -8,11 +8,11 @@ in the patch:
 > [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
 > entries, you could use:
 >
-> 	\[[!pagestats pages="tags/*" among="blog/posts/*"]]
+>     \[[!pagestats pages="tags/*" among="blog/posts/*"]]
 >
 > or to display a cloud of tags related to Linux, you could use:
 > 
-> 	\[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
+>     \[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
 
 I use this on my tag pages on one site, with the following template:
 
-- 
cgit v1.2.3


From 03d8ee0c61f9e3c46c5e4afe563d4df5faf3946c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 10:08:19 -0400
Subject: Compare with [[todo/allow_site-wide_meta_definitions]]

---
 ...t_content_for___42__copyright__42___and___42__license__42__.mdwn | 6 ++++++
 1 file changed, 6 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 5e3db3d7c..b9ad3cc8e 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
@@ -39,3 +39,9 @@ I'm missing something terribly obvious? --Peter
 By the way: these need not be *HTML* files; `copyright.mdwn`,
 respectively `license.mdwn`, or every other format supported
 by ikiwiki are likewise fine.  --[[tschwinge]]
+
+> Jon has done something similar in [[todo/allow_site-wide_meta_definitions]];
+> his version has the advantages that it doesn't invent magical page names,
+> 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]]
-- 
cgit v1.2.3


From 2f573cf515816f9528b8ed84a97407c74b2367f4 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 13:46:55 -0400
Subject: New plugin for review

---
 doc/plugins/contrib/trail.mdwn | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 doc/plugins/contrib/trail.mdwn

diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn
new file mode 100644
index 000000000..58ee46751
--- /dev/null
+++ b/doc/plugins/contrib/trail.mdwn
@@ -0,0 +1,56 @@
+[[!tag type/chrome patch]]
+
+Available from [[smcv]]'s git repository, in the `trail` branch. This
+plugin aims to solve [[todo/wikitrails]] in a simpler way.
+
+Joey: what do you think of this plugin? If you like the general approach
+and are likely to include it in ikiwiki, I'll try to modify
+[[plugins/contrib/album]] to be based on it, rather than partially
+reinventing it.
+
+----
+
+[[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]]
+
+It's sometimes useful to have "trails" of pages in a wiki, as a guided
+tour, sequence of chapters etc. In this plugin, a trail is represented
+by a page, and the pages in the trail are indicated by specially marked
+links within that page.
+
+If using the default `page.tmpl`, each page automatically displays the
+trails that it's a member of (if any), with links to the trail and to
+the next and previous members.
+
+The `traillink` [[ikiwiki/directive]] is used to record which pages
+are in a trail, and simultaneously link to them. Alternatively, the
+[[ikiwiki/directive/inline]] directive can be used with `trail=yes`
+to record the inlined pages as part of the trail, in the order in
+which they are inlined.
+
+## Directives
+
+(These will go to the appropriate pages in [[ikiwiki/directive]] if this
+plugin is included in ikiwiki.)
+
+### traillink
+
+The `traillink` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]]
+plugin. This directive appears on the page representing a trail. It acts
+as a visible [[ikiwiki/WikiLink]], but also records the linked page as
+a member of the trail.
+
+Various syntaxes can be used:
+
+    \[[!traillink Badgers]]
+    \[[!traillink How_to_find_mushrooms_using_badgers|badgers]]
+    \[[!traillink badgers text="How to find mushrooms using badgers"]]
+
+### trailoptions
+
+The `trailoptions` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]]
+plugin. This directive appears on the page representing a trail, and
+produces no output.
+
+Currently, the only option supported is `[[!trailoptions circular=yes]]`,
+which adds links between the first and last pages, turning the trail into
+a circle.
-- 
cgit v1.2.3


From c4c26838145591f5fb7d4d9a404a43d95d87f0c0 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 13:49:53 -0400
Subject: mention plugins/contrib/trail

---
 doc/todo/wikitrails/discussion.mdwn | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/doc/todo/wikitrails/discussion.mdwn b/doc/todo/wikitrails/discussion.mdwn
index b2a0937ad..9dbbb6bc8 100644
--- a/doc/todo/wikitrails/discussion.mdwn
+++ b/doc/todo/wikitrails/discussion.mdwn
@@ -1,11 +1,3 @@
-This sounds like a more general version of what I want for
-one-photo-per-page galleries, where each page has previous|up|next links
-(like this plugin) and the index page has a list or grid of thumbnails
-(\[[!inline]] with a specially modified template perhaps). I'll watch this
-with interest! --[[smcv]]
-
-----
-
 This is a nice idea, I do have my gripes about the imeplementation.
 
 Assuming that the index's list is in mdwn format is not ideal. I guess the
@@ -81,5 +73,8 @@ hook to run *after* trail's, or perhaps by having trail's
 pagetemplate hook disable itself for pages that contain
 a \[[!trail]] directive.
 
-Does this sound viable? Should I think about implementing it?
---[[smcv]]
+I have now implemented this at [[plugins/contrib/trail]].
+What do you think? I'm still not sure how it would relate
+to [[plugins/contrib/album]], but if trail is reviewed
+and approved in principle, I'll try to adapt album as
+outlined above. --[[smcv]]
-- 
cgit v1.2.3


From 398e6eec218fb9854d4c4416737708cdf67e981c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 13:53:29 -0400
Subject:

---
 doc/plugins/contrib/trail.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn
index 58ee46751..d8dc02f47 100644
--- a/doc/plugins/contrib/trail.mdwn
+++ b/doc/plugins/contrib/trail.mdwn
@@ -8,6 +8,10 @@ and are likely to include it in ikiwiki, I'll try to modify
 [[plugins/contrib/album]] to be based on it, rather than partially
 reinventing it.
 
+This plugin can benefit from
+[[another_of_my_branches|todo/inline_plugin:_specifying_ordered_page_names]]
+but does not require it.
+
 ----
 
 [[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]]
-- 
cgit v1.2.3


From ff37548bbd84bdc78372831185f124649d5db0b3 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 18 Jul 2009 15:40:12 -0400
Subject: I think this whole page is now [[done]]?

---
 doc/todo/more_class__61____34____34___for_css.mdwn | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/todo/more_class__61____34____34___for_css.mdwn b/doc/todo/more_class__61____34____34___for_css.mdwn
index 4712c12b3..cace27d63 100644
--- a/doc/todo/more_class__61____34____34___for_css.mdwn
+++ b/doc/todo/more_class__61____34____34___for_css.mdwn
@@ -15,6 +15,8 @@ Here's the one-liner:
 
 > applied --[[Joey]]
 
+----
+
 The following adds a div element with class="trailer" around the meta-information
 added after an inlined page (namely: the post date, the tags, and the actions):
 
@@ -42,7 +44,7 @@ added after an inlined page (namely: the post date, the tags, and the actions):
 > gets confused by these nested div's and puts p's around one of them, generating
 > broken html. If you can come up with a way to put in the div that passes
 > the test suite, or a fix to markdown, I will accept it, but the above patch
-> fails the test suite. --[[Joey]] 
+> fails the test suite. --[[Joey]]
 
 >> Just a note...  This discrepancy doesn't exist in [pandoc](http://code.google.com/p/pandoc/) as
 >> demonstrated in the relevant [page](http://code.google.com/p/pandoc/wiki/PandocVsMarkdownPl).
@@ -64,6 +66,16 @@ added after an inlined page (namely: the post date, the tags, and the actions):
 >>>> to at least get into debian testing before I make ikiwiki depend on it
 >>>> though. --[[Joey]]
 
+>> This Markdown issue seems to have been worked around by the optimization
+>> in which \[[!inline]] is replaced with a placeholder, and the
+>> placeholder is later replaced by the HTML. Meanwhile, this patch
+>> has been obsoleted by applying a similar one (wrapping things in a div
+>> with class inlinefooter). That was the last remaining unapplied patch
+>> on this page, so I think this whole page can be considered [[done]].
+>> --[[smcv]]
+
+----
+
 I'd like a class attribute on the `` tag surrounding wikilinks
 that refer to non-existent pages, in Ikiwiki.pm:htmllink, so that such
 broken links can be styled more dramatically with CSS. --Jamey
-- 
cgit v1.2.3


From 2ea4b9e6789ff2ed0f2281c3c2aee1cedf113d05 Mon Sep 17 00:00:00 2001
From: tumashu 
Date: Sun, 19 Jul 2009 00:46:39 -0400
Subject: Add tumashu's page url

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8155790d7..56f407a41 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -123,6 +123,7 @@ Personal sites and blogs
 * [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!!
 * [Natalian - Kai Hendry's personal blog](http://natalian.org/)
 * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au)
+* [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From fa2c3a3dba2a4589b63cf445ec9e33ec19be627e Mon Sep 17 00:00:00 2001
From: tumashu 
Date: Sun, 19 Jul 2009 01:08:23 -0400
Subject:  add chinese test

---
 doc/sandbox.mdwn | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5e9c05225..6730dd146 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -106,7 +106,56 @@ But, of course, rsync is better.
 
 Let's see what happens... ~~
 
-測試的啦
+#中文标题一
+##中文标题二
+###中文标题三
+...
+######中文标题六
+
+###正文:
+
+君不见，黄河之水天上来，奔流到海不复回。
+
+君不见，高堂明镜悲白发，朝如青丝暮成雪。
+
+人生得意须尽欢，莫使金樽空对月。
+
+天生我材必有用，千金散尽还复来。
+
+###列表：
+
+* 天空
+
+   1. 蓝色的
+   2. 好高啊
+
+* 海洋
+
+   1. 有鱼
+       
+       * 鲸鱼
+       * 鲨鱼
+           
+
+* 大地
+
+###链接：
+
+[谷歌](http://www.google.com)
+
+###引用：
+
+> 一级引用
+>
+> 一级引用
+>
+> > 二级引用
+>
+>> 没有空格也可以
+>>> 三级引用
+>
+> 回到一级引用
+
 
 ----
 
-- 
cgit v1.2.3