supress redef warning

[ikiwiki.git] / IkiWiki / Plugin / template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 09570560420e649a5e1a1e3f588f146f28aa5579..16a3c1e37e49f406861b1b2526ba2898b2ff92fd 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -16,17 +16,16 @@ sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
-               return "[[template missing id parameter]]"
+               return "[[".gettext("template missing id parameter")."]]";
        }
 
        my $template_page="templates/$params{id}";
        add_depends($params{page}, $template_page);
 
        my $template_file=$pagesources{$template_page};
-       return "[[template ".
-              htmllink($params{page}, $params{destpage}, $template_page).
-              " not found]]"
-               unless defined $template_file;
+       return sprintf(gettext("template %s not found"),
+               htmllink($params{page}, $params{destpage}, $template_page))
+                       unless defined $template_file;
 
        my $template;
        eval {
@@ -43,7 +42,7 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
-               return "[[template failed to process: $@]]";
+               return "[[".gettext("template failed to process:")." $@]]";
        }
 
        foreach my $param (keys %params) {
@@ -51,7 +50,8 @@ sub preprocess (@) { #{{{
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
-               $template->output);
+               IkiWiki::filter($params{page},
+               $template->output));
 } # }}}
 
 1