Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index 63f6bf5db59b7ad94987ca620fcda7ae837e973d..70378cf1b7102cf383e6839cb6dfd4d64ddf2a02 100644 (file)
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 use File::Find;
 
 sub import { #{{{
 use File::Find;
 
 sub import { #{{{


@@ -29,7 +29,7 @@ sub preprocess (@) { #{{{
 
        my $grmfile = '/usr/share/polygen/ita/polygen.grm';
        if (! -d '/usr/share/polygen') {
 
        my $grmfile = '/usr/share/polygen/ita/polygen.grm';
        if (! -d '/usr/share/polygen') {

-               return "[[".gettext("polygen not installed")."]]";
+               error gettext("polygen not installed");

        }
        find({wanted => sub {
                        if (substr($File::Find::name, -length($grammar)) eq $grammar) {
        }
        find({wanted => sub {
                        if (substr($File::Find::name, -length($grammar)) eq $grammar) {


@@ -48,7 +48,7 @@ sub preprocess (@) { #{{{
        }
 
        if ($?) {
        }
 
        if ($?) {

-               $res="[[".gettext("polygen failed")."]]";
+               error gettext("command failed");

        }
 
        # Strip trailing spaces and newlines so that we flow well with the
        }
 
        # Strip trailing spaces and newlines so that we flow well with the