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

* Add the linkify and scan hooks. These hooks can be used to implement 

custom, first-class types of wikilinks.
* Move standard wikilink implementation to a new wikilink plugin, which
  will of course be enabled by default.
master
Joey Hess 2008-02-11 22:48:27 -05:00
parent 5163646e26
commit 4763514861
9 changed files with 215 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
IkiWiki.pm
View File

@ -37,21 +37,6 @@ sub defaultconfig () { #{{{
qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//, qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
qr/(^|\/)_MTN\//, qr/(^|\/)_MTN\//,
qr/\.dpkg-tmp$/], qr/\.dpkg-tmp$/],
wiki_link_regexp => qr{
\[\[(?=[^!]) # beginning of link
(?:
([^\]\|]+) # 1: link text
\| # followed by '|'
)? # optional
([^\n\r\]#]+) # 2: page to link to
(?:
\# # '#', beginning of anchor
([^\s\]]+) # 3: anchor text
)? # optional
\]\] # end of link
}x,
wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/, wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/, web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
verbose => 0, verbose => 0,
@ -89,8 +74,8 @@ sub defaultconfig () { #{{{
setup => undef, setup => undef,
adminuser => undef, adminuser => undef,
adminemail => undef, adminemail => undef,
plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit plugin => [qw{mdwn link inline htmlscrubber passwordauth openid
lockedit conditional recentchanges}], signinedit lockedit conditional recentchanges}],
libdir => undef, libdir => undef,
timeformat => '%c', timeformat => '%c',
locale => undef, locale => undef,
@ -147,24 +132,6 @@ sub checkconfig () { #{{{
umask(possibly_foolish_untaint($config{umask})); umask(possibly_foolish_untaint($config{umask}));
} }
if (!$config{prefix_directives}) {
$config{wiki_link_regexp} = qr{
\[\[ # beginning of link
(?:
([^\]\|\n\s]+) # 1: link text
\| # followed by '|'
)? # optional
([^\s\]#]+) # 2: page to link to
(?:
\# # '#', beginning of anchor
([^\s\]]+) # 3: anchor text
)? # optional
\]\] # end of link
}x,
}
run_hooks(checkconfig => sub { shift->() }); run_hooks(checkconfig => sub { shift->() });
return 1; return 1;
@ -684,21 +651,17 @@ sub htmlize ($$$) { #{{{
} #}}} } #}}}
sub linkify ($$$) { #{{{ sub linkify ($$$) { #{{{
my $lpage=shift; # the page containing the links my $page=shift;
my $page=shift; # the page the link will end up on (different for inline) my $destpage=shift;
my $content=shift; my $content=shift;
$content =~ s{(\\?)$config{wiki_link_regexp}}{ run_hooks(linkify => sub {
defined $2 $content=shift->(
? ( $1 page => $page,
? "[[$2|$3".($4 ? "#$4" : "")."]]" destpage => $page,
: htmllink($lpage, $page, linkpage($3), content => $content,
anchor => $4, linktext => pagetitle($2))) );
: ( $1 });
? "[[$3".($4 ? "#$4" : "")."]]"
: htmllink($lpage, $page, linkpage($3),
anchor => $4))
}eg;
return $content; return $content;
} #}}} } #}}}

83
IkiWiki/Plugin/link.pm 100644
View File

