include perl error in warning about openid

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

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 6cb21a916e477248b018d171ee419e935f91f1df..e536f4e23370773aebd296e290d0c84b2ded83ae 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -29,12 +29,11 @@ sub preprocess (@) { #{{{
        if (defined $params{percent}) {
                $fill = $params{percent};
                ($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now
+               $fill=~s/%$//;
                if (! defined $fill || ! length $fill || $fill > 100 || $fill < 0) {
-                       error("illegal percent value $params{percent}");
-               }
-               elsif ($fill !~ /%$/) {
-                       $fill.="%";
+                       error(sprintf(gettext("illegal percent value %s"), $params{percent}));
                }
+               $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                add_depends($params{page}, $params{totalpages});
@@ -57,7 +56,7 @@ sub preprocess (@) { #{{{
                }
        }
        else {
-               error("need either `percent` or `totalpages` and `donepages` parameters");
+               error(gettext("need either `percent` or `totalpages` and `donepages` parameters"));
        }
 
        return <<EODIV