From bd8c4674a89945d4748537fbbb15464d9963c299 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 15 Nov 2008 14:11:24 +0000 Subject: [PATCH 1/1] smcvpostcomment: use gettext where appropriate --- IkiWiki/Plugin/smcvpostcomment.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm index cb55ff94f..1255cfde1 100644 --- a/IkiWiki/Plugin/smcvpostcomment.pm +++ b/IkiWiki/Plugin/smcvpostcomment.pm @@ -38,7 +38,8 @@ sub preprocess (@) { #{{{ my %params=@_; unless (length $config{cgiurl}) { - error("this plugin makes no sense if you have no CGI"); + error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"), + PLUGIN)); } my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl", @@ -48,15 +49,15 @@ sub preprocess (@) { #{{{ if ($params{preview}) { $formtemplate->param("disabled" => - 'not available during Preview'); + gettext('not available during Preview')); } - debug("page $params{page} => destpage $params{page}"); + debug("page $params{page} => destpage $params{destpage}"); # I'm reasonably sure that this counts as abuse of [[!inline]] return $formtemplate->output . "\n" . IkiWiki::preprocess_inline( - pages => "internal(/$params{page}/comment_*)", + pages => "internal($params{page}/_comment_*)", template => PLUGIN . "_display", show => 0, reverse => "yes", @@ -157,7 +158,7 @@ sub sessioncgi ($$) { #{{{ $page = IkiWiki::possibly_foolish_untaint($page); if (!defined $page || !length $page || IkiWiki::file_pruned($page, $config{srcdir})) { - error ("bad page name"); + error(gettext("bad page name")); } # FIXME: is this right? Or should we be using the candidate subpage @@ -173,7 +174,9 @@ sub sessioncgi ($$) { #{{{ linktext => 'FormattingHelp')); if (not exists $pagesources{$page}) { - error ("page '$page' doesn't exist, so you can't comment"); + error(sprintf(gettext( + "page '%s' doesn't exist, so you can't comment"), + $page)); } if ($form->submitted eq CANCEL) { @@ -260,11 +263,10 @@ sub sessioncgi ($$) { #{{{ my $conflict; if ($config{rcs} and $commit_comments) { - my $message = "Added a comment"; + my $message = gettext("Added a comment"); if (defined $form->field('subject') && length $form->field('subject')) { - $message = "Added a comment: " . - $form->field('subject'); + $message .= ": ".$form->field('subject'); } IkiWiki::rcs_add($file); -- 2.44.0