Merge pull request #4048 from hnyman/i18n-merge
build/i18n-merge-master: ignore apps deleted in master
This commit is contained in:
commit
fb2f363067
1 changed files with 8 additions and 3 deletions
|
@ -7,9 +7,14 @@ if (open F, '-|', 'find', $ARGV[0] || '.', '-type', 'f', '-name', '*.po') {
|
|||
(my $ref = $path) =~ s/\.po$/\.master.po/;
|
||||
|
||||
printf 'Updating %s ', $path;
|
||||
system("git show --format=\%B 'master:$path' > '$ref'");
|
||||
system('msgmerge', '-N', '-o', $path, $ref, $path);
|
||||
system('msgattrib', '--no-obsolete', '-o', $path, $path);
|
||||
my $returnCode = system("git show --format=\%B 'master:$path' > '$ref'");
|
||||
if ( $returnCode == 0 )
|
||||
{
|
||||
system('msgmerge', '-N', '-o', $path, $ref, $path);
|
||||
system('msgattrib', '--no-obsolete', '-o', $path, $path);
|
||||
} else {
|
||||
print "...failed due to git error.\n";
|
||||
}
|
||||
unlink($ref);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue