Lines 373-385
if ($action eq 'create') {
Link Here
|
373 |
(defined $charset_in? ('-I', $charset_in): ()), |
373 |
(defined $charset_in? ('-I', $charset_in): ()), |
374 |
(defined $charset_out? ('-O', $charset_out): ())); |
374 |
(defined $charset_out? ('-O', $charset_out): ())); |
375 |
if ($st == 0) { |
375 |
if ($st == 0) { |
376 |
# Merge the temporary "pot file" with the specified po file ($str_file) |
376 |
# Merge the temporary "pot file" with the specified po file ($str_file) |
377 |
# FIXME: msgmerge(1) is a Unix dependency |
377 |
# FIXME: msgmerge(1) is a Unix dependency |
378 |
# FIXME: need to check the return value |
378 |
# FIXME: need to check the return value |
379 |
$st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2"); |
379 |
if ( @filenames ) { |
|
|
380 |
my ($tmph3, $tmpfile3) = tmpnam(); |
381 |
$st = system("msgcat $str_file $tmpfile2 > $tmpfile3"); |
382 |
$st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile3") |
383 |
unless $st; |
384 |
} else { |
385 |
$st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2"); |
386 |
} |
380 |
} else { |
387 |
} else { |
381 |
error_normal "Text extraction failed: $xgettext: $!\n", undef; |
388 |
error_normal "Text extraction failed: $xgettext: $!\n", undef; |
382 |
error_additional "Will not run msgmerge\n", undef; |
389 |
error_additional "Will not run msgmerge\n", undef; |
383 |
} |
390 |
} |
384 |
# unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; |
391 |
# unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; |
385 |
# unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; |
392 |
# unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; |
386 |
- |
|
|