diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2009-07-19 20:21:16 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2009-07-19 20:21:16 +0200 |
| commit | cccd4e101a13cb73d25d591ef6c23122ec15533e (patch) | |
| tree | 5657543d0190f9f5cdc9820cfd2b03af8c3e3d9c /IkiWiki/Plugin | |
| parent | adee74a67b082e28f42106799dd305eaa0057250 (diff) | |
| parent | 4fb0e8720c19451a3d60acba7f033aa237c7f468 (diff) | |
Merge branch 'master' of git://git.ikiwiki.info
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/sparkline.pm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 3d358b3e2..1aa60a14f 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -10,7 +10,7 @@ use warnings; use strict; use IkiWiki 3.00; use Encode; -use Locale::Po4a::Common qw(nowrapi18n); +use Locale::Po4a::Common qw(nowrapi18n !/.*/); use Locale::Po4a::Chooser; use Locale::Po4a::Po; use File::Basename; @@ -807,7 +807,7 @@ sub refreshpofiles ($@) { foreach my $pofile (@pofiles) { IkiWiki::prep_writefile(basename($pofile),dirname($pofile)); if (-e $pofile) { - system("msgmerge", "-U", "--backup=none", $pofile, $potfile) == 0 + system("msgmerge", "-q", "-U", "--backup=none", $pofile, $potfile) == 0 or error("po(refreshpofiles) ". sprintf(gettext("failed to update %s"), $pofile)); diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm index 458192695..c1f016ffd 100644 --- a/IkiWiki/Plugin/sparkline.pm +++ b/IkiWiki/Plugin/sparkline.pm @@ -75,7 +75,7 @@ sub preprocess (@) { my ($x, $y, $color, $diameter, $text, $location)= split(/\s*,\s*/, $value); if (! defined $diameter || $diameter < 0) { - error gettext("bad featurepoint diameter"); + error gettext("invalid featurepoint diameter"); } $x=int($x); $y=int($y); @@ -85,7 +85,7 @@ sub preprocess (@) { if (defined $location) { $location=$locmap{$location}; if (! defined $location) { - error gettext("bad featurepoint location"); + error gettext("invalid featurepoint location"); } } $php.=qq{\$sparkline->SetFeaturePoint($x, $y, '$color', $diameter}; @@ -101,7 +101,7 @@ sub preprocess (@) { my $height=int($params{height} || 20); if ($height < 2 || $height > 100) { - error gettext("bad height value"); + error gettext("invalid height value"); } if ($style eq "Bar") { $php.=qq{\$sparkline->Render($height);\n}; @@ -112,7 +112,7 @@ sub preprocess (@) { } my $width=int($params{width}); if ($width < 2 || $width > 1024) { - error gettext("bad width value"); + error gettext("invalid width value"); } $php.=qq{\$sparkline->RenderResampled($width, $height);\n}; } |