Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build/i18n-merge-master: ignore apps deleted in master

Browse source 
Refine the code to ignore apps that have been deleted from master
but still exist in release branches. E.g. luci-app-samba

Previously the unhandled git error from non-existing master
mangled the .po files in the release branch: the 18n header was
removed and all non-ASCII chars were deleted from translation.

Fix this by processing only those files where 'git show' succeeds.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

(cherry picked from commit e4baee8d25 in openwrt-19.07)
This commit is contained in:
Hannu Nyman 2020-05-15 16:46:23 +03:00
parent a7d1e257aa
commit da7c3d9202
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/i18n-merge-master.pl
View file

@ -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);
}