Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index f9ec90d8791f8b5e6aa422ceb527fe272bfea9df..440fca33be02cc6cf91ff9072c725d936571b334 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -3,18 +3,27 @@ package IkiWiki::Plugin::testpagespec;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

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

        hook(type => "preprocess", id => "testpagespec", call => \&preprocess);
        hook(type => "preprocess", id => "testpagespec", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        
        foreach my $param (qw{match pagespec}) {
                if (! exists $params{$param}) {
        my %params=@_;
        
        foreach my $param (qw{match pagespec}) {
                if (! exists $params{$param}) {

-                       return "[[testpagespec $param parameter is required]]";
+                       error sprintf(gettext("%s parameter is required"), $param);

                }
        }
 
                }
        }
 


@@ -28,6 +37,6 @@ sub preprocess (@) { #{{{
        else {
                return "no match: $ret";
        }
        else {
                return "no match: $ret";
        }

-} # }}}
+}

 
 1
 
 1