typo

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 0e7769c67c7f22f36b9b1e857660cc9b8ba0ad9c..0cedbe447480f7f7e01a24476c1cc40e856bccc5 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,37 +3,59 @@ package IkiWiki::Plugin::shortcut;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "shortcut", call => \&getsetup);

        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
        hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
        hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);

-} #}}}
+}

 
 

-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")));
-} # }}}
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}

 
 

-sub preprocess_shortcut (@) { #{{{
+sub checkconfig () {
+       if (defined $config{srcdir} && length $config{srcdir}) {
+               # Preprocess the shortcuts page to get all the available shortcuts
+               # defined before other pages are rendered.
+               my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);
+               if (! defined $srcfile) {
+                       $srcfile=srcfile("shortcuts.mdwn", 1);
+               }
+               if (! defined $srcfile) {
+                       print STDERR sprintf(gettext("shortcut plugin will not work without %s"),
+                               "shortcuts.".$config{default_pageext})."\n";
+               }
+               else {
+                       IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
+               }
+       }
+}
+
+sub preprocess_shortcut (@) {

        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {
        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {

-               return "[[shortcut ".gettext("missing name or url parameter")."]]";
+               error gettext("missing name or url parameter");

        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},
        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},

+               shortcut => 1,

                call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
        #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});
                call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
        #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 ($$@) { #{{{
+sub shortcut_expand ($$@) {

        my $url=shift;
        my $desc=shift;
        my %params=@_;
        my $url=shift;
        my $desc=shift;
        my %params=@_;


@@ -59,6 +81,9 @@ sub shortcut_expand ($$@) { #{{{
        }eg;
 
        $text=~s/_/ /g;
        }eg;
 
        $text=~s/_/ /g;

+       if (defined $params{desc}) {
+               $desc=$params{desc};
+       }

        if (defined $desc) {
                $desc=~s/\%s/$text/g;
        }
        if (defined $desc) {
                $desc=~s/\%s/$text/g;
        }


@@ -67,6 +92,6 @@ sub shortcut_expand ($$@) { #{{{
        }
 
        return "<a href=\"$url\">$desc</a>";
        }
 
        return "<a href=\"$url\">$desc</a>";

-} #}}}
+}

 
 1
 
 1