* Apply a patch from Carl Worth allowing a class attribute to be passed

[git.ikiwiki.info.git] / IkiWiki / Plugin / shortcut.pm

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 9479306a8c37d4558b05cead14ee47119c9477e9..ca527ce3ca533a12ed4dc2bb3c1ae73a148383db 100644 (file)
--- 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);
@@ -21,13 +21,16 @@ 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 <i>%s</i>"), $params{name}, $params{url});
 } # }}}
 
 sub shortcut_expand ($$@) { #{{{
@@ -50,7 +53,8 @@ sub shortcut_expand ($$@) { #{{{
        my $text=join(" ", @params);
        my $encoded_text=$text;
        $encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
-       
+
+       $text=~s/_/ /g;
        if (defined $desc) {
                $desc=~s/\%s/$text/g;
        }