* Patch fixing various additional problems with test suite. Closes: #425891

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

diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 63c2cf94391127018dbc57460ecb5a8569c73e46..69b3512c27e708d1155fab842e76b46b7dbff9f5 100644 (file)
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::sparkline;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 my $match_num=qr/[-+]?[0-9]+(?:\.[0-9]+)?/;
@@ -60,13 +60,13 @@ sub preprocess (@) { #{{{
                        }
                }
                elsif (! length $value) {
-                       return "[[".gettext("sparkline parse error")." \"$key\"]]";
+                       return "[[sparkline ".gettext("parse error")." \"$key\"]]";
                }
                elsif ($key eq 'featurepoint') {
                        my ($x, $y, $color, $diameter, $text, $location)=
                                split(/\s*,\s*/, $value);
                        if (! defined $diameter || $diameter < 0) {
-                               return "[[".gettext("sparkline bad featurepoint diameter")."]]";
+                               return "[[sparkline ".gettext("bad featurepoint diameter")."]]";
                        }
                        $x=int($x);
                        $y=int($y);
@@ -76,7 +76,7 @@ sub preprocess (@) { #{{{
                        if (defined $location) {
                                $location=$locmap{$location};
                                if (! defined $location) {
-                                       return "[[".gettext("sparkline bad featurepoint location")."]]";
+                                       return "[[sparkline ".gettext("bad featurepoint location")."]]";
                                }
                        }
                        $php.=qq{\$sparkline->SetFeaturePoint($x, $y, '$color', $diameter};
@@ -87,23 +87,23 @@ sub preprocess (@) { #{{{
        }
 
        if ($c eq 0) {
-               return "[[".gettext("sparkline missing values")."]]";
+               return "[[sparkline ".gettext("missing values")."]]";
        }
 
        my $height=int($params{height} || 20);
        if ($height < 2 || $height > 100) {
-               return "[[".gettext("sparkline bad height value")."]]";
+               return "[[sparkline ".gettext("bad height value")."]]";
        }
        if ($style eq "Bar") {
                $php.=qq{\$sparkline->Render($height);\n};
        }
        else {
                if (! exists $params{width}) {
-                       return "[[".gettext("sparkline missing width parameter")."]]";
+                       return "[[sparkline ".gettext("missing width parameter")."]]";
                }
                my $width=int($params{width});
                if ($width < 2 || $width > 1024) {
-                       return "[[".gettext("sparkline bad width value")."]]";
+                       return "[[sparkline ".gettext("bad width value")."]]";
                }
                $php.=qq{\$sparkline->RenderResampled($width, $height);\n};
        }
@@ -141,7 +141,7 @@ sub preprocess (@) { #{{{
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";
                if ($sigpipe) {
-                       return  "[[".gettext("sparkline failed to run php")."]]";
+                       return  "[[sparkline ".gettext("failed to run php")."]]";
                }
 
                if (! $params{preview}) {
@@ -156,9 +156,7 @@ sub preprocess (@) { #{{{
                }
        }
 
-       return '<img src="'.
-               IkiWiki::abs2rel($fn, IkiWiki::dirname($params{destpage})).
-               '" alt="graph" />';
+       return '<img src="'.urlto($fn, $params{destpage}).'" alt="graph" />';
 } # }}}
 
 1