X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..5f162cfd344f6b75fa39a57be4b3d488cadd1535:/IkiWiki/Plugin/template.pm diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 1a4faf05f..23d9d65d8 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -16,28 +16,34 @@ 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; - - my $template=HTML::Template->new( - filter => sub { - my $text_ref = shift; - $$text_ref=&Encode::decode_utf8($$text_ref); - }, - filename => srcfile($template_file), - die_on_bad_params => 0, - no_includes => 1, - blind_cache => 1, - ); + return sprintf(gettext("template %s not found"), + htmllink($params{page}, $params{destpage}, $template_page)) + unless defined $template_file; + + my $template; + eval { + $template=HTML::Template->new( + filter => sub { + my $text_ref = shift; + $$text_ref=&Encode::decode_utf8($$text_ref); + chomp $$text_ref; + }, + filename => srcfile($template_file), + die_on_bad_params => 0, + no_includes => 1, + blind_cache => 1, + ); + }; + if ($@) { + return "[[".gettext("template failed to process:")." $@]]"; + } foreach my $param (keys %params) { $template->param($param => $params{$param});