smcvpostcomment: reduce length of subject field

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

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index cb55ff94fddf77c655a39a6b3835873b458017a1..59f0e8cfc9f5cf09b72bb75ab05c2c6960b975d3 100644 (file)
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -8,6 +8,7 @@ package IkiWiki::Plugin::smcvpostcomment;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use IkiWiki::Plugin::inline;
 use IkiWiki::Plugin::mdwn;
 use CGI 'escapeHTML';
 
@@ -38,7 +39,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 +50,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",
@@ -147,7 +149,7 @@ sub sessioncgi ($$) { #{{{
        $form->field(name => 'sid', type => 'hidden', value => $session->id,
                force => 1);
        $form->field(name => 'page', type => 'hidden');
-       $form->field(name => 'subject', type => 'text', size => 80);
+       $form->field(name => 'subject', type => 'text', size => 72);
        $form->field(name => 'body', type => 'textarea', rows => 5,
                cols => 80);
 
@@ -157,7 +159,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 +175,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) {
@@ -185,7 +189,7 @@ sub sessioncgi ($$) { #{{{
 
        my ($authorurl, $author) = linkuser(getcgiuser($session));
 
-       my $body = $form->field('body');
+       my $body = $form->field('body') || '';
        $body =~ s/\r\n/\n/g;
        $body =~ s/\r/\n/g;
        $body .= "\n" if $body !~ /\n$/;
@@ -211,6 +215,8 @@ sub sessioncgi ($$) { #{{{
        # - this means that if they do, rocks fall and everyone dies
 
        if ($form->submitted eq PREVIEW) {
+               # $fake is a location that has the same number of slashes
+               # as the eventual location of this comment.
                my $fake = "$page/_" . PLUGIN . "hypothetical";
                my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
                                IkiWiki::linkify($page, $page,
@@ -250,7 +256,7 @@ sub sessioncgi ($$) { #{{{
                my $file;
                do {
                        $i++;
-                       $file = "$page/comment_${i}._" . PLUGIN;
+                       $file = "$page/_comment_${i}._" . PLUGIN;
                } while (-e "$config{srcdir}/$file");
 
                # FIXME: could probably do some sort of graceful retry
@@ -260,11 +266,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);
@@ -285,7 +290,7 @@ sub sessioncgi ($$) { #{{{
                error($conflict) if defined $conflict;
 
                # Bounce back to where we were, but defeat broken caches
-               my $anticache = "?updated=$page/comment_$i";
+               my $anticache = "?updated=$page/_comment_$i";
                IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
        }
        else {