web commit by http://adam.shand.net/

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index d09d5879d27b5f5c640bedf259b65a0ee1e426ec..7b89bf879cdf48be4421a205399cb27a07a489f8 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -21,18 +21,21 @@ sub preprocess_shortcut (@) { #{{{
        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {
-               return "[[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{name}, $params{url}, @_) });
+               call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
-       return "shortcut $params{name} points to $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 ($$@) { #{{{
-       my $name=shift;
        my $url=shift;
+       my $desc=shift;
        my %params=@_;
 
        # Get params in original order.
@@ -51,8 +54,16 @@ sub shortcut_expand ($$@) { #{{{
        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;
+       }
+       else {
+               $desc=$text;
+       }
+
        $url=~s/\%s/$encoded_text/g;
-       return "<a href=\"$url\">$text</a>";
+       return "<a href=\"$url\">$desc</a>";
 } #}}}
 
 1