X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..b37dc9c9261a030faaf00d6ce5e84aa6c9fb64b4:/IkiWiki/Plugin/shortcut.pm
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 9479306a8..fb096ecbd 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::shortcut;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
@@ -13,21 +13,27 @@ sub import { #{{{
sub checkconfig () { #{{{
# Preprocess the shortcuts page to get all the available shortcuts
# defined before other pages are rendered.
- IkiWiki::preprocess("shortcuts", "shortcuts",
- readfile(srcfile("shortcuts.mdwn")));
+ my $srcfile=eval {srcfile("shortcuts.mdwn")};
+ if (! defined $srcfile) {
+ error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+ }
+ IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
} # }}}
sub preprocess_shortcut (@) { #{{{
my %params=@_;
if (! defined $params{name} || ! defined $params{url}) {
- return "[[".gettext("shortcut missing name or url parameter")."]]";
+ return "[[shortcut ".gettext("missing name or url parameter")."]]";
}
hook(type => "preprocess", no_override => 1, id => $params{name},
call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
- return sprintf(gettext("shortcut %s points to %s"), $params{name}, $params{url});
+ #translators: This is used to display what shortcuts are defined.
+ #translators: First parameter is the name of the shortcut, the second
+ #translators: is an URL.
+ return sprintf(gettext("shortcut %s points to %s"), $params{name}, $params{url});
} # }}}
sub shortcut_expand ($$@) { #{{{
@@ -51,6 +57,11 @@ sub shortcut_expand ($$@) { #{{{
my $encoded_text=$text;
$encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+ $url=~s{\%([sS])}{
+ $1 eq 's' ? $encoded_text : $text
+ }eg;
+
+ $text=~s/_/ /g;
if (defined $desc) {
$desc=~s/\%s/$text/g;
}
@@ -58,7 +69,6 @@ sub shortcut_expand ($$@) { #{{{
$desc=$text;
}
- $url=~s/\%s/$encoded_text/g;
return "$desc";
} #}}}