X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3a3219c0e034cb2ca246774eea64c5c8b9dc5d07..0b977fa22cabf8e1050857412123015c07c30c19:/IkiWiki/Plugin/template.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 095705604..c87ba5102 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -4,7 +4,7 @@ package IkiWiki::Plugin::template; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; use HTML::Template; use Encode; @@ -16,17 +16,16 @@ sub preprocess (@) { #{{{ my %params=@_; if (! exists $params{id}) { - return "[[template missing id parameter]]" + return "[[template ".gettext("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 "[[template ".gettext("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}, $params{destpage}, + $template->output)); } # }}} 1