urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'upstream/master' into pub/po 

Conflicts:

	debian/changelog
	debian/control
master
intrigeri 2009-04-20 12:21:18 +02:00
parent 9db2438b3a 2cc3f5d057
commit 4558457402
66 changed files with 1645 additions and 891 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bundle/IkiWiki/Extras.pm
View File

@ -34,7 +34,6 @@ Net::Amazon::S3
Text::WikiCreole
Term::ReadLine::Gnu
HTML::Tree
Authen::Passphrase
Sort::Naturally
=head1 AUTHOR

2
IkiWiki.pm
View File

@ -321,7 +321,7 @@ sub getsetup () {
default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
qr/\.x?html?$/, qr/\.ikiwiki-new$/,
qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
qr/(^|\/)_MTN\//,
qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
qr/\.dpkg-tmp$/],
description => "regexps of source files to ignore",
safe => 0,

429
IkiWiki/Plugin/darcs.pm 100644
View File

@ -0,0 +1,429 @@
#!/usr/bin/perl
package IkiWiki::Plugin::darcs;
use warnings;
use strict;
use IkiWiki;
sub import {
hook(type => "checkconfig", id => "darcs", call => \&checkconfig);
hook(type => "getsetup", id => "darcs", call => \&getsetup);
hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
}
sub silentsystem (@) {
open(SAVED_STDOUT, ">&STDOUT");
open(STDOUT, ">/dev/null");
my $ret = system @_;
open(STDOUT, ">&SAVED_STDOUT");
return $ret;
}
sub darcs_info ($$$) {
my $field = shift;
my $repodir = shift;
my $file = shift; # Relative to the repodir.
my $child = open(DARCS_CHANGES, "-|");
if (! $child) {
exec('darcs', 'changes', '--repodir', $repodir, '--xml-output', $file) or
error("failed to run 'darcs changes'");
}
# Brute force for now. :-/
while (<DARCS_CHANGES>) {
last if /^<\/created_as>$/;
}
($_) = <DARCS_CHANGES> =~ /$field=\'([^\']+)/;
$field eq 'hash' and s/\.gz//; # Strip away the '.gz' from 'hash'es.
close(DARCS_CHANGES);
return $_;
}
sub file_in_vc($$) {
my $repodir = shift;
my $file = shift;
my $child = open(DARCS_MANIFEST, "-|");
if (! $child) {
exec('darcs', 'query', 'manifest', '--repodir', $repodir) or
error("failed to run 'darcs query manifest'");
}
my $found=0;
while (<DARCS_MANIFEST>) {
$found = 1, last if /^(\.\/)?$file$/;
}
close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
return $found;
}
sub darcs_rev($) {
my $file = shift; # Relative to the repodir.
my $repodir = $config{srcdir};
return "" if (! file_in_vc($repodir, $file));
my $hash = darcs_info('hash', $repodir, $file);
return defined $hash ? $hash : "";
}
sub checkconfig() {
if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) {
push @{$config{wrappers}}, {
wrapper => $config{darcs_wrapper},
wrappermode => (defined $config{darcs_wrappermode} ? $config{darcs_wrappermode} : "06755"),
};
}
}
sub getsetup() {
return
plugin => {
safe => 0, # rcs plugin
rebuild => undef,
},
darcs_wrapper => {
type => "string",
example => "/darcs/repo/_darcs/ikiwiki-wrapper",
description => "wrapper to generate (set as master repo apply hook)",
safe => 0, # file
rebuild => 0,
},
darcs_wrappermode => {
type => "string",
example => '06755',
description => "mode for darcs_wrapper (can safely be made suid)",
safe => 0,
rebuild => 0,
},
historyurl => {
type => "string",
example => "http://darcs.example.com/darcsweb.cgi?r=wiki;a=filehistory;f=[[file]]",
description => "darcsweb url to show file history ([[file]] substituted)",
safe => 1,
rebuild => 1,
},
diffurl => {
type => "string",
example => "http://darcs.example.com/darcsweb.cgi?r=wiki;a=filediff;h=[[hash]];f=[[file]]",
description => "darcsweb url to show a diff ([[hash]] and [[file]] substituted)",
safe => 1,
rebuild => 1,
},
}
sub rcs_update () {
silentsystem('darcs', "pull", "--repodir", $config{srcdir}, "-qa")
}
sub rcs_prepedit ($) {
# Prepares to edit a file under revision control. Returns a token that
# must be passed to rcs_commit() when the file is to be commited. For us,
# this token the hash value of the latest patch that modifies the file,
# i.e. something like its current revision.
my $file = shift; # Relative to the repodir.
my $rev = darcs_rev($file);
return $rev;
}
sub rcs_commit ($$$;$$) {
# Commit the page. Returns 'undef' on success and a version of the page
# with conflict markers on failure.
my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
# Compute if the "revision" of $file changed.
my $changed = darcs_rev($file) ne $rcstoken;
# Yes, the following is a bit convoluted.
if ($changed) {
# TODO. Invent a better, non-conflicting name.
rename("$config{srcdir}/$file", "$config{srcdir}/$file.save") or
error("failed to rename $file to $file.save: $!");
# Roll the repository back to $rcstoken.
# TODO. Can we be sure that no changes are lost? I think that
# we can, if we make sure that the 'darcs push' below will always
# succeed.
# We need to revert everything as 'darcs obliterate' might choke
# otherwise.
# TODO: 'yes | ...' needed? Doesn't seem so.
silentsystem('darcs', "revert", "--repodir", $config{srcdir}, "--all") == 0 ||
error("'darcs revert' failed");
# Remove all patches starting at $rcstoken.
my $child = open(DARCS_OBLITERATE, "|-");
if (! $child) {
open(STDOUT, ">/dev/null");
exec('darcs', "obliterate", "--repodir", $config{srcdir},
"--match", "hash " . $rcstoken) and
error("'darcs obliterate' failed");
}
1 while print DARCS_OBLITERATE "y";
close(DARCS_OBLITERATE);
# Restore the $rcstoken one.
silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},
"--match", "hash " . $rcstoken, "--all") == 0 ||
error("'darcs pull' failed");
# We're back at $rcstoken. Re-install the modified file.
rename("$config{srcdir}/$file.save", "$config{srcdir}/$file") or
error("failed to rename $file.save to $file: $!");
}
# Record the changes.
my $author;
if (defined $user) {
$author = "$user\@web";
}
elsif (defined $ipaddr) {
$author = "$ipaddr\@web";
}
else {
$author = "anon\@web";
}
if (!defined $message || !length($message)) {
$message = "empty message";
}
silentsystem('darcs', 'record', '--repodir', $config{srcdir}, '--all',
'-m', $message, '--author', $author, $file) == 0 ||
error("'darcs record' failed");
# Update the repository by pulling from the default repository, which is
# master repository.
silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},
"--all") == 0 || error("'darcs pull' failed");
# If this updating yields any conflicts, we'll record them now to resolve
# them. If nothing is recorded, there are no conflicts.
$rcstoken = darcs_rev($file);
# TODO: Use only the first line here, i.e. only the patch name?
writefile("$file.log", $config{srcdir}, 'resolve conflicts: ' . $message);
silentsystem('darcs', 'record', '--repodir', $config{srcdir}, '--all',
'-m', 'resolve conflicts: ' . $message, '--author', $author, $file) == 0 ||
error("'darcs record' failed");
my $conflicts = darcs_rev($file) ne $rcstoken;
unlink("$config{srcdir}/$file.log") or
error("failed to remove '$file.log'");
# Push the changes to the main repository.
silentsystem('darcs', 'push', '--quiet', '--repodir', $config{srcdir}, '--all') == 0 ||
error("'darcs push' failed");
# TODO: darcs send?
if ($conflicts) {
my $document = readfile("$config{srcdir}/$file");
# Try to leave everything in a consistent state.
# TODO: 'yes | ...' needed? Doesn't seem so.
silentsystem('darcs', "revert", "--repodir", $config{srcdir}, "--all") == 0 ||
warn("'darcs revert' failed");
return $document;
}
else {
return undef;
}
}
sub rcs_commit_staged($$$) {
my ($message, $user, $ipaddr) = @_;
my $author;
if (defined $user) {
$author = "$user\@web";
}
elsif (defined $ipaddr) {
$author = "$ipaddr\@web";
}
else {
$author = "anon\@web";
}
if (!defined $message || !length($message)) {
$message = "empty message";
}
silentsystem('darcs', "record", "--repodir", $config{srcdir}, "-a", "-A", $author,
"-m", $message) == 0 || error("'darcs record' failed");
# Push the changes to the main repository.
silentsystem('darcs', 'push', '--quiet', '--repodir', $config{srcdir}, '--all') == 0 ||
error("'darcs push' failed");
# TODO: darcs send?
return undef;
}
sub rcs_add ($) {
my $file = shift; # Relative to the repodir.
if(! file_in_vc($config{srcdir}, $file)) {
# Intermediate directories will be added automagically.
system('darcs', 'add', '--quiet', '--repodir', $config{srcdir},
'--boring', $file) == 0 || error("'darcs add' failed");
}
}
sub rcs_remove ($) {
my $file = shift; # Relative to the repodir.
unlink($config{srcdir}.'/'.$file);
}
sub rcs_rename ($$) {
my $a = shift; # Relative to the repodir.
my $b = shift; # Relative to the repodir.
system('darcs', 'mv', '--repodir', $config{srcdir}, $a, $b) == 0 ||
error("'darcs mv' failed");
}
sub rcs_recentchanges ($) {
my $num=shift;
my @ret;
eval q{use Date::Parse};
eval q{use XML::Simple};
my $repodir=$config{srcdir};
my $child = open(LOG, "-|");
if (! $child) {
$ENV{"DARCS_DONT_ESCAPE_ANYTHING"}=1;
exec("darcs", "changes", "--xml",
"--summary",
"--repodir", "$repodir",
"--last", "$num")
|| error("'darcs changes' failed to run");
}
my $data;
$data .= $_ while(<LOG>);
close LOG;
my $log = XMLin($data, ForceArray => 1);
foreach my $patch (@{$log->{patch}}) {
my $date=$patch->{local_date};
my $hash=$patch->{hash};
my $when=str2time($date);
my (@pages, @files, @pg);
push @pages, $_ for (@{$patch->{summary}->[0]->{modify_file}});
push @pages, $_ for (@{$patch->{summary}->[0]->{add_file}});
push @pages, $_ for (@{$patch->{summary}->[0]->{remove_file}});
foreach my $f (@pages) {
$f = $f->{content} if ref $f;
$f =~ s,^\s+,,; $f =~ s,\s+$,,; # cut whitespace
push @files, $f;
}
foreach my $p (@{$patch->{summary}->[0]->{move}}) {
push @files, $p->{from};
}
foreach my $f (@files) {
my $d = defined $config{'diffurl'} ? $config{'diffurl'} : "";
$d =~ s/\[\[file\]\]/$f/go;
$d =~ s/\[\[hash\]\]/$hash/go;
push @pg, {
page => pagename($f),
diffurl => $d,
};
}
next unless (scalar @pg > 0);
my @message;
push @message, { line => $_ } foreach (@{$patch->{name}});
my $committype;
my $author;
if ($patch->{author} =~ /(.*)\@web$/) {
$author = $1;
$committype = "web";
}
else {
$author=$patch->{author};
$committype = "darcs";
}
push @ret, {
rev => $patch->{hash},
user => $author,
committype => $committype,
when => $when,
message => [@message],
pages => [@pg],
};
}
return @ret;
}
sub rcs_diff ($) {
my $rev=shift;
my @lines;
foreach my $line (silentsystem("darcs", "diff", "--match", "hash ".$rev)) {
if (@lines || $line=~/^diff/) {
push @lines, $line."\n";
}
}
if (wantarray) {
return @lines;
}
else {
return join("", @lines);
}
}
sub rcs_getctime ($) {
my $file=shift;
eval q{use Date::Parse};
eval q{use XML::Simple};
local $/=undef;
my $filer=substr($file, length($config{srcdir}));
$filer =~ s:^[/]+::;
my $child = open(LOG, "-|");
if (! $child) {
exec("darcs", "changes", "--xml", "--reverse",
"--repodir", $config{srcdir}, $filer)
|| error("'darcs changes $filer' failed to run");
}
my $data;
{
local $/=undef;
$data = <LOG>;
}
close LOG;
my $log = XMLin($data, ForceArray => 1);
my $datestr = $log->{patch}[0]->{local_date};
if (! defined $datestr) {
warn "failed to get ctime for $filer";
return 0;
}
my $date = str2time($datestr);
debug("ctime for '$file': ". localtime($date));
return $date;
}
1

2
IkiWiki/Plugin/recentchanges.pm
View File