@ -0,0 +1,83 @@
#!/usr/bin/perl
package IkiWiki::Plugin::link;
use warnings;
use strict;
use IkiWiki 2.00;
my $link_regexp;
sub import { #{{{
hook(type => "checkconfig", id => "link", call => \&checkconfig);
hook(type => "linkify", id => "link", call => \&linkify);
hook(type => "scan", id => "link", call => \&scan);
} # }}}
sub checkconfig () { #{{{
if ($config{prefix_directives}) {
$link_regexp = qr{
\[\[(?=[^!]) # beginning of link
(?:
([^\]\|]+) # 1: link text
\| # followed by '|'
)? # optional
([^\n\r\]#]+) # 2: page to link to
(?:
\# # '#', beginning of anchor
([^\s\]]+) # 3: anchor text
)? # optional
\]\] # end of link
}x;
}
else {
$link_regexp = qr{
\[\[ # beginning of link
(?:
([^\]\|\n\s]+) # 1: link text
\| # followed by '|'
)? # optional
([^\s\]#]+) # 2: page to link to
(?:
\# # '#', beginning of anchor
([^\s\]]+) # 3: anchor text
)? # optional
\]\] # end of link
}x,
}
} #}}}
sub linkify (@) { #{{{
my %params=@_;
my $page=$params{page};
my $destpage=$params{destpage};
$params{content} =~ s{(\\?)$link_regexp}{
defined $2
? ( $1
? "[[$2|$3".($4 ? "#$4" : "")."]]"
: htmllink($page, $destpage, IkiWiki::linkpage($3),
anchor => $4, linktext => IkiWiki::pagetitle($2)))
: ( $1
? "[[$3".($4 ? "#$4" : "")."]]"
: htmllink($page, $destpage, IkiWiki::linkpage($3),
anchor => $4))
}eg;
return $params{content};
} #}}}
sub scan (@) { #{{{
my %params=@_;
my $page=$params{page};
my $content=$params{content};
while ($content =~ /(?<!\\)$link_regexp/g) {
push @{$links{$page}}, IkiWiki::linkpage($2);
}
} # }}}
1

16
IkiWiki/Plugin/skeleton.pm
View File

