Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 6107a4a2252c256e715a3b0bd210eb28d45371b3..6b55ee35133e66a33f24710248b2afa666618189 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -993,10 +993,9 @@ sub refreshpofiles ($@) {
                }
 
                if (-e $pofile) {
                }
 
                if (-e $pofile) {

-                       system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
-                               or error("po(refreshpofiles) ".
-                                        sprintf(gettext("failed to update %s"),
-                                                $pofile));
+                       if (! (system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0)) {
+                               print STDERR ("po(refreshpofiles) ". sprintf(gettext("failed to update %s"), $pofile));
+                       }

                }
                else {
                        File::Copy::syscopy($potfile,$pofile)
                }
                else {
                        File::Copy::syscopy($potfile,$pofile)