diff options
33 files changed, 228 insertions, 153 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index c0f5deab6..c15ec3822 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -20,7 +20,7 @@ use Exporter q{import}; our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match bestlink htmllink readfile writefile pagetype srcfile pagename displaytime will_render gettext urlto targetpage - add_underlay + add_underlay pagetitle titlepage linkpage %config %links %pagestate %renderedfiles %pagesources %destsources); our $VERSION = 2.00; # plugin interface version, next is ikiwiki version diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 8044f1ed4..c7bd1875a 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -228,7 +228,7 @@ sub preprocess (@) { #{{{ $feed->{name}=$name; $feed->{sourcepage}=$params{page}; $feed->{url}=$params{url}; - my $dir=exists $params{dir} ? $params{dir} : $params{page}."/".IkiWiki::titlepage($params{name}); + my $dir=exists $params{dir} ? $params{dir} : $params{page}."/".titlepage($params{name}); $dir=~s/^\/+//; ($dir)=$dir=~/$config{wiki_file_regexp}/; $feed->{dir}=$dir; @@ -559,7 +559,7 @@ sub add_page (@) { #{{{ $feed->{newposts}++; # assign it an unused page - my $page=IkiWiki::titlepage($params{title}); + my $page=titlepage($params{title}); # escape slashes and periods in title so it doesn't specify # directory name or trigger ".." disallowing code. $page=~s!([/.])!"__".ord($1)."__"!eg; diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 6214df7f3..837992841 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -181,8 +181,7 @@ sub formbuilder (@) { #{{{ } } - $filename=IkiWiki::linkpage( - IkiWiki::possibly_foolish_untaint( + $filename=linkpage(IkiWiki::possibly_foolish_untaint( attachment_location($form->field('page')). IkiWiki::basename($filename))); if (IkiWiki::file_pruned($filename, $config{srcdir})) { diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm index 3f17df4a3..7881becd5 100644 --- a/IkiWiki/Plugin/camelcase.pm +++ b/IkiWiki/Plugin/camelcase.pm @@ -42,7 +42,7 @@ sub linkify (@) { #{{{ my $destpage=$params{destpage}; $params{content}=~s{$link_regexp}{ - htmllink($page, $destpage, IkiWiki::linkpage($1)) + htmllink($page, $destpage, linkpage($1)) }eg; return $params{content}; @@ -54,7 +54,7 @@ sub scan (@) { #{{{ my $content=$params{content}; while ($content =~ /$link_regexp/g) { - push @{$links{$page}}, IkiWiki::linkpage($1); + push @{$links{$page}}, linkpage($1); } } diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 84c28a9d0..846b4e7c8 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -54,7 +54,7 @@ sub preprocess (@) { #{{{ error gettext("match not specified") } - my $link=IkiWiki::linkpage($params{template}); + my $link=linkpage($params{template}); $pagestate{$params{page}}{edittemplate}{$params{match}}=$link; return "" if ($params{silent} && IkiWiki::yesno($params{silent})); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 8efef3fc8..e0f33ef31 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -119,7 +119,7 @@ sub sessioncgi () { #{{{ my $session=shift; if ($q->param('do') eq 'blog') { - my $page=IkiWiki::titlepage(decode_utf8($q->param('title'))); + my $page=titlepage(decode_utf8($q->param('title'))); $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs # if the page already exists, munge it to be unique my $from=$q->param('from'); diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm index 957355643..0638d4bdd 100644 --- a/IkiWiki/Plugin/link.pm +++ b/IkiWiki/Plugin/link.pm @@ -69,11 +69,11 @@ sub linkify (@) { #{{{ defined $2 ? ( $1 ? "[[$2|$3".($4 ? "#$4" : "")."]]" - : htmllink($page, $destpage, IkiWiki::linkpage($3), - anchor => $4, linktext => IkiWiki::pagetitle($2))) + : htmllink($page, $destpage, linkpage($3), + anchor => $4, linktext => pagetitle($2))) : ( $1 ? "[[$3".($4 ? "#$4" : "")."]]" - : htmllink($page, $destpage, IkiWiki::linkpage($3), + : htmllink($page, $destpage, linkpage($3), anchor => $4)) }eg; @@ -86,7 +86,7 @@ sub scan (@) { #{{{ my $content=$params{content}; while ($content =~ /(?<!\\)$link_regexp/g) { - push @{$links{$page}}, IkiWiki::linkpage($2); + push @{$links{$page}}, linkpage($2); } } # }}} @@ -99,8 +99,8 @@ sub renamepage (@) { #{{{ $params{content} =~ s{(?<!\\)$link_regexp}{ my $linktext=$2; my $link=$linktext; - if (bestlink($page, IkiWiki::linkpage($linktext)) eq $old) { - $link=IkiWiki::pagetitle($new, 1); + if (bestlink($page, linkpage($linktext)) eq $old) { + $link=pagetitle($new, 1); $link=~s/ /_/g; if ($linktext =~ m/.*\/*?[A-Z]/) { # preserve leading cap of last component diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index 6f8ddb06a..fc8927ccb 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -84,7 +84,7 @@ sub preprocess (@) { #{{{ foreach my $plugin (@pluginlist) { $result .= '<li class="listdirectives">'; - my $link=IkiWiki::linkpage($config{directive_description_dir}."/".$plugin); + my $link=linkpage($config{directive_description_dir}."/".$plugin); add_depends($params{page}, $link); $result .= htmllink($params{page}, $params{destpage}, $link); $result .= '</li>'; diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index b2c85c892..8d444109f 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -273,7 +273,7 @@ sub match { #{{{ $val=$pagestate{$page}{meta}{$field}; } elsif ($field eq 'title') { - $val = IkiWiki::pagetitle($page); + $val = pagetitle($page); } if (defined $val) { diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm index 4525145d6..a8b3641e9 100644 --- a/IkiWiki/Plugin/parentlinks.pm +++ b/IkiWiki/Plugin/parentlinks.pm @@ -44,7 +44,7 @@ sub parentlinks ($) { #{{{ "height_$height" => 1, }; $path.="/".$dir; - $title=IkiWiki::pagetitle($dir); + $title=pagetitle($dir); $i++; } return @ret; diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index bef0e7085..eb23b184b 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -114,7 +114,7 @@ sub cgi ($) { #{{{ sub store ($$$) { #{{{ my $change=shift; - my $page="$config{recentchangespage}/change_".IkiWiki::titlepage($change->{rev}); + my $page="$config{recentchangespage}/change_".titlepage($change->{rev}); # Optimisation to avoid re-writing pages. Assumes commits never # change (or that any changes are not important). @@ -132,11 +132,11 @@ sub store ($$$) { #{{{ page => $_->{page} ). "\">". - IkiWiki::pagetitle($_->{page}). + pagetitle($_->{page}). "</a>" } else { - $_->{link} = IkiWiki::pagetitle($_->{page}); + $_->{link} = pagetitle($_->{page}); } $_->{baseurl}="$config{url}/" if length $config{url}; diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index 91a66cb6e..c8d76368e 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -110,7 +110,7 @@ sub removal_confirm ($$@) { #{{{ my ($f, $buttons)=confirmation_form($q, $session); $f->title(sprintf(gettext("confirm removal of %s"), - join(", ", map { IkiWiki::pagetitle($_) } @pages))); + join(", ", map { pagetitle($_) } @pages))); $f->field(name => "page", type => "hidden", value => \@pages, force => 1); if (defined $attachment) { $f->field(name => "attachment", type => "hidden", diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 0ea77ec64..3ee457ff0 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -98,7 +98,7 @@ sub rename_form ($$$) { #{{{ error($@) if $@; my $f = CGI::FormBuilder->new( name => "rename", - title => sprintf(gettext("rename %s"), IkiWiki::pagetitle($page)), + title => sprintf(gettext("rename %s"), pagetitle($page)), header => 0, charset => "utf-8", method => 'POST', @@ -111,7 +111,7 @@ sub rename_form ($$$) { #{{{ $f->field(name => "do", type => "hidden", value => "rename", force => 1); $f->field(name => "page", type => "hidden", value => $page, force => 1); - $f->field(name => "new_name", value => IkiWiki::pagetitle($page), size => 60); + $f->field(name => "new_name", value => pagetitle($page), size => 60); if (!$q->param("attachment")) { # insert the standard extensions my @page_types; @@ -267,7 +267,7 @@ sub sessioncgi ($$) { #{{{ # performed in check_canrename later. my $src=$q->param("page"); my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src}); - my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name"))); + my $dest=IkiWiki::possibly_foolish_untaint(titlepage($q->param("new_name"))); my $destfile=$dest; if (! $q->param("attachment")) { my $type=$q->param('type'); diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index aeef54ab3..e40f4888c 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -73,7 +73,7 @@ sub index (@) { #{{{ my $db=xapiandb(); my $doc=Search::Xapian::Document->new(); - my $caption=IkiWiki::pagetitle($params{page}); + my $caption=pagetitle($params{page}); my $title; if (exists $pagestate{$params{page}}{meta} && exists $pagestate{$params{page}}{meta}{title}) { diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index bf53209fc..158657507 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -75,7 +75,7 @@ sub preprocess_tag (@) { #{{{ delete $params{preview}; foreach my $tag (keys %params) { - $tag=IkiWiki::linkpage($tag); + $tag=linkpage($tag); $tags{$page}{$tag}=1; # hidden WikiLink push @{$links{$page}}, tagpage($tag); @@ -91,14 +91,14 @@ sub preprocess_taglink (@) { #{{{ my %params=@_; return join(" ", map { if (/(.*)\|(.*)/) { - my $tag=IkiWiki::linkpage($2); + my $tag=linkpage($2); $tags{$params{page}}{$tag}=1; push @{$links{$params{page}}}, tagpage($tag); return taglink($params{page}, $params{destpage}, $tag, - linktext => IkiWiki::pagetitle($1)); + linktext => pagetitle($1)); } else { - my $tag=IkiWiki::linkpage($_); + my $tag=linkpage($_); $tags{$params{page}}{$tag}=1; push @{$links{$params{page}}}, tagpage($tag); return taglink($params{page}, $params{destpage}, $tag); diff --git a/debian/changelog b/debian/changelog index 3f6b44681..23dff470b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low scrubber acting on a set of pages. * Expand usage message and add --help. Closes: #500344 * Beautify urls used in various places. (smcv) + * Export pagetitle, titlepage, linkpage. -- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400 diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index e9993f512..89e12e6c2 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -411,7 +411,7 @@ I'm sure that this is documented somewhere but I've ransacked the wiki and I can > The default `wiki_file_regexp` matches filenames containing only > `[-[:alnum:]_.:/+]` > -> The IkiWiki::titlepage() function will convert freeform text to a valid +> The titlepage() function will convert freeform text to a valid > page name. See [[todo/should_use_a_standard_encoding_for_utf_chars_in_filenames]] > for an example. --[[Joey]] diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 1cdea6a77..0e4f2fd6f 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -627,6 +627,23 @@ a type that ikiwiki knowns how to htmlize. Otherwise, returns undef. Given the name of a source file, returns the name of the wiki page that corresponds to that file. +#### `pagetitle($)` + +Give the name of a wiki page, returns a version suitable to be displayed as +the page's title. This is accomplished by de-escaping escaped characters in +the page name. "_" is replaced with a space, and '__NN__' is replaced by +the UTF character with code NN. + +#### `titlepage($)` + +This performs the inverse of `pagetitle`, ie, it converts a page title into +a wiki page name. + +#### `linkpage($)` + +This converts text that could have been entered by the user as a +[[WikiLink]] into a wiki page name. + #### `srcfile($;$)` Given the name of a source file in the wiki, searches for the file in diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn index cbf969471..304b39620 100644 --- a/doc/todo/wikiwyg/discussion.mdwn +++ b/doc/todo/wikiwyg/discussion.mdwn @@ -90,6 +90,7 @@ changes.diff: I have to use the IkiWiki package instead of IkiWiki::Plugin::Wikiwyg? Or would a better approach be to just copy that function into the Wikiwyg plugin? * You can just call `IkiWiki::pagetitle()`. + > Note: pagetitle is now exported. wikiwyg.tar.gz @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -131,7 +131,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "готово" @@ -163,11 +163,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -544,12 +544,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -908,19 +908,23 @@ msgstr "успешно генериране на %s" msgid "usage: ikiwiki [options] source dest" msgstr "формат: ikiwiki [опции] източник местоназначение" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -128,7 +128,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "hotovo" @@ -160,11 +160,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -533,12 +533,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -889,19 +889,23 @@ msgstr "%s byl úspěšně vytvořen" msgid "usage: ikiwiki [options] source dest" msgstr "použití: ikiwiki [volby] zdroj cíl" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "znovu vytvářím wiki..." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-0400\n" "PO-Revision-Date: 2008-08-11 01:04+0200\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Language-Team: None\n" @@ -132,7 +132,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "færdig" @@ -162,11 +162,11 @@ msgstr "der er allerede en side ved navn %s" msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "vedhæftningsoplægning" @@ -529,11 +529,11 @@ msgstr "ugyldigt navn" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -881,19 +881,23 @@ msgstr "Korrekt bygget %s" msgid "usage: ikiwiki [options] source dest" msgstr "brug: ikiwiki [valg] kilde mål" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 2.40\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-0400\n" "PO-Revision-Date: 2008-03-03 21:22+0100\n" "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "fertig" @@ -160,11 +160,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -531,11 +531,11 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s exisitiert nicht." @@ -884,19 +884,23 @@ msgstr "%s wurde erfolgreich erstellt" msgid "usage: ikiwiki [options] source dest" msgstr "Benutzung: ikiwiki [Optionen] Quelle Ziel" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "Benutzung: --set Variable=Wert" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-0400\n" "PO-Revision-Date: 2008-03-06 11:07+0100\n" "Last-Translator: Víctor Moral <victor@taquiones.net>\n" "Language-Team: Spanish <es@li.org>\n" @@ -129,7 +129,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "completado" @@ -161,11 +161,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -533,11 +533,11 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." @@ -889,19 +889,23 @@ msgstr "creado con éxito el programa envoltorio %s" msgid "usage: ikiwiki [options] source dest" msgstr "uso: ikiwiki [opciones] origen destino" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-0400\n" "PO-Revision-Date: 2008-04-29 17:46+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -132,7 +132,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "Terminé" @@ -164,11 +164,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -535,11 +535,11 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -890,19 +890,23 @@ msgstr "%s a été créé avec succès" msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -129,7 +129,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "સંપૂર્ણ" @@ -161,11 +161,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -534,12 +534,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -889,19 +889,23 @@ msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" msgid "usage: ikiwiki [options] source dest" msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4fbe4ce1d..f8796acfe 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:12-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" @@ -129,7 +129,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "" @@ -159,11 +159,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -521,11 +521,11 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -872,19 +872,23 @@ msgstr "" msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -133,7 +133,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "gotowe" @@ -165,11 +165,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -548,12 +548,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -914,19 +914,23 @@ msgstr "pomyślnie utworzono %s" msgid "usage: ikiwiki [options] source dest" msgstr "użycie: ikiwiki [parametry] źródło cel" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -130,7 +130,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "klar" @@ -162,11 +162,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -540,12 +540,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -903,19 +903,23 @@ msgstr "generering av %s lyckades" msgid "usage: ikiwiki [options] source dest" msgstr "användning: ikiwiki [flaggor] källa mål" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 17:55-0400\n" +"POT-Creation-Date: 2008-09-27 14:10-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" @@ -131,7 +131,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:197 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "xong" @@ -163,11 +163,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" msgstr "" @@ -541,12 +541,12 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/recentchanges.pm:100 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -904,19 +904,23 @@ msgstr "%s đã được tạo ra" msgid "usage: ikiwiki [options] source dest" msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" -#: ../ikiwiki.in:89 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:135 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:186 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:189 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." diff --git a/t/linkpage.t b/t/linkpage.t new file mode 100755 index 000000000..8085de153 --- /dev/null +++ b/t/linkpage.t @@ -0,0 +1,13 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 7; + +BEGIN { use_ok("IkiWiki"); } + +is(linkpage("foo bar"), "foo_bar"); +is(linkpage("foo bar baz"), "foo_bar_baz"); +is(linkpage("foo bar/baz"), "foo_bar/baz"); +is(linkpage("foo bar&baz"), "foo_bar__38__baz"); +is(linkpage("foo bar & baz"), "foo_bar___38___baz"); +is(linkpage("foo bar_baz"), "foo_bar_baz"); diff --git a/t/pagetitle.t b/t/pagetitle.t index 37adba144..d9aa62063 100755 --- a/t/pagetitle.t +++ b/t/pagetitle.t @@ -5,9 +5,9 @@ use Test::More tests => 7; BEGIN { use_ok("IkiWiki"); } -is(IkiWiki::pagetitle("foo_bar"), "foo bar"); -is(IkiWiki::pagetitle("foo_bar_baz"), "foo bar baz"); -is(IkiWiki::pagetitle("foo_bar__33__baz"), "foo bar!baz"); -is(IkiWiki::pagetitle("foo_bar__1234__baz"), "foo barӒbaz"); -is(IkiWiki::pagetitle("foo_bar___33___baz"), "foo bar ! baz"); -is(IkiWiki::pagetitle("foo_bar___95___baz"), "foo bar _ baz"); +is(pagetitle("foo_bar"), "foo bar"); +is(pagetitle("foo_bar_baz"), "foo bar baz"); +is(pagetitle("foo_bar__33__baz"), "foo bar!baz"); +is(pagetitle("foo_bar__1234__baz"), "foo barӒbaz"); +is(pagetitle("foo_bar___33___baz"), "foo bar ! baz"); +is(pagetitle("foo_bar___95___baz"), "foo bar _ baz"); diff --git a/t/titlepage.t b/t/titlepage.t index cc56db70c..5df33423e 100755 --- a/t/titlepage.t +++ b/t/titlepage.t @@ -5,9 +5,9 @@ use Test::More tests => 7; BEGIN { use_ok("IkiWiki"); } -is(IkiWiki::titlepage("foo bar"), "foo_bar"); -is(IkiWiki::titlepage("foo bar baz"), "foo_bar_baz"); -is(IkiWiki::titlepage("foo bar/baz"), "foo_bar/baz"); -is(IkiWiki::titlepage("foo bar&baz"), "foo_bar__38__baz"); -is(IkiWiki::titlepage("foo bar & baz"), "foo_bar___38___baz"); -is(IkiWiki::titlepage("foo bar_baz"), "foo_bar__95__baz"); +is(titlepage("foo bar"), "foo_bar"); +is(titlepage("foo bar baz"), "foo_bar_baz"); +is(titlepage("foo bar/baz"), "foo_bar/baz"); +is(titlepage("foo bar&baz"), "foo_bar__38__baz"); +is(titlepage("foo bar & baz"), "foo_bar___38___baz"); +is(titlepage("foo bar_baz"), "foo_bar__95__baz"); |