@ -14,6 +14,8 @@ sub import { #{{{
hook(type => "needsbuild", id => "skeleton", call => \&needsbuild); hook(type => "needsbuild", id => "skeleton", call => \&needsbuild);
hook(type => "preprocess", id => "skeleton", call => \&preprocess); hook(type => "preprocess", id => "skeleton", call => \&preprocess);
hook(type => "filter", id => "skeleton", call => \&filter); hook(type => "filter", id => "skeleton", call => \&filter);
hook(type => "linkify", id => "skeleton", call => \&linkify);
hook(type => "scan", id => "skeleton", call => \&scan);
hook(type => "htmlize", id => "skeleton", call => \&htmlize); hook(type => "htmlize", id => "skeleton", call => \&htmlize);
hook(type => "sanitize", id => "skeleton", call => \&sanitize); hook(type => "sanitize", id => "skeleton", call => \&sanitize);
hook(type => "format", id => "skeleton", call => \&format); hook(type => "format", id => "skeleton", call => \&format);
@ -57,6 +59,20 @@ sub filter (@) { #{{{
return $params{content}; return $params{content};
} # }}} } # }}}
sub linkify (@) { #{{{
my %params=@_;
debug("skeleton plugin running as linkify");
return $params{content};
} # }}}
sub scan (@) { #{{{a
my %params=@_;
debug("skeleton plugin running as scan");
} # }}}
sub htmlize (@) { #{{{ sub htmlize (@) { #{{{
my %params=@_; my %params=@_;

17
IkiWiki/Render.pm
View File

@ -166,16 +166,21 @@ sub scan ($) { #{{{
# to the content. # to the content.
$content=filter($page, $page, $content); $content=filter($page, $page, $content);
my @links;
while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
push @links, linkpage($2);
}
if ($config{discussion}) { if ($config{discussion}) {
# Discussion links are a special case since they're # Discussion links are a special case since they're
# not in the text of the page, but on its template. # not in the text of the page, but on its template.
push @links, $page."/".gettext("discussion"); $links{$page}=[ $page."/".gettext("discussion") ];
} }
$links{$page}=\@links; else {
$links{$page}=[];
}
run_hooks(scan => sub {
shift->(
page => $page,
content => $content,
);
});
# Preprocess in scan-only mode. # Preprocess in scan-only mode.
preprocess($page, $page, $content, 1); preprocess($page, $page, $content, 1);

4
debian/changelog vendored
View File

@ -14,6 +14,10 @@ ikiwiki (2.40) UNRELEASED; urgency=low
of XML::RPC's default of us-ascii. Allows interoperation with of XML::RPC's default of us-ascii. Allows interoperation with
python's xmlrpc library, which threw invalid encoding exceptions and python's xmlrpc library, which threw invalid encoding exceptions and
caused the rst plugin to hang. caused the rst plugin to hang.
* Add the linkify and scan hooks. These hooks can be used to implement
custom, first-class types of wikilinks.
* Move standard wikilink implementation to a new wikilink plugin, which
will of course be enabled by default.
-- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800 -- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800

4
doc/plugins/link.mdwn 100644
View File

@ -0,0 +1,4 @@
[[template id=plugin name=link core=1 author="[[Joey]]"]]
[[tag type/link]]
This plugin implements standard [[WikiLinks|WikiLink]].

22
doc/plugins/write.mdwn
View File

@ -142,6 +142,28 @@ format at preprocessor time. Text output by a preprocessor directive will
be linkified and passed through markdown (or whatever engine is used to be linkified and passed through markdown (or whatever engine is used to
htmlize the page) along with the rest of the page. htmlize the page) along with the rest of the page.
### linkify
hook(type => "linkify", id => "foo", call => \&linkify);
This hook is called to convert [[WikiLinks|WikiLink]] on the page into html
links. The function is passed named parameters "page", "destpage", and
"content". It should return the linkified content.
Plugins that implement linkify must also implement a scan hook, that scans
for the links on the page and adds them to `%links`.
### scan
hook(type => "scan", id => "foo", call => \&scan);
This hook is called early in the process of building the wiki, and is used
as a first pass scan of the page, to collect metadata about the page. It's
mostly used to scan the page for WikiLinks, and add them to `%links`.
The function is passed named parameters "page" and "content". Its return
value is ignored.
### htmlize ### htmlize
hook(type => "htmlize", id => "ext", call => \&htmlize); hook(type => "htmlize", id => "ext", call => \&htmlize);

89
po/da.po
View File

@ -1,4 +1,3 @@
# SOME DESCRIPTIVE TITLE. # SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
@ -8,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ikiwiki\n" "Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-02-03 14:52-0500\n" "POT-Creation-Date: 2008-02-11 00:48-0500\n"
"PO-Revision-Date: 2008-02-11 00:12+0100\n" "PO-Revision-Date: 2008-02-11 00:12+0100\n"
"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n"
@ -48,89 +47,89 @@ msgstr "Indstillinger gemt"
msgid "%s is not an editable page" msgid "%s is not an editable page"
msgstr "%s er ikke en redigérbar side" msgstr "%s er ikke en redigérbar side"
#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/CGI.pm:384 ../IkiWiki/Plugin/brokenlinks.pm:24
#: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/inline.pm:242 ../IkiWiki/Plugin/opendiscussion.pm:17
#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95
#: ../IkiWiki/Render.pm:175 #: ../IkiWiki/Render.pm:176
msgid "discussion" msgid "discussion"
msgstr "diskussion" msgstr "diskussion"
#: ../IkiWiki/CGI.pm:429 #: ../IkiWiki/CGI.pm:431
#, perl-format #, perl-format
msgid "creating %s" msgid "creating %s"
msgstr "opretter %s" msgstr "opretter %s"
#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 #: ../IkiWiki/CGI.pm:449 ../IkiWiki/CGI.pm:467 ../IkiWiki/CGI.pm:477
#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #: ../IkiWiki/CGI.pm:511 ../IkiWiki/CGI.pm:555
#, perl-format #, perl-format
msgid "editing %s" msgid "editing %s"
msgstr "redigerer %s" msgstr "redigerer %s"
#: ../IkiWiki/CGI.pm:643 #: ../IkiWiki/CGI.pm:644
msgid "You are banned." msgid "You are banned."
msgstr "Du er banlyst." msgstr "Du er banlyst."
#: ../IkiWiki/Plugin/aggregate.pm:72 #: ../IkiWiki/Plugin/aggregate.pm:101
#, perl-format #, perl-format
msgid "missing %s parameter" msgid "missing %s parameter"
msgstr "mangler parametren %s" msgstr "mangler parametren %s"
#: ../IkiWiki/Plugin/aggregate.pm:100 #: ../IkiWiki/Plugin/aggregate.pm:128
msgid "new feed" msgid "new feed"
msgstr "ny fødning" msgstr "ny fødning"
#: ../IkiWiki/Plugin/aggregate.pm:114 #: ../IkiWiki/Plugin/aggregate.pm:142
msgid "posts" msgid "posts"
msgstr "indlæg" msgstr "indlæg"
#: ../IkiWiki/Plugin/aggregate.pm:116 #: ../IkiWiki/Plugin/aggregate.pm:144
msgid "new" msgid "new"
msgstr "nyt" msgstr "nyt"
#: ../IkiWiki/Plugin/aggregate.pm:232 #: ../IkiWiki/Plugin/aggregate.pm:309
#, perl-format #, perl-format
msgid "expiring %s (%s days old)" msgid "expiring %s (%s days old)"
msgstr "udløber %s (%s dage gammel)" msgstr "udløber %s (%s dage gammel)"
#: ../IkiWiki/Plugin/aggregate.pm:239 #: ../IkiWiki/Plugin/aggregate.pm:316
#, perl-format #, perl-format
msgid "expiring %s" msgid "expiring %s"
msgstr "udløber %s" msgstr "udløber %s"
#: ../IkiWiki/Plugin/aggregate.pm:265 #: ../IkiWiki/Plugin/aggregate.pm:345
#, perl-format #, perl-format
msgid "processed ok at %s" msgid "processed ok at %s"
msgstr "korrekt dannet ved %s" msgstr "korrekt dannet ved %s"
#: ../IkiWiki/Plugin/aggregate.pm:270 #: ../IkiWiki/Plugin/aggregate.pm:349
#, perl-format #, perl-format
msgid "checking feed %s ..." msgid "checking feed %s ..."
msgstr "undersøger fødning %s ..." msgstr "undersøger fødning %s ..."
#: ../IkiWiki/Plugin/aggregate.pm:275 #: ../IkiWiki/Plugin/aggregate.pm:354
#, perl-format #, perl-format
msgid "could not find feed at %s" msgid "could not find feed at %s"
msgstr "kunne ikke finde fødning ved %s" msgstr "kunne ikke finde fødning ved %s"
#: ../IkiWiki/Plugin/aggregate.pm:290 #: ../IkiWiki/Plugin/aggregate.pm:369
msgid "feed not found" msgid "feed not found"
msgstr "fødning ikke fundet" msgstr "fødning ikke fundet"
#: ../IkiWiki/Plugin/aggregate.pm:301 #: ../IkiWiki/Plugin/aggregate.pm:380
#, perl-format #, perl-format
msgid "(invalid UTF-8 stripped from feed)" msgid "(invalid UTF-8 stripped from feed)"
msgstr "(defekt UTF-8 fjernet fra fødning)" msgstr "(defekt UTF-8 fjernet fra fødning)"
#: ../IkiWiki/Plugin/aggregate.pm:307 #: ../IkiWiki/Plugin/aggregate.pm:386
#, perl-format #, perl-format
msgid "(feed entities escaped)" msgid "(feed entities escaped)"
msgstr "(fødningselementer omgået (escaped))" msgstr "(fødningselementer omgået (escaped))"
#: ../IkiWiki/Plugin/aggregate.pm:313 #: ../IkiWiki/Plugin/aggregate.pm:392
msgid "feed crashed XML::Feed!" msgid "feed crashed XML::Feed!"
msgstr "fødning fik XML::Feed til at bryde sammen!" msgstr "fødning fik XML::Feed til at bryde sammen!"
#: ../IkiWiki/Plugin/aggregate.pm:387 #: ../IkiWiki/Plugin/aggregate.pm:466
#, perl-format #, perl-format
msgid "creating new page %s" msgid "creating new page %s"
msgstr "opretter ny side %s" msgstr "opretter ny side %s"
@ -203,29 +202,29 @@ msgstr "Ændring af størrelse mislykkedes: %s"
msgid "failed to determine size of image %s" msgid "failed to determine size of image %s"
msgstr "Vurdering af størrelse på billede mislykkedes: %s" msgstr "Vurdering af størrelse på billede mislykkedes: %s"
#: ../IkiWiki/Plugin/inline.pm:42 #: ../IkiWiki/Plugin/inline.pm:44
msgid "Must specify url to wiki with --url when using --rss or --atom" msgid "Must specify url to wiki with --url when using --rss or --atom"
msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes" msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes"
#: ../IkiWiki/Plugin/inline.pm:135 #: ../IkiWiki/Plugin/inline.pm:136
#, perl-format #, perl-format
msgid "unknown sort type %s" msgid "unknown sort type %s"
msgstr "ukendt sorteringsform %s" msgstr "ukendt sorteringsform %s"
#: ../IkiWiki/Plugin/inline.pm:200 #: ../IkiWiki/Plugin/inline.pm:201
msgid "Add a new post titled:" msgid "Add a new post titled:"
msgstr "Tilføj nyt indlæg med følgende titel:" msgstr "Tilføj nyt indlæg med følgende titel:"
#: ../IkiWiki/Plugin/inline.pm:216 #: ../IkiWiki/Plugin/inline.pm:217
#, perl-format #, perl-format
msgid "nonexistant template %s" msgid "nonexistant template %s"
msgstr "ikke-eksisterende skabelon: %s" msgstr "ikke-eksisterende skabelon: %s"
#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 #: ../IkiWiki/Plugin/inline.pm:250 ../IkiWiki/Render.pm:99
msgid "Discussion" msgid "Discussion"
msgstr "Diskussion" msgstr "Diskussion"
#: ../IkiWiki/Plugin/inline.pm:463 #: ../IkiWiki/Plugin/inline.pm:468
msgid "RPC::XML::Client not found, not pinging" msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client ikke fundet, pinger ikke" msgstr "RPC::XML::Client ikke fundet, pinger ikke"
@ -245,15 +244,15 @@ msgstr ""
"Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
"mislykkedes" "mislykkedes"
#: ../IkiWiki/Plugin/meta.pm:119 #: ../IkiWiki/Plugin/meta.pm:132
msgid "stylesheet not found" msgid "stylesheet not found"
msgstr "stilsnit (stylesheet) ikke fundet" msgstr "stilsnit (stylesheet) ikke fundet"
#: ../IkiWiki/Plugin/meta.pm:143 #: ../IkiWiki/Plugin/meta.pm:158
msgid "redir page not found" msgid "redir page not found"
msgstr "henvisningsside ikke fundet" msgstr "henvisningsside ikke fundet"
#: ../IkiWiki/Plugin/meta.pm:156 #: ../IkiWiki/Plugin/meta.pm:171
msgid "redir cycle is not allowed" msgid "redir cycle is not allowed"
msgstr "ring af henvisninger er ikke tilladt" msgstr "ring af henvisninger er ikke tilladt"
@ -517,47 +516,47 @@ msgstr "(kan ikke omskiftes i et smugkig)"
msgid "getctime not implemented" msgid "getctime not implemented"
msgstr "getctime ikke implementeret" msgstr "getctime ikke implementeret"
#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #: ../IkiWiki/Render.pm:274 ../IkiWiki/Render.pm:295
#, perl-format #, perl-format
msgid "skipping bad filename %s" msgid "skipping bad filename %s"
msgstr "udelader forkert filnavn %s" msgstr "udelader forkert filnavn %s"
#: ../IkiWiki/Render.pm:343 #: ../IkiWiki/Render.pm:350
#, perl-format #, perl-format
msgid "removing old page %s" msgid "removing old page %s"
msgstr "fjerner gammel side %s" msgstr "fjerner gammel side %s"
#: ../IkiWiki/Render.pm:384 #: ../IkiWiki/Render.pm:391
#, perl-format #, perl-format
msgid "scanning %s" msgid "scanning %s"
msgstr "gennemlæser %s" msgstr "gennemlæser %s"
#: ../IkiWiki/Render.pm:389 #: ../IkiWiki/Render.pm:396
#, perl-format #, perl-format
msgid "rendering %s" msgid "rendering %s"
msgstr "danner %s" msgstr "danner %s"
#: ../IkiWiki/Render.pm:410 #: ../IkiWiki/Render.pm:417
#, perl-format #, perl-format
msgid "rendering %s, which links to %s" msgid "rendering %s, which links to %s"
msgstr "danner %s, som henviser til %s" msgstr "danner %s, som henviser til %s"
#: ../IkiWiki/Render.pm:431 #: ../IkiWiki/Render.pm:438
#, perl-format #, perl-format
msgid "rendering %s, which depends on %s" msgid "rendering %s, which depends on %s"
msgstr "danner %s, som afhænger af %s" msgstr "danner %s, som afhænger af %s"
#: ../IkiWiki/Render.pm:470 #: ../IkiWiki/Render.pm:477
#, perl-format #, perl-format
msgid "rendering %s, to update its backlinks" msgid "rendering %s, to update its backlinks"
msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
#: ../IkiWiki/Render.pm:482 #: ../IkiWiki/Render.pm:489
#, perl-format #, perl-format
msgid "removing %s, no longer rendered by %s" msgid "removing %s, no longer rendered by %s"
msgstr "fjerner %s, ikke længere dannet af %s" msgstr "fjerner %s, ikke længere dannet af %s"
#: ../IkiWiki/Render.pm:508 #: ../IkiWiki/Render.pm:515
#, perl-format #, perl-format
msgid "ikiwiki: cannot render %s" msgid "ikiwiki: cannot render %s"
msgstr "ikiwiki: kan ikke danne %s" msgstr "ikiwiki: kan ikke danne %s"
@ -621,15 +620,15 @@ msgstr "Korrekt bygget %s"
msgid "usage: ikiwiki [options] source dest" msgid "usage: ikiwiki [options] source dest"
msgstr "brug: ikiwiki [valg] kilde mål" msgstr "brug: ikiwiki [valg] kilde mål"
#: ../ikiwiki.in:81 #: ../ikiwiki.in:82
msgid "usage: --set var=value" msgid "usage: --set var=value"
msgstr "brug: --set var=værdi" msgstr "brug: --set var=værdi"
#: ../IkiWiki.pm:127 #: ../IkiWiki.pm:130
msgid "Must specify url to wiki with --url when using --cgi" msgid "Must specify url to wiki with --url when using --cgi"
msgstr "Skal angive url til wiki med --url når der bruges --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi"
#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 #: ../IkiWiki.pm:217 ../IkiWiki.pm:218
msgid "Error" msgid "Error"
msgstr "Fejl" msgstr "Fejl"
@ -637,7 +636,7 @@ msgstr "Fejl"
#. translators: preprocessor directive name, #. translators: preprocessor directive name,
#. translators: the second a page name, the #. translators: the second a page name, the
#. translators: third a number. #. translators: third a number.
#: ../IkiWiki.pm:750 #: ../IkiWiki.pm:772
#, perl-format #, perl-format
msgid "%s preprocessing loop detected on %s at depth %i" msgid "%s preprocessing loop detected on %s at depth %i"
msgstr "%s forudberegningssløkke fundet på %s ved dybde %i" msgstr "%s forudberegningssløkke fundet på %s ved dybde %i"

36
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-02-09 23:08-0500\n" "POT-Creation-Date: 2008-02-11 22:46-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -48,7 +48,7 @@ msgstr ""
#: ../IkiWiki/CGI.pm:384 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/CGI.pm:384 ../IkiWiki/Plugin/brokenlinks.pm:24
#: ../IkiWiki/Plugin/inline.pm:242 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/inline.pm:242 ../IkiWiki/Plugin/opendiscussion.pm:17
#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95
#: ../IkiWiki/Render.pm:176 #: ../IkiWiki/Render.pm:172
msgid "discussion" msgid "discussion"
msgstr "" msgstr ""
@ -240,15 +240,15 @@ msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:119 #: ../IkiWiki/Plugin/meta.pm:132
msgid "stylesheet not found" msgid "stylesheet not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:143 #: ../IkiWiki/Plugin/meta.pm:158
msgid "redir page not found" msgid "redir page not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:156 #: ../IkiWiki/Plugin/meta.pm:171
msgid "redir cycle is not allowed" msgid "redir cycle is not allowed"
msgstr "" msgstr ""
@ -512,47 +512,47 @@ msgstr ""
msgid "getctime not implemented" msgid "getctime not implemented"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:274 ../IkiWiki/Render.pm:295 #: ../IkiWiki/Render.pm:279 ../IkiWiki/Render.pm:300
#, perl-format #, perl-format
msgid "skipping bad filename %s" msgid "skipping bad filename %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:350 #: ../IkiWiki/Render.pm:355
#, perl-format #, perl-format
msgid "removing old page %s" msgid "removing old page %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:391 #: ../IkiWiki/Render.pm:396
#, perl-format #, perl-format
msgid "scanning %s" msgid "scanning %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:396 #: ../IkiWiki/Render.pm:401
#, perl-format #, perl-format
msgid "rendering %s" msgid "rendering %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:417 #: ../IkiWiki/Render.pm:422
#, perl-format #, perl-format
msgid "rendering %s, which links to %s" msgid "rendering %s, which links to %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:438 #: ../IkiWiki/Render.pm:443
#, perl-format #, perl-format
msgid "rendering %s, which depends on %s" msgid "rendering %s, which depends on %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:477 #: ../IkiWiki/Render.pm:482
#, perl-format #, perl-format
msgid "rendering %s, to update its backlinks" msgid "rendering %s, to update its backlinks"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:489 #: ../IkiWiki/Render.pm:494
#, perl-format #, perl-format
msgid "removing %s, no longer rendered by %s" msgid "removing %s, no longer rendered by %s"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:515 #: ../IkiWiki/Render.pm:520
#, perl-format #, perl-format
msgid "ikiwiki: cannot render %s" msgid "ikiwiki: cannot render %s"
msgstr "" msgstr ""
@ -616,15 +616,15 @@ msgstr ""
msgid "usage: ikiwiki [options] source dest" msgid "usage: ikiwiki [options] source dest"
msgstr "" msgstr ""
#: ../ikiwiki.in:81 #: ../ikiwiki.in:82
msgid "usage: --set var=value" msgid "usage: --set var=value"
msgstr "" msgstr ""
#: ../IkiWiki.pm:129 #: ../IkiWiki.pm:115
msgid "Must specify url to wiki with --url when using --cgi" msgid "Must specify url to wiki with --url when using --cgi"
msgstr "" msgstr ""
#: ../IkiWiki.pm:198 ../IkiWiki.pm:199 #: ../IkiWiki.pm:184 ../IkiWiki.pm:185
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -632,7 +632,7 @@ msgstr ""
#. translators: preprocessor directive name, #. translators: preprocessor directive name,
#. translators: the second a page name, the #. translators: the second a page name, the
#. translators: third a number. #. translators: third a number.
#: ../IkiWiki.pm:752 #: ../IkiWiki.pm:735
#, perl-format #, perl-format
msgid "%s preprocessing loop detected on %s at depth %i" msgid "%s preprocessing loop detected on %s at depth %i"
msgstr "" msgstr ""