@ -123,7 +123,7 @@ sub store ($$$) {
}
elsif (length $config{cgiurl}) {
$change->{authorurl} = IkiWiki::cgiurl(
do => "recentchanges_link",
do => "goto",
page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
);
}

4
IkiWiki/Setup/Automator.pm
View File

@ -58,6 +58,9 @@ sub import (@) {
elsif ($config{rcs} eq 'monotone') {
$config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
}
elsif ($config{rcs} eq 'darcs') {
$config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
}
elsif ($config{rcs} eq 'bzr') {
# TODO
}
@ -117,6 +120,7 @@ sub import (@) {
for (;;) {
print "Choose a password: ";
chomp($password=<STDIN>);
print "\n";
print "Confirm password: ";
chomp($password2=<STDIN>);

39
debian/changelog vendored
View File

@ -1,4 +1,31 @@
ikiwiki (3.09) UNRELEASED; urgency=low
ikiwiki (3.11) unstable; urgency=low
* Add new hooks: canremove, canrename, rename. (intrigeri)
* rename: Refactor subpage rename handling code into rename hook. (intrigeri)
* po: New plugin, suporting translation of wiki pages using po files.
(intrigeri)
-- Joey Hess <joeyh@debian.org> Mon, 20 Apr 2009 19:40:25 -0400
ikiwiki (3.10) unstable; urgency=low
* darcs: Finally added support for this VCS, thanks to many
contributors:
- Thomas Schwinge wrote the original file, implementing only rcs_commit.
- Benjamin A'Lee contributed an alternative implementation.
- Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
- Simon Michael contributed multiple changes.
- Petr Ročkai fixed rcs_recentchanges.
- Sven M. Hallberg merged the above and added missing features.
* Add missing newline to Confirm Password prompt.
* Add missing permalink support to archivepage and titlepage templates.
* debian/control: Wrap fields.
* inline: Add author info to archive display.
* Add a microblog template that is useful for inlining microblogging posts.
-- Joey Hess <joeyh@debian.org> Sat, 18 Apr 2009 19:40:25 -0400
ikiwiki (3.09) unstable; urgency=low
* inline: Add title_natural sort order, using Sort::Naturally
(chrysn)
@ -10,12 +37,12 @@ ikiwiki (3.09) UNRELEASED; urgency=low
* comments: Fix too loose test for comments pages that matched
normal pages with "comment_" in their name. Closes: #521322
* comments: Fix anchor ids to be legal xhtml. Closes: #521339
* Add new hooks: canremove, canrename, rename. (intrigeri)
* rename: Refactor subpage rename handling code into rename hook. (intrigeri)
* po: New plugin, suporting translation of wiki pages using po files.
(intrigeri)
* Fix documentation of anonok_pagespec. Closes: #521793
* Add missing suggests on libtext-textile-perl. Closes: #522039
* recentchanges: change to using do=goto links for user links.
* Fix git test suite to use a bare repo.
-- Joey Hess <joeyh@debian.org> Thu, 19 Mar 2009 15:32:49 -0400
-- Joey Hess <joeyh@debian.org> Sat, 04 Apr 2009 14:33:49 -0400
ikiwiki (3.08) unstable; urgency=low

29
debian/control vendored
View File

@ -2,7 +2,11 @@ Source: ikiwiki
Section: web
Priority: optional
Build-Depends: perl, debhelper (>= 7.0.50)
Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
libtext-markdown-perl | markdown,
libtimedate-perl, libhtml-template-perl,
libhtml-scrubber-perl, wdg-html-validator,
libhtml-parser-perl, liburi-perl, perlmagick
Maintainer: Joey Hess <joeyh@debian.org>
Uploaders: Josh Triplett <josh@freedesktop.org>
Standards-Version: 3.8.0
@ -12,9 +16,26 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
Package: ikiwiki
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl
Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, po4a (>= 0.35-1), gettext
Depends: ${misc:Depends}, ${perl:Depends},
libtext-markdown-perl | markdown,
libhtml-scrubber-perl, libhtml-template-perl,
libhtml-parser-perl, liburi-perl
Recommends: gcc | c-compiler,
libc6-dev | libc-dev,
subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38),
libxml-simple-perl, libnet-openid-consumer-perl,
liblwpx-paranoidagent-perl, libtimedate-perl,
libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl
Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl,
python, python-docutils, polygen, tidy, libhtml-tree-perl,
libxml-feed-perl, libmailtools-perl, perlmagick,
libfile-mimeinfo-perl, libcrypt-ssleay-perl,
liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
sparkline-php, texlive, dvipng, libtext-wikicreole-perl,
libsort-naturally-perl, libtext-textile-perl, po4a (>= 0.35-1), gettext
Conflicts: ikiwiki-plugin-table
Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table

10
debian/copyright vendored
View File

@ -32,6 +32,16 @@ Files: tla.pm
Copyright: © 2006 Clint Adams <schizo@debian.org>
License: GPL-2+
Files: darcs.pm
Copyright:
© 2006 Thomas Schwinge <tschwinge@gnu.org>
2007 Benjamin A'Lee <bma@bmalee.eu>
Tuomo Valkonen <tuomov@iki.fi>
2008 Simon Michael <simon@joyful.com>
Petr Ročkai <me@mornfall.net>
Sven M. Hallberg <pesco@khjk.org>
License: GPL-2+
Files: teximg.pm
Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
License: GPL-2+

59
doc/bugs/CGI__44___formbuilder__44___non-existent_field_address.mdwn 100644
View File

@ -0,0 +1,59 @@
Error received when clicking on the "edit" link:
> `Error: [CGI::FormBuilder::AUTOLOAD] Fatal: Attempt to address
> non-existent field 'text' by name at
> /home/tealart/bin/share/perl/5.8.4/IkiWiki/CGI.pm line 112`
Error received when following a "Create New Page" (eg. ?) link:
> `Error: [CGI::FormBuilder::AUTOLOAD] Fatal: Attempt to address
> non-existent field 'param' by name at
> /home/tealart/bin/share/perl/5.8.4/IkiWiki/Plugin/editpage.pm line 122`
I could probably find several other flavors of this error if I went
looking, but I trust you get the idea.
The CGI starts to render (this isn't the "you forgot to set the
permissions/turn on the CGI" error) and then fails.
Further details:
- Running on shared hosting (dreamhost; but everything compiles,
dependencies installed, the site generates perfectly, other CGIs
work, the file permissions work).
- It's running perl 5.8.4, but I did upgrade gettext to 0.17
- the server is running gcc v3.3.5 (at this point, this is the main
difference between the working system and my box.)
- I've removed the locale declarations from both the config file and
the environment variable.
- I've also modified the page template and have my templates in a non
standard location. The wiki compiles fine, with the template, but
might this be an issue? The CGI script doesn't (seem) to load under
the new template, but I'm not sure how to address this issue.
- All of the required/suggested module dependencies are installed
(finally) to the latest version including (relevantly)
CGI::FormBuilder 3.0501.
- I'm running ikiwiki v3.08. Did I mention that it works perfectly in
nearly every other way that I've managed to test thusfar?
----
> I suspect that your perl is too old and is incompatible with the version of CGI::FormBuilder you have installed.
>
> Is so, it seems likely that the same error message can be reproduced by running a simple command like this at the command line:
>
> perl -e 'use warnings; use strict; use CGI::FormBuilder; my $form=CGI::FormBuilder->new; $form->text("boo")'
>
> --[[Joey]]
> > nope, that command produces no output. :/
> >
> > I considered downgrading CGI::FormBuilder but I saw evidence of previous versions being incompatible with ikiwiki so I decided against that.
> >
> > -- [[tychoish]]

5
doc/bugs/Dupe_entry_in_Bundle::IkiWiki::Extras.pm.mdwn 100644
View File

@ -0,0 +1,5 @@
Authen::Passphrase
is entered twice in the .pm file.
[[done]]

100
doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn 100644
View File

@ -0,0 +1,100 @@
It seems that the [[ikiwiki/directive/inline]] directive doesn't generate wikilinks to the pages it includes. For example I would expect the following to inline all bugs inside this bug report:
\[[!inline pages="bugs/* and !*/discussion and backlink(bugs)" feeds=no postform=no archive=yes show="10"]]
But here it is:
[[!inline pages="bugs/* and !*/discussion and backlink(bugs)" feeds=no postform=no archive=yes show="10"]]
and note that it only included the 'normal' wikilinks (and also note that this page is not marked done even though the done page is inlined).
One might also wonder if inline would make this page link to any internal links on those inlined pages too, but I think
that would be overkill.
I'm not even really sure if this is a bug or defined behaviour, but I thought it might work and it didn't. Regardless,
the correct behaviour, whichever is decided, should be documented. -- [[Will]]
It appears that [[ikiwiki/directive/map]] also doesn't wikilink to the pages it links. Perhaps in each of these
cases there should be another parameter to the directive that allows linking to switched on. Just switching
it on universally at this point might break a number of people's pagespecs. -- [[Will]]
> There's a simple reason why these directives don't generate a record of a
> wikilink between them and the pages they include: Semantically, inlining
> a page is not the same as writing a link to it. Nor is generating a map that
> lists a page the same as linking to it. I don't think this is a bug.
> --[[Joey]]
>> Fair enough. I guess we can mark this as [[done]] then.
>>
>> Just a bit of background on where I was going here... I was looking for
>> a simpler way of attacking [[todo/tracking_bugs_with_dependencies]].
>> In particular, rather than introducing changes to the pagespec definition,
>> I wondered if you could use wiki pages as the defined pagespec and
>> introduce a 'match_mutual' function which matches whenever two pages
>> link to the same third page, then you don't need to alter the pagespec
>> handling code.
>>
>> But that requires being able use use a pagespec to decide what pages
>> are linked to. e.g. I want to make an 'openbugs' page that links to all
>> open bugs. Then I could make a 'readybugs' page that links to
>> `backlink(openbugs) and !mutualLink(openbugs)`. That is, all bugs
>> that are open and do not themselves link to an open bug.
>>
>> The problem with all this is that it introduces an ordering dependency,
>> as I noted below. I think the original proposal is better, because it
>> handles that ordering dependency in the definition of the pagespecs.
>> --[[Will]]
Here is a patch to make map link to its linked pages (when passed `link="yes"`). It is a bit problematic in that it uses a pagespec
to decide what to link to (which is why I wanted it). However, at the time the pagespec is used the links
for each page haven't finished being calculated (we're using the pagespec to figure out those links,
remember). This means that some pagespec match functions may not work correctly. Sigh.
It would be nice to find a topological ordering of the pages and scan them in that order
so that everything we need is found before we need it, but this patch doesn't do that (it would be
complex).
If you just use simple pagespecs you'll be fine. Unfortunately I really wanted this for more complex
pagespecs. -- [[Will]]
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 3284931..57c0a7a 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -13,7 +13,7 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "map", call => \&getsetup);
- hook(type => "preprocess", id => "map", call => \&preprocess);
+ hook(type => "preprocess", id => "map", call => \&preprocess, scan => 1);
}
sub getsetup () {
@@ -27,7 +27,9 @@ sub getsetup () {
sub preprocess (@) {
my %params=@_;
$params{pages}="*" unless defined $params{pages};
-
+
+ return if (!defined wantarray && !IkiWiki::yesno($params{link}));
+
my $common_prefix;
# Get all the items to map.
@@ -42,6 +44,9 @@ sub preprocess (@) {
else {
$mapitems{$page}='';
}
+ if (!defined wantarray && IkiWiki::yesno($params{link})) {
+ push @{$links{$params{page}}}, $page;
+ }
# Check for a common prefix.
if (! defined $common_prefix) {
$common_prefix=$page;
@@ -62,6 +67,8 @@ sub preprocess (@) {
}
}
+ return if ! defined wantarray;
+
# Common prefix should not be a page in the map.
while (defined $common_prefix && length $common_prefix &&
exists $mapitems{$common_prefix}) {

12
doc/bugs/user_links_on_recentchanges_pages_problem.mdwn 100644
View File

@ -0,0 +1,12 @@
When I click on a linked username for commits on the recentchanges page (on
the live ikiwiki.info) I get a link such as
<http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=recentchanges_link>
which returns something like
<a href="http://ikiwiki.info">ikiwiki</a>/ Error
<p class="error">Error: unknown do parameter
-- [[Jon]]
> That was fixed in 3.04 but ikiwiki.info had not been upgraded to it yet.
> [[done]] --[[Joey]]

2
doc/forum/Darcs_as_the_RCS___63__.mdwn
View File

@ -9,3 +9,5 @@ What should I put in the configuration file to use darcs ?
> Darcs is not yet supported. It's being [[worked_on|todo/darcs]].
> > That's good news for me then ! Thank you.
>>> Better news: It will be in version 2.10. --[[Joey]]

89
doc/forum/How_does_ikiwiki_remember_times__63__.mdwn 100644
View File

@ -0,0 +1,89 @@
This is similar to the last post in this forum. I want to know exactly how ikiwiki remembers the times associated with pages, especially when using it for blogging, so I know whether I can trust it or not. From that last thread, I think what ikiwiki does is this:
* The created time of a file is when that file was first committed into the versioning repository (in my case git)
> If `--getctime` it used, yes. In normal operation, when new files
> are added, ikiwiki sets the creation time to the ctime of the file
> on disk, rather than bothering to ask the VCS. --[[Joey]]
* The modified time of a file is what that file was last updated in the repository
> Almost right, the modified time is actually taken from the
> modification time of the file in disk. --[[Joey]]
And with a blog, by default, the posts are ordered by creation time, although an option can order them by modified time.
Okay. So this should mean that the times are safe if, for example, I delete my working copy and then clone another one from the bare git repository, or otherwise mess up the creation times and mtimes stored as file metadata on the filesystem.
Do I have it right?
> Some VCS, like git, set the file mtimes to the current time
> when making a new checkout, so they will be lost if you do that.
> The creation times can be retrived using the `--getctime` option.
> I suppose it might be nice if there were a `--getmtime` that pulled
> true modification times out of the VCS, but I haven't found it a big
> deal in practice for the last modification times to be updated to the
> current time when rebuilding a wiki like this. --[[Joey]]
>
> > Thanks for the clarification. I ran some tests of my own to make sure I understand it right, and I'm satisfied
> > that the order of posts in my blog can be retrieved from the VCS using the `--getctime` option, at least if I
> > choose to order my posts by creation time rather than modification time. But I now know that I can't rely on
> > page modification times in ikiwiki as these can be lost permanently.
> >
> > I would suggest that there should at least be a `--getmtime` option like you describe, and perhaps that
> > `--getctime` and `--getmtime` be _on by default_. In my opinion the creation times and modification times of
> > pages in ikiwiki are part of the user's content and are important to protect, because the user may be relying
> > on them, especially if they use blogging or lists of recently modified pages, etc. Right now the modification
> > times can be lost permanently.
> >
> > Is there a typo in the description of `--getctime` in the man page?
> >
> > > --getctime
> > > Pull **last changed time** for each new page out of the revision
> > > control system. This rarely used option provides a way to get
> > > the real creation times of items in weblogs, such as when build‐
> > > ing a wiki from a new Subversion checkout. It is unoptimised and
> > > quite slow. It is best used with --rebuild, to force ikiwiki to
> > > get the ctime for all pages.
> >
> > Surely it is not the _last changed time_ but the _first seen time_ of each page that is pulled out of the VCS?
> > If the aim is to get the real creation times of items in weblogs, then the last times that the items were
> > changed in the VCS is not going to help. -- [[seanh]]
>>> Typo, fixed. --[[Joey]]
> > > If you want to preserve the date of a page, the best way to do it is to
> > > use [[ikiwiki/directive/meta]] date="foo". This will survive checkouts,
> > > VCS migrations, etc. -- [[Jon]]
> > >
> > > > That's a good tip Jon. That would also survive renaming a page by renaming its mdwn file, which would
> > > > normally lose the times also. (And in that case I think both times are irretrievable, even by
> > > > `--getctime`). I might start using a simple script to make blog posts that creates a file for
> > > > me, puts today's date in the file as a meta, and opens the file in my editor. -- [[seanh]]
>>>>> I use a script that does that and also sets up templates and tags
>>>>> for a new item:
#!/bin/sh
set -u
set -e
if [ $# -ne 1 ]; then
echo usage: $0 pagename >&2
exit 1
fi
pagename="$1"
if [ -e "$pagename" ]; then
echo error: "$pagename" exists >&2
exit 1
fi
date=$(date)
echo '\[[!template id=draft]]' >> "$pagename"
echo "\[[!meta date=\"$date\"]]" >> "$pagename"
echo "\[[!tag draft]]" >> "$pagename"
git add "$pagename"
$EDITOR "$pagename"
>>>>> -- [[Jon]]

20
doc/forum/How_to_fix___34__does_not_map_to_Unicode__34___errors__63__.mdwn 100644
View File

@ -0,0 +1,20 @@
I'm getting a number of errors like this when running ikiwiki:
utf8 "\xA2" does not map to Unicode at /usr/local/share/perl/5.10.0/IkiWiki.pm line 739, <$in> chunk 1.
I think it's because some of my files contain non-utf8, non-unicode, or somehow bad characters in them, probably fancy quotes and the like that have been copy-and-pasted from my web browser. The problem is that I have hundreds of files, I transferred them all over from pyblosxom to ikiwiki at once, and the error message doesn't tell me which file the error comes from. How can I fix this?
Thanks
-- seanh
> Unfortunatly, these messages are logged by perl so there's no way to add
> a filename to them.
>
> If you run the build in --verbose mode, you should see which page ikiwiki
> is working on, and unless it inlines some other page, you can be pretty
> sure that page contains invalid utf-8 if the message is then printed.
>
> Another option is to use the `isutf8` program from
> moreutils](http://kitenet.net/~joey/code/moreutils/),
> and run it on each file, it will tell you the line number
> and character position that is invalid. --[[Joey]]

3
doc/forum/managing_todo_lists.mdwn
View File

@ -39,3 +39,6 @@ sure how to handle embeds or challenges from the CGI such as a login challenge
>> thanks - I'll give it a look. I spent a few hours writing some javascript to manipulate a ul/li DOM tree in an outliner-fashion the other day. I might be able to join the puzzle pieces together sometime. [[Jon]]
a solution for this could be similar to a solution for [[todo/structured page data]], as todo lists are definitely a form of structured data. (in both cases, the page's current content is rendered into a html form, whose result is then saved as the page's new contents) --[[chrysn]]
> Thanks for the link: yup, there's definitely some common ground there.
> -- [[Jon]]

1
doc/git.mdwn
View File

@ -50,7 +50,6 @@ Some of the branches included in the main repository include:
instead of xhtml.
* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
changes.
* `darcs` is being used to add darcs support.
* `debian-stable` is used for updates to the old version included in
Debian's stable release, and `debian-testing` is used for updates to
Debian's testing release.

5
doc/ikiwiki-makerepo.mdwn
View File

@ -4,7 +4,7 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
# SYNOPSIS
ikiwiki-makerepo svn|git|monotone srcdir repository
ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
ikiwiki-makerepo bzr|mercurial srcdir
@ -18,6 +18,9 @@ Note that for mercurial and bzr, the srcdir is converted into a
repository. There is no need to have a separate repository with mercurial
or bzr.
For darcs, the master repo's apply hook will be preconfigured to call a
ikiwiki wrapper.
Note that for monotone, you are assumed to already have run "mtn genkey"
to generate a key.

3
doc/ikiwiki/directive/inline.mdwn
View File

@ -79,7 +79,8 @@ Here are some less often needed parameters:
page. By default the `inlinepage` template is used, while
the `archivepage` template is used for archives. Set this parameter to
use some other, custom template, such as the `titlepage` template that
only shows post titles. Note that you should still set `archive=yes` if
only shows post titles or the `microblog` template, optimised for
microblogging. Note that you should still set `archive=yes` if
your custom template does not include the page content.
* `raw` - Rather than the default behavior of creating a blog,
if raw is set to "yes", the page will be included raw, without additional

2
doc/ikiwikiusers.mdwn
View File

@ -41,7 +41,7 @@ Projects & Organizations
* The [Fortran Wiki](http://fortranwiki.org/)
* [Monotone](http://monotone.ca/wiki/FrontPage/)
* The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
* [St Hugh of Lincoln Primary School in Surrey](http://hugh.vm.bytemark.co.uk/)
* [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
* [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
* [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
* [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)

50
doc/index/openid/discussion.mdwn
View File

@ -10,3 +10,53 @@ Hi, there's no return_to from a designated OpenID server page, specs requires (I
> * How can one reproduce the bug?
>
> PS, please file bugs under [[bugs]] in future. --[[Joey]]
>> Oops, my bad, didn't know that existed at the time I wrote this.
>>
>> What happened is that the process wouldn't complete, therefore I couldn't login with my OpenID.
>>
>> reproducibility: every time
>>
>> Should probably move this page, eh? ;)
>> I'd do that, but I dunno know other than using the SCM backend in question....
Here's some actual output (with my OpenID URL stripped out):
do=postsignin&oic.time=1238224497-1450566d93097caa707f&openid.assoc_handle=%7BHMAC-SHA1%7D%7B49cdce76%7D%7BBhuXXw%3D%3D%7D&openid.identity=|<==== MY OPENID URL GOES HERE ====>|&openid.mode=id_res&openid.op_endpoint=http%3A%2F%2Fwww.myopenid.com%2Fserver&openid.response_nonce=2009-03-28T07%3A15%3A02ZDUFmG3&openid.return_to=http%3A%2F%2Fsimonraven.kisikew.org%2Fbin%2Fikiwiki.cgi%3Fdo%3Dpostsignin%26oic.time%3D1238224497-1450566d93097caa707f&openid.sig=E51Xh6Gnjku%2B0se57qCyhHbT5QY%3D&openid.signed=assoc_handle%2Cidentity%2Cmode%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned
The `return_to` arg should NOT be `signed`, it should be the originating URL where you initially logged in.
>> Yes, exactly. That's also my understanding of the spec.
> I think you're confusing 'openid.return_to' with 'return_to'. The
> former is present above, and is, indeed, the originating url, the latter
> is part of the *value* of the 'openid.signed' parameter generated by myopenid.com. --[[Joey]]
Also, I dunno what the assoc_handle is doing spitting out an arg like `{HMAC-SHA1}{49cdce76}{BhuXXw%3D%3D}` it should be processed further. I have the needed perl packages installed (latest for Lenny). Hrm, would endianness matter?
> Again, this value is created by the openid server, not by ikiwiki.
> I see the same HMAC-SHA1 when using myopenid, and completly different
> things for other openid servers. (Ie, when using livejournal as an openid server,
> `openid.assoc_handle=1239305290:STLS.QiU6zTZ6w2bM3ttRkdaa:e68f91b751`)
>> OK, I wasn't too sure about that, seemed bogus or somehow wrong or in error, like it wasn't actually being `completed`.
> I'm fairly sure that is all a red herring.
>
> So, when I was talking about reproducing the bug, I was thinking perhaps you could tell me what openid server you're using,
> etc, so I can actually see the bug with my own eyes.
>> myopenid.com, with the CNAME option turned on.
> The sanitised url parameters you've provided are not generated by ikiwiki at all.
> They don't even seem to be generated by the underlying [[!cpan Net::OpenID]] library.
>> That was a server log entry with date/host/time stripped, and my URL also stripped. Everything else is as was in the log. I installed the Debian packages in Lenny, both server and consumer OpenID Perl packages.
> I'm pretty sure that what you're showing me is the url myopenid redirects
> the browser to after successfully signing in. At that point, ikiwiki
> should complete the signin. What fails at this point? How can I reproduce this failure? --[[Joey]]
I'll try it again myself. I had tried it oh probably 6 times before I finally gave up on it. Maybe I'm getting rusty and I'm just PEBKACing all over the place. :P
Also, to address the point about this discussion being in the wrong area (not under bugs), should I move it, or will you? I don't mind doing it, if you can't.

6
doc/news/version_3.08.mdwn
View File

@ -1,6 +0,0 @@
ikiwiki 3.08 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* git: Fix utf-8 encoding of author names.
* git: Manually decode git output from utf-8, avoids
warning messages on invalidly encoded output.
* Fix bug that caused weird things to appear as page types."""]]

15
doc/news/version_3.10.mdwn 100644
View File

@ -0,0 +1,15 @@
ikiwiki 3.10 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* darcs: Finally added support for this VCS, thanks to many
contributors:
- Thomas Schwinge wrote the original file, implementing only rcs\_commit.
- Benjamin A'Lee contributed an alternative implementation.
- Tuomo Valkonen contributed rcs\_getctime and stub rcs\_recentchanges.
- Simon Michael contributed multiple changes.
- Petr Ročkai fixed rcs\_recentchanges.
- Sven M. Hallberg merged the above and added missing features.
* Add missing newline to Confirm Password prompt.
* Add missing permalink support to archivepage and titlepage templates.
* debian/control: Wrap fields.
* inline: Add author info to archive display.
* Add a microblog template that is useful for inlining microblogging posts."""]]

4
doc/plugins/anonok.mdwn
View File

@ -5,10 +5,10 @@ By default, anonymous users cannot edit the wiki. This plugin allows
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_pages`. This
The plugin also has a configuration setting, `anonok_pagespec`. This
[[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:
anonok_pages => "postcomment(*)"
anonok_pagespec => "postcomment(*)"

2
doc/plugins/comments/discussion.mdwn
View File

@ -60,7 +60,7 @@ spam problems. So, use `check_canedit` as at least a first-level check?
> have postcomment(blog/*) or something. (Perhaps instead of taking a glob, postcomment
> should take a pagespec, so you can have postcomment(link(tags/commentable))?)
>
> This is why `anonok_pages => 'postcomment(*)'` and `locked_pages => '!postcomment(*)'`
> This is why `anonok_pagespec => 'postcomment(*)'` and `locked_pages => '!postcomment(*)'`
> are necessary to allow anonymous and logged-in editing (respectively).
>
>> I changed that to move the flag out of the page name, and into a variable that the `match_postcomment`

51
doc/plugins/contrib/po.mdwn
View File

@ -330,12 +330,57 @@ daring a timid "please pull"... or rather, please review again :)
--[[intrigeri]]
> Ok, I've reviewed and merged into my own po branch. It's looking very
> mergeable. I would still like to go over the `po.pm` code in detail and
> review it, but it's very complex, and I'm happy with all the changes
> outside `po.pm`.
> mergeable.
>
> * Is it worth trying to fix compatability with `indexpages`?
>>
>> Supporting `usedirs` being enabled or disabled was already quite
>> hard IIRC, so supporting all four combinations of `usedirs` and
>> `indexpages` settings will probably be painful. I propose we forget
>> about it until someone reports he/she badly needs it, and then
>> we'll see what can be done.
>>
> * Would it make sense to go ahead and modify `page.tmpl` to use
> OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it?
>>
>> Done in my branch.
>>
> * Would it be better to disable po support for pages that use unsupported
> or poorly-supported markup languages?
>
>> I prefer keeping it enabled, as:
>>
>> * most wiki markups "almost work"
>> * when someone needs one of these to be fully supported, it's not
>> that hard to add dedicated support for it to po4a; if it were
>> disabled, I fear the ones who could do this would maybe think
>> it's blandly impossible and give up.
>>
> * What's the reasoning behind checking that the link plugin
> is enabled? AFAICS, the same code in the scan hook should
> also work when other link plugins like camelcase are used.
> * In `pagetemplate` there is a comment that claims the code
> relies on `genpage`, but I don't see how it does; it seems
> to always add a discussion link?
> * Is there any real reason not to allow removing a translation?
> I'm imagining a spammy translation, which an admin might not
> be able to fix, but could remove.
> * Re the meta title escaping issue worked around by `change`.
> I suppose this does not only affect meta, but other things
> at scan time too. Also, handling it only on rebuild feels
> suspicious -- a refresh could involve changes to multiple
> pages and trigger the same problem, I think. Also, exposing
> this rebuild to the user seems really ugly, not confidence inducing.
>
> So I wonder if there's a better way. Such as making po, at scan time,
> re-run the scan hooks, passing them modified content (either converted
> from po to mdwn or with the escaped stuff cheaply de-escaped). (Of
> course the scan hook would need to avoid calling itself!)
>
> (This doesn't need to block the merge, but I hope it can be addressed
> eventually..)
>
> --[[Joey]]
>>
>> --[[intrigeri]]

20
doc/plugins/contrib/unixauth.mdwn
View File

@ -14,25 +14,9 @@ Config variables that affect the behavior of `unixauth`:
__Security__: [As with passwordauth](/security/#index14h2), be wary of sending usernames and passwords in cleartext. Unlike passwordauth, sniffing `unixauth` credentials can get an attacker much further than mere wiki access. Therefore, this plugin defaults to not even _displaying_ the login form fields unless we're running under SSL. Nobody should be able to do anything remotely dumb until the admin has done at least a little thinking. After that, dumb things are always possible. ;-)
`unixauth` tests for the presence of the `HTTPS` environment variable. `Wrapper.pm` needs to be tweaked to pass it through; without that, the plugin fails closed.
`unixauth` needs the `HTTPS` environment variable, available in ikiwiki 2.67 or later (fixed in #[502047](http://bugs.debian.org/502047)), without which it fails closed.
[[!toggle id="diff" text="Wrapper.pm.diff"]]
[[!toggleable id="diff" text="""
--- Wrapper.pm.orig 2008-07-29 00:09:10.000000000 -0400
+++ Wrapper.pm
@@ -28,7 +28,7 @@ sub gen_wrapper () {
my @envsave;
push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
- HTTP_COOKIE REMOTE_USER} if $config{cgi};
+ HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF"
"""]]
The plugin has not been tested with newer versions of ikiwiki. [[schmonz]] hopes to have time to polish this plugin soon.
[[!toggle id="code" text="unixauth.pm"]]

15
doc/rcs/darcs.mdwn 100644
View File

@ -0,0 +1,15 @@
[Darcs](http://darcs.new) is a distributed revison control
system. Ikiwiki supports storing a wiki in a
Darcs repository.
An Ikiwiki wrapper is run by the `posthook` to update a wiki whenever commits
or remote pushes come in. When running as a [[cgi]] with Darcs, ikiwiki
automatically commits edited pages, and uses the Darcs history to generate the
[[RecentChanges]] page.
Example for a `_darcs/prefs/defaults` file in `$SRCDIR`:
apply posthook /path/to/repository/_darcs/ikiwiki-wrapper
apply run-posthook
See also [[todo/darcs|todo/darcs]]

100
doc/rcs/details.mdwn
View File

@ -32,98 +32,20 @@ You browse and web-edit the wiki on W.
W "belongs" to ikiwiki and should not be edited directly.
## [darcs](http://darcs.net/) (not yet included)
## [[darcs]]
Support for using darcs as a backend is being worked on by [Thomas
Schwinge](mailto:tschwinge@gnu.org), although development is on hold curretly.
There is a patch in [[todo/darcs]].
Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
### How will it work internally?
* HTML is generated from `srcdir`.
* CGI edits happen in `srcdir`.
* The backend pulls updates from `master` into `srcdir`, i.e. darcs commits should happen to `master`.
* `master` calls ikiwiki (through a wrapper) in its apply posthook, i.e. `master/_darcs/prefs/defaults` should look like this:
``Master'' repository R1.
RCS commits from the outside are installed into R1.
HTML is generated from R1. HTML is automatically generated (by using a
``post-hook'') each time a new change is installed into R1. It follows
that rcs_update() is not needed.
There is a working copy of R1: R2.
CGI operates on R2. rcs_commit() will push from R2 to R1.
You browse the wiki on R1 and web-edit it on R2. This means for example
that R2 needs to be updated from R1 if you are going to web-edit a page,
as the user otherwise might be irritated otherwise...
How do changes get from R1 to R2? Currently only internally in
rcs\_commit(). Is rcs\_prepedit() suitable?
It follows that the HTML rendering and the CGI handling can be completely
separated parts in ikiwiki.
What repository should [[RecentChanges]] and History work on? R1?
#### Rationale for doing it differently than in the Subversion case
darcs is a distributed RCS, which means that every checkout of a
repository is equal to the repository it was checked-out from. There is
no forced hierarchy.
R1 is nevertheless called the master repository. It's used for
collecting all the changes and publishing them: on the one hand via the
rendered HTML and on the other via the standard darcs RCS interface.
R2, the repository the CGI operates on, is just a checkout of R1 and
doesn't really differ from the other checkouts that people will branch
off from R1.
(To be continued.)
#### Another possible approach
Here's what I (tuomov) think, would be a “cleaner” approach:
1. Upon starting to edit, Ikiwiki gets a copy of the page, and `darcs changes --context`.
This context _and_ the present version of the page are stored in as the “version” of the
page in a hidden control of the HTML.
Thus the HTML includes all that is needed to generate a patch wrt. to the state of the
repository at the time the edit was started. This is of course all that darcs needs.
2. Once the user is done with editing, _Ikiwiki generates a patch bundle_ for darcs.
This should be easy with existing `Text::Diff` or somesuch modules, as the Web edits
only concern single files. The reason why the old version of the page is stored in
the HTML (possibly compressed) is that the diff can be generated.
3. Now this patch bundle is applied with `darcs apply`, or sent by email for moderation…
there are many possibilities.
This approach avoids some of the problems of concurrent edits that the previous one may have,
although there may be conflicts, which may or may not propagate to the displayed web page.
(Unfortunately there is not an option to `darcs apply` to generate some sort of ‘confliction resolution
bundle’.) Also, only one repository is needed, as it is never directly modified
by Ikiwiki.
This approach might be applicable to other distributed VCSs as well, although they're not as oriented
towards transmitting changes with standalone patch bundles (often by email) as darcs is.
> The mercurial plugin seems to just use one repo and edit it directly - is
> there some reason that's okay there but not for darcs? I agree with tuomov
> that having just the one repo would be preferable; the point of a dvcs is
> that there's no difference between one repo and another. I've got a
> darcs.pm based on mercurial.pm, that's almost usable... --bma
>> IMHO it comes down to whatever works well for a given RCS. Seems like
>> the darcs approach _could_ be done with most any distributed system, but
>> it might be overkill for some (or all?) While there is the incomplete darcs
>> plugin in [[todo/darcs]], if you submit one that's complete, I will
>> probably accept it into ikiwiki.. --[[Joey]]
>>> I'd like to help make a robust darcs (2) backend. I also think ikiwiki should use
>>> exactly one darcs repo. I think we can simplify and say conflicting web
>>> edits are not allowed, like most current wiki engines. I don't see that
>>> saving (so much) context in the html is necessary, then.
>>> bma, I would like to see your code. --[[Simon_Michael]]
>>> PS ah, there it is. Let's continue on the [[todo/darcs]] page.
apply posthook ikiwrap
apply run-posthook
* The backend pushes CGI edits from `srcdir` back into `master` (triggering the apply hook).
* The working copies in `srcdir` and `master` should *not* be touched by the user, only by the CGI or darcs, respectively.
## [[Git]]
@ -319,6 +241,8 @@ please refer to [Emanuele](http://nerd.ocracy.org/em/)
## [[tla]]
Nobody really understands how tla works. ;-)
## rcs
There is a patch that needs a bit of work linked to from [[todo/rcs]].

6
doc/rcs/mercurial.mdwn
View File

@ -10,9 +10,9 @@ commits edited pages, and uses the Mercurial history to generate the
Example for a `.hg/hgrc` file in `$SRCDIR`:
[hooks]
post-commit = /home/abe/bin/rebuildwiki
incoming = /home/abe/bin/rebuildwiki
post-commit = ikiwiki --setup /path/to/ikiwiki.setup --post-commit
incoming = ikiwiki --setup /path/to/ikiwiki.setup --post-commit
Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR`
Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR`. Also note that `--post-commit` and not `--refresh` must be used to avoid dead locking when editing the pages via CGI interface.
See also [[todo/mercurial|todo/mercurial]]

4
doc/sandbox.mdwn
View File

@ -1,7 +1,6 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
----
misc test
test more test
[[中文显示]]
@ -97,3 +96,6 @@ Let's see what happens... ~~
testing
--
[[!toc levels=2]]

25
doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki 100644
View File

@ -0,0 +1,25 @@
!!!Heading Three
Itemized
* list
* of
* things
or not
1. mom
1. hi
1. there
!!!Heading Three
Itemized
* list
* of
* things
or not
1. mom
1. hi
1. there

6
doc/style.css
View File

@ -373,11 +373,13 @@ span.color {
padding: 2px;
}
.comment-header {
.comment-header,
.microblog-header {
font-style: italic;
margin-top: .3em;
}
.comment .author {
.comment .author,
.microblog .author {
font-weight: bold;
}
.comment-subject {

10
doc/tips/Importing_posts_from_Wordpress.mdwn
View File

@ -2,4 +2,12 @@ Use case: You want to move away from Wordpress to Ikiwiki as your blogging/websi
[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--getctime</tt> to get the preserve creation times on checkout.
WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
-----
I include a modified version of this script. This version includes the ability to write \[[!tag foo]] directives, which the original intended, but didn't actually do.
-- [[users/simonraven]]
[[ikiwiki-wordpress-import]]

40
doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
View File

@ -2,3 +2,43 @@ When I attempt to use this script, I get the following error:
warning: Not updating refs/heads/master (new tip 26b1787fca04f2f9772b6854843fe99fe06e6088 does not contain fc0ad65d14d88fd27a6cee74c7cef3176f6900ec). I have git 1.5.6.5, any ideas?
Thanks!!
-----
### KeyError: 146
I also get this error, here's the output (it seems to stem from an error in the python script):
<pre>
Traceback (most recent call last):
File "../ikiwiki-wordpress-import.py", line 74, in <module>
main(*sys.argv[1:])
File "../ikiwiki-wordpress-import.py", line 54, in main
data = content.encode('ascii', 'html_replace')
File "../ikiwiki-wordpress-import.py", line 30, in <lambda>
% htmlentitydefs.codepoint2name[ord(c)] for c in x.object[x.start:x.end]]), x.end))
KeyError: 146
warning: Not updating refs/heads/master (new tip 6dca6ac939e12966bd64ce8a822ef14fe60622b2 does not contain 60b798dbf92ec5ae92f18acac3075c4304aca120)
git-fast-import statistics:
</pre>
etc.
> Well, if this really is a script error, it's not really the script, but the wordpress XML dump, referring to a
> possible malformed or invalid unicode character in the dump file. This is what I can gather from other scripts.
> I'll be checking my dump file shortly.
>> This is only part of the problem... I'm not exactly sure what's going on, and it's get late/early for me....
>>> I used --force for fast-import, but then everything seems deleted, so you end up doing a reset, checkout, add, *then* commit.
>>> Seems really odd. I edited the script however, maybe this is why... this is my changes:
-print "data %d" % len(data)
+print "data %d merge refs/heads/%s" % (len(data), branch)
>>> That control character is a ^q^0 in emacs, see git fast-import --help for more info.
>>> I'll be trying an import *without* that change, to see what happens.
>>>> I still have to do the above to preserve the changes done by this script... (removed previous note).

21
doc/tips/add_chatterbox_to_blog.mdwn 100644
View File

@ -0,0 +1,21 @@
If you use twitter or identi.ca, here's how to make a box
on the side of your blog that holds your recent status updates
from there, like I have on [my blog](http://kitenet.net/~joey/blog/)
--[[Joey]]
* Enable the [[plugins/aggregate]] plugin, and set up a cron
job for it.
* At the top of your blog's page, add something like the following.
You'll want to change the urls of course. Be sure to also change
the inline directive's [[PageSpec]] to link to the location the
feed is aggregated to, which will be a subpage of the page
you put this on (blog in this example):
\[[!template id=note text="""
\[[!aggregate expirecount=5 name="dents" url="http://identi.ca/joeyh"
feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom"]]
\[[!inline pages="internal(./blog/dents/*)" template=microblog
show=5 feeds=no]]
"""]]
Note: Works best with ikiwiki 3.10 or better.

25
doc/tips/add_chatterbox_to_blog/discussion.mdwn 100644
View File

@ -0,0 +1,25 @@
The example you gave looks a bit odd.
This is what I did from your example (still trying to learn the more complex things ;).
<pre>
\[[!template id=note text="""
\[[!aggregate expirecount=5 name=kijkaqawej url=http://identi.ca/kjikaqawej
feedurl=http://identi.ca/api/statuses/user_timeline/kjikaqawej.atom]]
\[[!inline pages="internal(kijkaqawej/*)" template=microblog show=5 feeds=no]] """]]
</pre>
mine, live, here: <http://simonraven.kisikew.org/blog/meta/microblog-feed/>
I expected something like: sidebar, with a number, and displaying them in the sidebar, but they don't display (similar to what you have on your blog).
On the [[/ikiwiki/pagespec]] page, it says "internal" pages aren't "first-class" wiki pages, so it's best not to directly display them, so how do you manage to display them? I'd like to display their name, and what they link to in the sidebar, or otherwise in the main body.
> That's what the inline does, displays the internal pages.
>
> You need to fix your pagespec to refer to where the pages are aggregated
> to, under the page that contains the aggregate directive. In your example,
> it should be `internal(./blog/meta/microblog-feed/kijkaqawej/*)` --[[Joey]]
>> Oooh, I see, it's referring to an absolute path (relative to the site), right?
>> Thanks :).

2
doc/tips/embedding_content.mdwn
View File

@ -15,7 +15,7 @@ you'd better trust that site. And if ikiwiki lets you enter such html, it
needs to trust you.)
The [[plugins/htmlscrubber]] offers a different way around this problem.
You can configure it to skip scrubbing certian pages, so that content from
You can configure it to skip scrubbing certain pages, so that content from
elsewhere can be embedded on those pages. Then use [[plugins/lockedit]]
to limit who can edit those unscrubbed pages.

55
doc/tips/github.mdwn
View File

@ -11,51 +11,48 @@ two copies of the website in git (source and the compiled site), and all
historical versions too. So it could happen. If it does, you can pay github
for more space, or you can migrate your site elsewhere.
## github setup
## Github Setup
* Go to [github](http://github.com/) and sign up for an account, if you
haven't already.
* Be sure to add your laptop's ssh key to it so you can push
to github.
* Create a repository on githib named `$YOU.github.com`, substituting your
username. This repository will be used to publish your compiled website.
* Go to [github](http://github.com/) and sign up for an account, if you haven't already.
* Be sure to add your laptop's ssh key to it so you can push to github.
* Create a repository on github named `$YOU.github.com`, substituting your
*username*. This repository will be used to publish your compiled website.
* Create a repository on github named `$YOU` (or anything else you like).
This repository will be used to publish the source of your website.
This is actually optional.
## local setup
## Local Setup
* On your laptop, create two empty git repositories to correspond to the
github repositories:
YOU=# your github username here
mkdir ~/$YOU.github.com
cd ~/$YOU.github.com
git init
git remote add origin git@github.com:$YOU/$YOU.github.com.git
mkdir ~/$YOU
cd ~/$YOU
git init
git remote add origin git@github.com:$YOU/$YOU.git
* On your laptop, create two empty git repositories to correspond to the github repositories: <br />
`YOU = your github username here` <br />
`mkdir ~/$YOU.github.com` <br />
`cd ~/$YOU.github.com` <br />
`git init` <br />
`git remote add origin git@github.com:$YOU/$YOU.github.com.git` <br />
`mkdir ~/$YOU` <br />
`cd ~/$YOU` <br />
`git init` <br />
`git remote add origin git@github.com:$YOU/$YOU.git` <br />
* Add some wiki pages, such as an `index.mdwn`, to `~/$YOU`, and check them
in and commit them to git. You need something to push to github. Run
`git push origin master` to push the source pages to github.
## publishing to github
## Publishing to Github
* Now build your wiki with a command such as:
ikiwiki ~/$YOU ~/$YOU.github.com --refresh
* Now build your wiki with a command such as: <br />
`ikiwiki ~/$YOU ~/$YOU.github.com --refresh`
* Each time you build the wiki you will need to commit the changes
to git, and push the compiled pages to github:
cd ~/YOU.github.com
git add .
git commit -a -m update
git push origin master
to git, and push the compiled pages to github: <br />
`cd ~/YOU.github.com` <br />
`git add .` <br />
`git commit -a -m update` <br />
`git push origin master` <br />
Your wiki will show up at `http://$YOU.github.com/` within ten
minutes after the first push, and changes you push to it from then on
should show up immediatly.
should show up immediately.
## enhancements
## Enhancements
You can follow the instructions in [[laptop_wiki_with_git]] to set up an
editable version of your wiki on your laptop. Then you can use the web

113
doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn 100644
View File

@ -0,0 +1,113 @@
[[!meta title="ikiwiki-wordpress-import"]]
I modified the script a bit so categories and tags would actually show up in the output file.
<pre>
#!/usr/bin/env python
"""
Purpose:
Wordpress-to-Ikiwiki import tool
Copyright:
Copyright (C) 2007 Chris Lamb <chris@chris-lamb.co.uk>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Usage: run --help as an argument with this script.
Notes:
I added some extra bits to include the [[!tag foo]] stuff in the post,
as it wasn't before, at all. I'll diff the versions out so you can see
the mess I made :).
"""
import os, sys
import time
import re
from BeautifulSoup import BeautifulSoup
import codecs, htmlentitydefs
codecs.register_error('html_replace', lambda x: (''.join([u'&%s;' \
% htmlentitydefs.codepoint2name[ord(c)] for c in x.object[x.start:x.end]]), x.end))
def main(name, email, subdir, branch='master'):
soup = BeautifulSoup(sys.stdin.read())
# Regular expression to match stub in URL.
stub_pattern = re.compile(r'.*\/(.+)\/$')
for x in soup.findAll('item'):
# Ignore draft posts
if x.find('wp:status').string != 'publish': continue
match = stub_pattern.match(x.guid.string)
if match:
stub = match.groups()[0]
else:
# Fall back to our own stubs
stub = re.sub(r'[^a-zA-Z0-9_]', '-', x.title.string).lower()
commit_msg = """Importing WordPress post "%s" [%s]""" % (x.title.string, x.guid.string)
timestamp = time.mktime(time.strptime(x.find('wp:post_date_gmt').string, "%Y-%m-%d %H:%M:%S"))
content = '[[!meta title="%s"]]\n\n' % (x.title.string.replace('"', r'\"'))
content += x.find('content:encoded').string.replace('\r\n', '\n')
# categories = x.findAll('category')
# categories = x.findAll({'category':True}, attrs={'domain':re.compile(('category|tag'))})
# categories = x.findAll({'category':True}, domain=["category", "tag"])
# categories = x.findAll({'category':True}, nicename=True)
"""
We do it differently here because we have duplicates otherwise.
Take a look:
<category><![CDATA[Health]]></category>
<category domain="category" nicename="health"><![CDATA[Health]]></category>
If we do the what original did, we end up with all tags and cats doubled.
Therefore we only pick out nicename="foo". Our 'True' below is our 'foo'.
I'd much rather have the value of 'nicename', and tried, but my
python skillz are extremely limited....
"""
categories = x.findAll('category', nicename=True)
if categories:
content += "\n"
for cat in categories:
# remove 'tags/' because we have a 'tagbase' set.
# your choice: 'tag', or 'taglink'
# content += "\n[[!tag %s]]" % (cat.string.replace(' ', '-'))
content += "\n[[!taglink %s]]" % (cat.string.replace(' ', '-'))
# print >>sys.stderr, cat.string.replace(' ', '-')
# moved this thing down
data = content.encode('ascii', 'html_replace')
print "commit refs/heads/%s" % branch
print "committer %s <%s> %d +0000" % (name, email, timestamp)
print "data %d" % len(commit_msg)
print commit_msg
print "M 644 inline %s" % os.path.join(subdir, "%s.mdwn" % stub)
print "data %d" % len(data)
print data
if __name__ == "__main__":
if len(sys.argv) not in (4, 5):
print >>sys.stderr, "%s: usage: %s name email subdir [branch] < wordpress-export.xml | git-fast-import " % (sys.argv[0], sys.argv[0])
else:
main(*sys.argv[1:])
</pre>

534
doc/todo/darcs.mdwn
View File

@ -1,529 +1,21 @@
Here's Thomas Schwinge unfinished darcs support for ikiwiki.
(Finishing this has been suggested as a [[soc]] project.)
> I haven't been working on this for months and also won't in the near
> future. Feel free to use what I have done so
> far and bring it into an usable state! Also, feel free to contact me
> if there are questions.
-- [Thomas Schwinge](mailto:tschwinge@gnu.org)
[[!toggle text="show"]]
[[!toggleable text="""
# Support for the darcs rcs, <URL:http://darcs.net/>.
# Copyright (C) 2006 Thomas Schwinge <tschwinge@gnu.org>
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# We're guaranteed to be the only instance of ikiwiki running at a given
# time. It is essential that only ikiwiki is working on a particular
# repository. That means one instance of ikiwiki and it also means that
# you must not `darcs push' into this repository, as this might create
# race conditions, as I understand it.
use warnings;
use strict;
use IkiWiki;
package IkiWiki;
# Which darcs executable to use.
my $darcs = ($ENV{DARCS} or 'darcs');
# Internal functions.
sub darcs_info ($$$) {
my $field = shift;
my $repodir = shift;
my $file = shift; # Relative to the repodir.
my $child = open(DARCS_CHANGES, "-|");
if (! $child) {
exec($darcs, 'changes', '--repo=' . $repodir, '--xml-output', $file) or
error('failed to run `darcs changes\'');
}
# Brute force for now. :-/
while (<DARCS_CHANGES>) {
last if /^<\/created_as>$/;
}
($_) = <DARCS_CHANGES> =~ /$field=\'([^\']+)/;
$field eq 'hash' and s/\.gz//; # Strip away the `.gz' from `hash'es.
close(DARCS_CHANGES) or error('`darcs changes\' exited ' . $?);
return $_;
}
# Exported functions.
sub rcs_update () {
# Not needed.
}
sub rcs_prepedit ($) {
# Prepares to edit a file under revision control. Returns a token that
# must be passed to rcs_commit() when the file is to be commited. For us,
# this token the hash value of the latest patch that modifies the file,
# i.e. something like its current revision. If the file is not yet added
# to the repository, we return TODO: the empty string.
my $file = shift; # Relative to the repodir.
my $hash = darcs_info('hash', $config{srcdir}, $file);
return defined $hash ? $hash : "";
}
sub rcs_commit ($$$) {
# Commit the page. Returns `undef' on success and a version of the page
# with conflict markers on failure.
my $file = shift; # Relative to the repodir.
my $message = shift;
my $rcstoken = shift;
# Compute if the ``revision'' of $file changed.
my $changed = darcs_info('hash', $config{srcdir}, $file) ne $rcstoken;
# Yes, the following is a bit convoluted.
if ($changed) {
# TODO. Invent a better, non-conflicting name.
rename("$config{srcdir}/$file", "$config{srcdir}/$file.save") or
error("failed to rename $file to $file.save: $!");
# Roll the repository back to $rcstoken.
# TODO. Can we be sure that no changes are lost? I think that
# we can, if we make sure that the `darcs push' below will always
# succeed.
# We need to revert everything as `darcs obliterate' might choke
# otherwise.
# TODO: `yes | ...' needed? Doesn't seem so.
system($darcs, "revert", "--repodir=" . $config{srcdir}, "--all") and
error("`darcs revert' failed");
# Remove all patches starting at $rcstoken.
# TODO. Something like `yes | darcs obliterate ...' seems to be needed.
system($darcs, "obliterate", "--quiet", "--repodir" . $config{srcdir},
"--match", "hash " . $rcstoken) and
error("`darcs obliterate' failed");
# Restore the $rcstoken one.
system($darcs, "pull", "--quiet", "--repodir=" . $config{srcdir},
"--match", "hash " . $rcstoken, "--all") and
error("`darcs pull' failed");
# We're back at $rcstoken. Re-install the modified file.
rename("$config{srcdir}/$file.save", "$config{srcdir}/$file") or
error("failed to rename $file.save to $file: $!");
}
# Record the changes.
# TODO: What if $message is empty?
writefile("$file.log", $config{srcdir}, $message);
system($darcs, 'record', '--repodir=' . $config{srcdir}, '--all',
'--logfile=' . "$config{srcdir}/$file.log",
'--author=' . 'web commit <web-hurd@gnu.org>', $file) and
error('`darcs record\' failed');
# Update the repository by pulling from the default repository, which is
# master repository.
system($darcs, "pull", "--quiet", "--repodir=" . $config{srcdir},
"--all") and error("`darcs pull' failed\n");
# If this updating yields any conflicts, we'll record them now to resolve
# them. If nothing is recorded, there are no conflicts.
$rcstoken = darcs_info('hash', $config{srcdir}, $file);
# TODO: Use only the first line here, i.e. only the patch name?
writefile("$file.log", $config{srcdir}, 'resolve conflicts: ' . $message);
system($darcs, 'record', '--repodir=' . $config{srcdir}, '--all',
'--logfile=' . "$config{srcdir}/$file.log",
'--author=' . 'web commit <web-hurd@gnu.org>', $file) and
error('`darcs record\' failed');
my $conflicts = darcs_info('hash', $config{srcdir}, $file) ne $rcstoken;
unlink("$config{srcdir}/$file.log") or
error("failed to remove `$file.log'");
# Push the changes to the main repository.
system($darcs, 'push', '--quiet', '--repodir=' . $config{srcdir}, '--all')
and error('`darcs push\' failed');
# TODO: darcs send?
if ($conflicts) {
my $document = readfile("$config{srcdir}/$file");
# Try to leave everything in a consistent state.
# TODO: `yes | ...' needed? Doesn't seem so.
system($darcs, "revert", "--repodir=" . $config{srcdir}, "--all") and
warn("`darcs revert' failed.\n");
return $document;
} else {
return undef;
}
}
sub rcs_add ($) {
my $file = shift; # Relative to the repodir.
# Intermediate directories will be added automagically.
system($darcs, 'add', '--quiet', '--repodir=' . $config{srcdir},
'--boring', $file) and error('`darcs add\' failed');
}
sub rcs_recentchanges ($) {
warn('rcs_recentchanges() is not implemented');
return 'rcs_recentchanges() is not implemented';
}
sub rcs_notify () {
warn('rcs_notify() is not implemented');
}
sub rcs_getctime () {
warn('rcs_getctime() is not implemented');
}
1
"""]]
This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to much) but seems to work. It uses just one repo, like the mercurial plugin (unlike the above version, which AIUI uses two).
`rcs_commit()` uses backticks instead of `system()`, to prevent darcs' output being sent to the browser and mucking with the HTTP headers (`darcs record` has no --quiet option). And `rcs_recentchanges()` uses regexes rather than parsing darcs' XML output.
[[!toggle text="show" id="bma"]]
[[!toggleable id="bma" text="""
#!/usr/bin/perl
use warnings;
use strict;
use IkiWiki;
use Date::Parse;
use open qw{:utf8 :std};
package IkiWiki;
sub rcs_update () {
# Do nothing - there's nowhere to update *from*.
}
sub rcs_prepedit ($) {
}
sub rcs_commit ($$$;$$) {
my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
# $user should probably be a name and an email address, by darcs
# convention.
if (defined $user) {
$user = possibly_foolish_untaint($user);
}
elsif (defined $ipaddr) {
$user = "Anonymous from $ipaddr";
}
else {
$user = "Anonymous";
}
$message = possibly_foolish_untaint($message);
# BUG: this outputs one line of text, and there's not a -q or --quiet
# option. Redirecting output to /dev/null works, but I still get the
# HTTP status and location headers displayed in the browser - is that
# darcs' fault or ikiwiki's?
# Doing it in backticks *works*, but I'm sure it could be done better.
my @cmdline = ("darcs", "record", "--repodir", "$config{srcdir}",
"-a", "-m", "$message", "--author", "$user", $file);
`darcs record --repodir "$config{srcdir}" -a -m "$message" --author "$user" $file`; # Return value? Output? Who needs 'em?
#if (system(@cmdline) != 0) {
# warn "'@cmdline' failed: $!";
#}
return undef; # success
sub rcs_add ($) {
my ($file) = @_;
my @cmdline = ("darcs", "add", "--repodir", "$config{srcdir}", "-a", "-q", "$file");
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
}
sub rcs_recentchanges ($) {
# TODO: This is horrible code. It doesn't work perfectly, and uses regexes
# rather than parsing Darcs' XML output.
my $num=shift;
my @ret;
return unless -d "$config{srcdir}/_darcs";
my $changelog = `darcs changes --xml --summary --repodir "$config{srcdir}"`;
$changelog = join("", split(/\s*\n\s*/, $changelog));
my @changes = split(/<\/patch>.*?<patch/m, $changelog);
foreach my $change (@changes) {
$change =~ m/hash='(.*?)'/;
my $rev = $1;
$change =~ m/author='(.*?)'/;
my $user = $1."\n";
my $committype = "web";
if($user =~ m/&lt;/) {
# Author fields generated by darcs include an email address: look for the "<".
$committype = "darcs";
use HTML::Entities;
$user = decode_entities $user;
}
$change =~ m/local_date='(.*?)'/;
my $when = $1;
$when=time - str2time($when, 'UTC');
$change =~ m/<name>(.*?)<\/name>/g;
my @message = {line => $1};
foreach my $match ($change =~ m/<comment>(.*?)<\/comment>/gm) {
push @message, {line => $1};
}
my @pages;
foreach my $match ($change =~ m/<.*?_(file|directory)>(.*?)(<(added|removed)_lines.*\/>)*<\/.*?_(file|directory)>/g) {
# My perl-fu is weak. I'm probably going about this all wrong, anyway.
push @pages, {page => pagename($match)} if ( -f $config{srcdir}."/".$match || -d $config{srcdir}."/".$match) and not $match =~ m/^$/;
}
push @ret, { rev => $rev,
user => $user,
committype => $committype,
when => $when,
message => [@message],
pages => [@pages],
}
}
return @ret;
}
sub rcs_notify () {
# TODO
}
sub rcs_getctime ($) {
error gettext("getctime not implemented");
}
1
"""]]
---
Well, here's my version too. It only does getctime -- using a real XML parser, instead of regexp ugliness -- and maybe recentchanges, but that may be bitrotted, or maybe I never finished it, as I only need the getctime. As for actual commits, I have previously voiced my opinion, that this should be done by the plugin generating a patch bundle, and forwarding it to darcs in some way (`darcs apply` or even email to another host, possibly moderated), instead of the hacky direct modification of a working copy. It could also be faster to getctime in a batch. Just reading in all the changes the first time they're needed, might not be a big improvement in many cases, but if we got a batch request from ikiwiki, we could keep reaing the changes until all the files in this batch request have been met. --[[tuomov]]
[[!toggle text="show" id="tuomov"]]
[[!toggleable id="tuomov" text="""
<pre>
#!/usr/bin/perl
# Stubs for no revision control.
use warnings;
use strict;
use IkiWiki;
package IkiWiki;
sub rcs_update () {
}
sub rcs_prepedit ($) {
return ""
}
sub rcs_commit ($$$) {
return undef # success
}
sub rcs_add ($) {
}
sub rcs_recentchanges ($) {
my $num=shift;
my @ret;
eval q{use Date::Parse};
eval q{use XML::Simple};
my $repodir=$config{srcdir};
if (-d "$config{srcdir}/_darcs") {
my $child = open(LOG, "-|");
if (! $child) {
exec("darcs", "changes", "--xml",
"--repodir", "$repodir",
"--last", "$num")
|| error("darcs changes failed to run");
}
my $data=<LOG>;
close LOG;
my $log = XMLin($data, ForceArray => 1);
foreach my $patch ($log->{patch}) {
my $date=$patch->{local_date};
my $hash=$patch->{hash};
my $when=concise(ago(time - str2time($date)));
my @pages;
my $child = open(SUMMARY, "-|");
if (! $child) {
exec("darcs", "annotate", "-s", "--xml",
"--match", "hash: $hash",
"--repodir", "$repodir")
|| error("darcs annotate failed to run");
}
my $data=<SUMMARY>;
close SUMMARY;
my $summary = XMLin("<lame>$data</lame>", ForceArray => 1);
# TODO: find @pages
push @ret, {
#rev => $rev,
user => $patch->{author},
#committype => $committype,
when => $when,
#message => [@message],
pages => [@pages],
}; # if @pages;
return @ret if @ret >= $num;
}
}
return @ret;
}
sub rcs_notify () {
}
sub rcs_getctime ($) {
my $file=shift;
eval q{use Date::Parse};
eval q{use XML::Simple};
local $/=undef;
# Sigh... doing things the hard way again
my $repodir=$config{srcdir};
my $filer=substr($file, length($repodir));
$filer =~ s:^[/]+::;
my $child = open(LOG, "-|");
if (! $child) {
exec("darcs", "changes", "--xml", "--reverse",
"--repodir", "$repodir", "$filer")
|| error("darcs changes $filer failed to run");
}
my $data=<LOG>;
close LOG;
my $log = XMLin($data, ForceArray => 1);
my $datestr=$log->{patch}[0]->{local_date};
if (! defined $datestr) {
warn "failed to get ctime for $filer";
return 0;
}
my $date=str2time($datestr);
debug("found ctime ".localtime($date)." for $file");
return $date;
}
1
</pre>
"""]]
---
I merged the two versions above and made some fixes; it is recording my web edits in darcs and showing a recent changes page.
It is in a [darcs repository](http://joyful.com/darcsweb/darcsweb.cgi?r=ikiwiki-darcs), please send patches. --[[Simon_Michael]]
> I'd like to see at least the following fixed before I commit this: --[[Joey]]
> * Running `darcs record $filename` in backticks is not good (security)
> The thing to do is to open stdout to /dev/null before execing darcs.
> * Get `rcs_recentchanges_xml` working, parsing xml with regexps does
> not seem like a maintenance win.
> * `rcs_notify` should be removed, it's no longer used.
> * Some form of conflict handling. Using darcs to attempt to merge
> the changes is I gusss optional (although every other rcs backend,
> including svn manages to do this), but it needs to at *least* detect
> conflicts and return a page with conflict markers for the user to fix
> the conflict.
I have addressed the recentchanges bit, you can find my hacked up darcs.pm at <http://web.mornfall.net/stuff/web-root/IkiWiki/Rcs/darcs.pm>.
It's got couple of FIXMEs, and a very site-specific filter for recentchanges. Not sure how to do that better though. I will eventually add web commits, probably of my own (and mention it here).
---
And here's yet another one, including an updated `ikiwiki-makerepo`. :)
<http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)
> Note that there's a 'darcs' branch in git that I'm keeping a copy of your
> code in. Just in case. :-)
I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
* HTML is generated from `srcdir`.
* CGI edits happen in `srcdir`.
* The backend pulls updates from `master` into `srcdir`, i.e. darcs commits should happen to `master`.
* `master` calls ikiwiki (through a wrapper) in its apply posthook, i.e. `master/_darcs/prefs/defaults` should look like this:
apply posthook ikiwrap
apply run-posthook
(I'm not sure, should/could it be `ikiwrap --refresh` above?)
* The backend pushes CGI edits from `srcdir` back into `master` (triggering the apply hook).
* The working copies in `srcdir` and `master` should *not* be touched by the user, only by the CGI or darcs, respectively.
I've taken all the good stuff from the above (now deleted --[[Joey]]) and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
> Review of this one:
>
> * Should use tab indentation.
> * Should use tab indentation. (fixed)
> * `rcs_getctime` should not need to use a ctime cache (such a cache should
> also not be named `.ikiwiki.ctimes`). `rcs_getctime` is run exactly
> once per page, ever, and the data is cached in ikiwiki's index.
> once per page, ever, and the data is cached in ikiwiki's index. (fixed)
> * I doubt that ENV{DARCS} will be available, since the wrapper clobbers> the entire
> environment. I'd say remove that.
> environment. I'd say remove that. (fixed)
> * I don't understand what `darcs_info` is doing, but it seems to be
> parsing xml with a regexp?
> * Looks like `rcs_commit` needs a few improvements, as marked TODO
> * `rcs_remove` just calls "rm"? Does darcs record notice the file was removed
> and automatically commit the removal? (And why `system("rm")` and not
> `unlink`?)
> * Is the the darcs info in [[details]] still up-to-date re this version?
> * `rcs_remove` just calls unlink? Does darcs record notice the file was removed
> and automatically commit the removal?
> * Is the the darcs info in [[rcs/details]] still up-to-date re this version? (fixed)
> --[[Joey]]
> Update:
@ -537,6 +29,8 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
> this version works. It's similar, but the details differ slightly.
> You could copy my description above to replace it.
>
>> done --[[Joey]]
>
> There is still some ironing to do, for instance the current version doesn't allow for
> modifying attachments by re-uploading them via CGI ("darcs add failed"). Am I assuming
> correctly that "adding" a file that's already in the repo should just be a no-op?
@ -548,4 +42,12 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
>>> Done. --pesco
[[!tag patch]]
----
I've finally merged this into ikiwiki master. The plugin looks quite
complete, with only the new `rcs_receive` hook missing, and I
hope it works as good as it looks. :) If anyone wants to work on improving
it, there are some TODOs as mentioned above that could still be improved.
--[[Joey]]
[[!tag patch done]]

13
doc/todo/hidden_links__47__tags.mdwn 100644
View File

@ -0,0 +1,13 @@
[[!tag wishlist]]
I would like to have the possibility for hidden tags or links.
Using the tag functionality I could group some news items for including them into other subpages. But I don't want the links or tags to show (and I don't want Tag lists like "Tags: ?mytag").
The tagged items should not differ from the items, that are not tagged.
I didn't find any way to hide the tag list or links and I don't want to have to create a "hidden" page containing links to the pages and then using the backlink functionality, because this is more prone to errors. It's easier to forget adding a link on a second page than forgetting to add a needed tag to a new newsitem.
> I found out, that using the meta plugin it is possible to create the hidden link, that I wanted.
-- [[users/Enno]]
>> Yes, meta link will not show up as a visible link on the page, while
>> also not showing up in the list of tags of a page, so it seems what you
>> want. [[done]] --[[Joey]]

5
doc/todo/inline_autotitles.mdwn → doc/todo/inline_postform_autotitles.mdwn
View File

@ -1,8 +1,9 @@
[[!tag wishlist]]
[[!tag patch]]
for 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 the title.
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
the title and show no input box prompting for it.
this can either be based on timestamp formatting, or use the already existing
munging mechanism, which appends numbers to page titles in case that page
already exists.

2
doc/todo/need_global_renamepage_hook.mdwn
View File

@ -111,3 +111,5 @@ hashes is desired, it could return the full set of hashes.
>>>> It looks good. I made some small changes to it in my own po branch.
>>>> Nothing significant really. If this were not tied up in the po branch,
>>>> I've have merged it to master already. --[[Joey]]
>>>> Thanks, this is great :) --[[intrigeri]]

68
doc/todo/rewrite_ikiwiki_in_haskell.mdwn 100644
View File

@ -0,0 +1,68 @@
[[!tag wishlist blue-sky]]
In the long term, I have been considering rewriting ikiwiki in haskell.
It's appealing for a lot of reasons, including:
* No need to depend on a C compiler and have wrappers. Instead, ikiwiki
binaries could be built on demand to do the things wrappers are used for
now (cgi, post-commit, etc).
* Potentially much faster. One problem with the now very modular ikiwiki is
that it has to load up dozens of perl modules each time it runs, which
means both opening lots of files and evaluating them. A haskell version
could run from one pre-compiled file. Other speed efficienies are also
likely with haskell. For example, pandoc is apparently an order of
magnitude faster than perl markdown implementations.
* Many plugins could be written in pure functional code, with no side
effects. Not all of them, of course.
* It should be much easier to get ikiwiki to support parallel compilation
on multi-core systems using haskell.
* A rewrite would be an opportunity to utterly break compatability and
redo things based on experience. Since the haskell libraries used for
markdown, templates, etc, are unlikely to be very compatable with the perl
versions, and since perl plugins obviously wouldn't work, and perl setup
files wouldn't be practical to keep, a lot of things would unavoidably
change, and at that point changinge everything else I can think of
probably wouldn't hurt (much).
- Re templates, it would be nice to have a template library that
doesn't use html-ish templating tags, since those are hard for users to
edit in html editors currently.
- This would be a chance to make WikiLinks with link texts read
"the right way round" (ie, vaguely wiki creole compatably).
- The data structures would probably be quite different.
- I might want to drop a lot of the command-line flags, either
requiring a setup file be used for those things, or leaving the
general-purpose `--set var=value` flag.
- Sometimes the current behavior of `--setup` seems confusing; it might
only cause a setup file to be read, and not force rebuild mode.
- Hard to say how the very high level plugin interface design would change,
but at the least some of the names of hooks could stand a rename, and
their parameter passing cleaned up.
We know that a big, break-the-world rewrite like this can be a very
bad thing for a project to attempt. It would be possible to support
external plugins written in haskell today, without any rewrite; and a few
of the benefits could be obtained by, eg, making the mdwn plugin be a
haskell program that uses pandoc. I doubt that wouod be a good first step
to converting ikiwiki to haskell, because such a program would have very
different data structures and intercommuniucation than a pure haskell
version.
Some other things to be scared about:
* By picking perl, I made a lot of people annoyed (and probably turned
several people away from using ikiwiki). But over time there turned out
to be a lot of folks who knew perl already (even if rustily), and made
some *very* useful contributions. I doubt there's as large a pool of haskell
programmers, and it's probably harder for a python user to learn haskell
than perl if they want to contribute to ikiwiki.
* It might be harder for users of hosting services to install a haskell based
ikiwiki than the perl version. Such systems probably don't have ghc and
a bunch of haskell libraries. OTOH, it might be possible to build a
static binary at home and upload it, thus avoiding a messy installation
procedure entirely.
* I can barely code in haskell yet. I'm probably about 100x faster at
programming in perl. I need to get some more practical experience before
I´m fast and seasoned enough in haskell to attempt such a project.
(And so far, progress at learning has been slow and I have not managed
to write anything serious in haskell.) --[[Joey]]

14
doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn 100644
View File

@ -0,0 +1,14 @@
Ok, I have to admit, I have no idea if this is an April fool's joke or not.
Congratulations for demonstrating that April fools jokes can still be subtle
(whether intentionally or not!) -- [[Jon]]
> Having said all that, have you looked at erlang? Have you heard of couchdb?
> I'd strongly recommend looking at that. -- [[Jon]]
>> I've glanced at couchdb, but don't see how it would tie in with ikiwiki.
>> --[[Joey]]
>>> It doesn't really. I recently (re-)read about couchdb and thought that
>>> what it was trying to do had some comparisons with the thinking going on
>>> in [[todo/structured_page_data]]. -- [[Jon]]

4
doc/usage.mdwn
View File

@ -308,10 +308,10 @@ also be configured using a setup file.
* --getctime
Pull last changed time for each new page out of the revision control
Pull creation time for each new page out of the revision control
system. This rarely used option provides a way to get the real creation
times of items in weblogs, such as when building a wiki from a new
Subversion checkout. It is unoptimised and quite slow. It is best used
VCS checkout. It is unoptimised and quite slow. It is best used
with --rebuild, to force ikiwiki to get the ctime for all pages.
* --set var=value

8
doc/users/jon.mdwn
View File

@ -4,8 +4,9 @@ team-documentation management system for a small-sized group of UNIX
sysadmins.
* my edits should appear either as 'Jon' (if I've used
[[tips/untrusted_git_push]]) or 'alcopop.org/me/openid/'.
* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts)
[[tips/untrusted_git_push]]) or 'jmtd.net' (or once upon a time
'alcopop.org/me/openid/' or 'jondowland').
* My [homepage](http://jmtd.net/) is powered by ikiwiki
I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual
[Linux conference](http://www.ukuug.org/events/linux2008/) about organising
@ -14,3 +15,6 @@ discussing IkiWiki in some technical detail and suggesting it as a good piece
of software for this task.
* slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
I am also working on some ikiwiki hacks: an alternative approach to
[[plugins/comments]]; a system for [[forum/managing_todo_lists]].

1
doc/users/seanh.mdwn 100644
View File

@ -0,0 +1 @@
seanh is an ikiwiki user.

1
doc/wikitemplates.mdwn
View File

@ -21,6 +21,7 @@ located in /usr/share/ikiwiki/templates by default.
* `inlinepage.tmpl` - Used for adding a page inline in a blog
page.
* `archivepage.tmpl` - Used for listing a page in a blog archive page.
* `microblog.tmpl` - Used for showing a microblogging post inline.
* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create

26
ikiwiki-makerepo
View File

@ -6,7 +6,7 @@ srcdir="$2"
repository="$3"
usage () {
echo "usage: ikiwiki-makerepo svn|git|monotone srcdir repository" >&2
echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2
echo " ikiwiki-makerepo bzr|mercurial srcdir" >&2
exit 1
}
@ -121,6 +121,30 @@ monotone)
echo ' return "passphrasehere"'
echo "end"
;;
darcs)
if [ -e "$srcdir/_darcs" ]; then
echo "$srcdir already seems to be a darcs repository" >&2
exit 1
fi
mkdir -p "$repository"
(cd "$repository" && darcs initialize)
mkdir -p "$srcdir"
cd "$srcdir"
darcs initialize
echo .ikiwiki >> _darcs/prefs/boring
darcs record -a -l -q -m "initial import"
darcs pull -a -q "$repository"
darcs push -a -q "$repository"
echo "Directory $srcdir is now a branch of darcs repo $repository"
# set up master repo's apply hook and tell user to adjust it if desired
darcsdefaults="$repository/_darcs/prefs/defaults"
echo "Preconfiguring apply hook in $darcsdefaults - adjust as desired!"
echo "apply posthook $repository/_darcs/ikiwiki-wrapper" >> "$darcsdefaults"
echo "apply run-posthook" >> "$darcsdefaults"
;;
*)
echo "Unsupported revision control system $rcs" >&2
usage

38
po/bg.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki-bg\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-01-12 01:19+0200\n"
"Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
msgid "You are banned."
msgstr "Достъпът ви е забранен."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Грешка"
@ -188,7 +188,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -252,19 +252,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -334,18 +334,18 @@ msgstr ""
msgid "fortune failed"
msgstr "грешшка в приставката „fortune”"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -419,25 +419,29 @@ msgstr "шаблонът „%s” не е намерен"
msgid "missing pages parameter"
msgstr "липсващ параметър „id” на шаблона"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "непознат вид сортиране „%s”"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Дискусия"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
@ -1055,12 +1059,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

38
po/cs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-05-09 21:21+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@ -53,7 +53,7 @@ msgstr "Nastavení uloženo."
msgid "You are banned."
msgstr "Jste vyhoštěni."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Chyba"
@ -185,7 +185,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -249,19 +249,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -331,18 +331,18 @@ msgstr ""
msgid "fortune failed"
msgstr "fortune selhal"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -413,25 +413,29 @@ msgstr "zdroj nebyl nalezen"
msgid "missing pages parameter"
msgstr "chybí parametr %s"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "neznámý typ řazení %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Přidat nový příspěvek nazvaný:"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "neexistující šablona %s"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Diskuse"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
@ -1035,12 +1039,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

38
po/da.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2008-10-22 19:13+0100\n"
"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
"Language-Team: None\n"
@ -57,7 +57,7 @@ msgstr "Indstillinger gemt"
msgid "You are banned."
msgstr "Du er banlyst."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Fejl"
@ -187,7 +187,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -252,19 +252,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr "du er ikke logget på som en administrator"
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -331,18 +331,18 @@ msgstr ""
msgid "fortune failed"
msgstr "spådom (fortune) fejlede"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, fuzzy, perl-format
msgid "you are not allowed to change %s"
msgstr "du er ikke logget på som en administrator"
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
#, fuzzy
msgid "you are not allowed to change file modes"
msgstr "du er ikke logget på som en administrator"
@ -410,25 +410,29 @@ msgstr "sideredigering er ikke tilladt"
msgid "missing pages parameter"
msgstr "mangler pages-parametren"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "ukendt sorteringsform %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Tilføj nyt indlæg med følgende titel:"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "ikke-eksisterende skabelon: %s"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Diskussion"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client ikke fundet, pinger ikke"
@ -1034,12 +1038,12 @@ msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
"indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "forudberegningssløkke fundet på %s ved dybde %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr "ja"

38
po/de.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 3.06\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2009-03-02 15:39+0100\n"
"Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@ -55,7 +55,7 @@ msgstr "Einstellungen gespeichert."
msgid "You are banned."
msgstr "Sie sind ausgeschlossen worden."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Fehler"
@ -187,7 +187,7 @@ msgstr ""
"als Spam ein: "
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -254,19 +254,19 @@ msgstr "Kommentar hinzugefügt."
msgid "Added a comment: %s"
msgstr "Kommentar hinzugefügt: %s"
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr "Sie sind nicht als Administrator angemeldet"
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr "Kommentarmoderation"
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr "Kommentarmoderation"
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr "Kommentare"
@ -333,18 +333,18 @@ msgstr "Format und Text müssen spezifiziert werden"
msgid "fortune failed"
msgstr "»fortune« fehlgeschlagen"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr "es ist Ihnen nicht erlaubt, %s zu ändern"
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "Sie können Dateien mit den Zugriffsrechten %s nicht verändern"
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr "Es ist Ihnen nicht erlaubt, Dateizugriffsrechte zu ändern"
@ -415,25 +415,29 @@ msgstr "Seitenbearbeitungen sind nicht erlaubt"
msgid "missing pages parameter"
msgstr "Fehlender Seitenparameter"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "Unbekannter Sortierungstyp %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Füge einen neuen Beitrag hinzu. Titel:"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "nicht-vorhandene Vorlage %s"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Diskussion"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
@ -1048,12 +1052,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr "ja"

38
po/es.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-08 19:02-0400\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2009-03-03 10:48+0100\n"
"Last-Translator: Víctor Moral <victor@taquiones.net>\n"
"Language-Team: spanish <es@li.org>\n"
@ -61,7 +61,7 @@ msgstr "Las preferencias se han guardado."
msgid "You are banned."
msgstr "Ha sido expulsado."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Error"
@ -194,7 +194,7 @@ msgstr ""
"dice que el texto puede ser spam."
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -258,19 +258,19 @@ msgstr "Añadir un comentario"
msgid "Added a comment: %s"
msgstr "Comentario añadido: %s"
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr "No está registrado como un administrador"
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr "Aprobación de comentarios"
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr "aprobación de comentarios"
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr "Comentarios"
@ -337,18 +337,18 @@ msgstr "se deben especificar tanto el formato como el texto"
msgid "fortune failed"
msgstr "el programa fortune ha fallado"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr "No puede cambiar %s"
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "no puede actuar sobre un archivo con permisos %s"
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr "No puede cambiar los permisos de acceso de un archivo"
@ -420,25 +420,29 @@ msgstr "no está permitida la modificación de páginas"
msgid "missing pages parameter"
msgstr "falta el parámetro pages"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "no conozco este tipo de ordenación %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Añadir una entrada nueva titulada:"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "la plantilla %s no existe "
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Comentarios"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
@ -1051,14 +1055,14 @@ msgstr "no puedo emplear varios complementos rcs"
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr "no he podido cargar el complemento externo %s necesario para %s"
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
"se ha detectado en la página %s un bucle de preprocesado en la iteración "
"número %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr "si"

38
po/fr.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 3.04\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2009-03-15 16:10+0100\n"
"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
msgid "You are banned."
msgstr "Vous avez été banni."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Erreur"
@ -189,7 +189,7 @@ msgstr ""
"blogspam.net/\">blogspam</a>: "
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -253,19 +253,19 @@ msgstr "Commentaire ajouté"
msgid "Added a comment: %s"
msgstr "Commentaire ajouté : %s"
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../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:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr "Modération du commentaire"
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr "modération du commentaire"
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr "Commentaires"
@ -332,18 +332,18 @@ msgstr "le format et le texte doivent être indiqués"
msgid "fortune failed"
msgstr "Échec du lancement de « fortune »"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Vous n'êtes pas autorisé à modifier %s"
#: ../IkiWiki/Plugin/git.pm:664
#: ../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"
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
@ -412,25 +412,29 @@ msgstr "Modification de page interdite"
msgid "missing pages parameter"
msgstr "Paramètre « pages » manquant"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "Type de tri %s inconnu"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Ajouter un nouvel article dont le titre est :"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "Le modèle de page %s n'existe pas"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Discussion"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
@ -1044,12 +1048,12 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, perl-format
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:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr "oui"

38
po/gu.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki-gu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-01-11 16:05+0530\n"
"Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
"Language-Team: Gujarati <team@utkarsh.org>\n"
@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
msgid "You are banned."
msgstr "તમારા પર પ્રતિબંધ છે."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "ક્ષતિ"
@ -186,7 +186,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -250,19 +250,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -332,18 +332,18 @@ msgstr ""
msgid "fortune failed"
msgstr "ભવિષ્ય નિષ્ફળ"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -414,25 +414,29 @@ msgstr "ફીડ મળ્યું નહી"
msgid "missing pages parameter"
msgstr "ખોવાયેલ %s વિકલ્પ"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "ચર્ચા"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
@ -1035,12 +1039,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

30
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-15 17:56-0400\n"
"POT-Creation-Date: 2009-04-04 18:50-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -184,7 +184,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -248,19 +248,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -405,25 +405,29 @@ msgstr ""
msgid "missing pages parameter"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr ""
@ -947,12 +951,12 @@ msgstr ""
msgid "you must enter a wikiname (that contains alphanumerics)"
msgstr ""
#: ../IkiWiki/Setup/Automator.pm:68
#: ../IkiWiki/Setup/Automator.pm:71
#, perl-format
msgid "unsupported revision control system %s"
msgstr ""
#: ../IkiWiki/Setup/Automator.pm:94
#: ../IkiWiki/Setup/Automator.pm:97
msgid "failed to set up the repository with ikiwiki-makerepo"
msgstr ""

38
po/pl.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 1.51\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-04-27 22:05+0200\n"
"Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
"Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
msgid "You are banned."
msgstr "Twój dostęp został zabroniony przez administratora."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Błąd"
@ -190,7 +190,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -254,19 +254,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -336,18 +336,18 @@ msgstr ""
msgid "fortune failed"
msgstr "awaria fortunki"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -421,25 +421,29 @@ msgstr "nieznaleziony kanał RSS"
msgid "missing pages parameter"
msgstr "brakujący parametr %s"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "nieznany sposób sortowania %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr "Tytuł nowego wpisu"
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr "brakujący szablon %s"
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Dyskusja"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
@ -1061,12 +1065,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

38
po/sv.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-01-10 23:47+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
msgid "You are banned."
msgstr "Du är bannlyst."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Fel"
@ -187,7 +187,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -251,19 +251,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -333,18 +333,18 @@ msgstr ""
msgid "fortune failed"
msgstr "fortune misslyckades"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -416,25 +416,29 @@ msgstr "mallen %s hittades inte"
msgid "missing pages parameter"
msgstr "mall saknar id-parameter"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "okänd sorteringstyp %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Diskussion"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client hittades inte, pingar inte"
@ -1048,12 +1052,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
#: ../IkiWiki.pm:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

38
po/vi.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-01 15:03-0500\n"
"POT-Creation-Date: 2009-04-04 14:59-0400\n"
"PO-Revision-Date: 2007-01-13 15:31+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
msgid "You are banned."
msgstr "Bạn bị cấm ra."
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209
#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
msgid "Error"
msgstr "Lỗi"
@ -188,7 +188,7 @@ msgid ""
msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
#: ../IkiWiki/Render.pm:149
msgid "discussion"
@ -252,19 +252,19 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:510 ../IkiWiki/Plugin/websetup.pm:236
#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:561
#: ../IkiWiki/Plugin/comments.pm:562
msgid "Comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:600
#: ../IkiWiki/Plugin/comments.pm:601
msgid "comment moderation"
msgstr ""
#: ../IkiWiki/Plugin/comments.pm:751
#: ../IkiWiki/Plugin/comments.pm:752
msgid "Comments"
msgstr ""
@ -334,18 +334,18 @@ msgstr ""
msgid "fortune failed"
msgstr "fortune bị lỗi"
#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642
#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
#: ../IkiWiki/Receive.pm:129
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:664
#: ../IkiWiki/Plugin/git.pm:666
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
#: ../IkiWiki/Plugin/git.pm:668
#: ../IkiWiki/Plugin/git.pm:670
msgid "you are not allowed to change file modes"
msgstr ""
@ -419,25 +419,29 @@ msgstr "không tìm thấy mẫu %s"
msgid "missing pages parameter"
msgstr "mẫu thiếu tham số id"
#: ../IkiWiki/Plugin/inline.pm:204
#: ../IkiWiki/Plugin/inline.pm:200
msgid "Sort::Naturally needed for title_natural sort"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:211
#, perl-format
msgid "unknown sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
#: ../IkiWiki/Plugin/inline.pm:307
#: ../IkiWiki/Plugin/inline.pm:314
msgid "Add a new post titled:"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:327
#: ../IkiWiki/Plugin/inline.pm:334
#, perl-format
msgid "nonexistant template %s"
msgstr ""
#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
msgid "Discussion"
msgstr "Thảo luận"
#: ../IkiWiki/Plugin/inline.pm:593
#: ../IkiWiki/Plugin/inline.pm:600
msgid "RPC::XML::Client not found, not pinging"
msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
@ -1049,12 +1053,12 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1192
#: ../IkiWiki.pm:1194
#, fuzzy, perl-format
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:1730
#: ../IkiWiki.pm:1732
msgid "yes"
msgstr ""

19
t/git.t
View File

@ -3,19 +3,17 @@ use warnings;
use strict;
my $dir;
my $gitrepo;
BEGIN {
$dir="/tmp/ikiwiki-test-git.$$";
$gitrepo="$dir/repo";
my $git=`which git`;
chomp $git;
if (! -x $git || ! mkdir($dir) || ! mkdir($gitrepo)) {
if (! -x $git || ! mkdir($dir)) {
eval q{
use Test::More skip_all => "git not available or could not make test dirs"
use Test::More skip_all => "git not available or could not make test dir"
}
}
}
use Test::More tests => 16;
use Test::More tests => 18;
BEGIN { use_ok("IkiWiki"); }
@ -25,17 +23,16 @@ $config{srcdir} = "$dir/src";
IkiWiki::loadplugins();
IkiWiki::checkconfig();
system "cd $gitrepo && git init >/dev/null 2>&1";
system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1";
system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1";
system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1";
ok (mkdir($config{srcdir}));
is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0);
my @changes;
@changes = IkiWiki::rcs_recentchanges(3);
is($#changes, 0); # counts for dummy commit during repo creation
is($changes[0]{message}[0]{"line"}, "Initial");
is($changes[0]{pages}[0]{"page"}, "dummy");
# ikiwiki-makerepo's first commit is setting up the .gitignore
is($changes[0]{message}[0]{"line"}, "initial commit");
is($changes[0]{pages}[0]{"page"}, ".gitignore");
# Web commit
my $test1 = readfile("t/test1.mdwn");

14
templates/archivepage.tmpl
View File

@ -1,7 +1,19 @@
<p>
<TMPL_IF NAME="PERMALINK">
<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
<TMPL_ELSE>
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
</TMPL_IF>
<i>
Posted <TMPL_VAR CTIME>
<TMPL_IF NAME="AUTHOR">
by <span class="author">
<TMPL_IF NAME="AUTHORURL">
<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
<TMPL_ELSE>
<TMPL_VAR AUTHOR>
</TMPL_IF>
</span>
</TMPL_IF>
</i>
</p>

22
templates/microblog.tmpl 100644
View File

@ -0,0 +1,22 @@
<div class="microblog">
<div class="inlinecontent">
<TMPL_VAR CONTENT>
</div>
<div class="microblog-header">
<TMPL_IF NAME="AUTHOR">
<span class="author">
<TMPL_IF NAME="AUTHORURL">
<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
<TMPL_ELSE>
<TMPL_VAR AUTHOR>
</TMPL_IF>
</span>
</TMPL_IF>
&mdash; <TMPL_VAR CTIME>
</div> <!--.microblog-header-->
</div> <!--.microblog-->

8
templates/titlepage.tmpl
View File

@ -1 +1,7 @@
<p><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></p>
<p>
<TMPL_IF NAME="PERMALINK">
<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
<TMPL_ELSE>
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
</TMPL_IF>
</p>