VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to drop keys in .auto files if there is a translation by human been made

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-12-02 18:52:05 +03:00
parent b008c9429a
commit 244a3342f4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/language-manager
View File

@ -175,8 +175,8 @@ sub main
wanted => sub {
$f = $File::Find::name;
my $d = -d $f;
my $l = $f =~ /$type\/$language_source$/;
my $i = $f =~ /$type\.info$/;
my $l = $f =~ /$type\/$language_source$/;
my $i = $f =~ /$type\.info$/;
my $h = $d && ($f =~ s/$path//r =~ tr/\///) == 2 && $f =~ /$path\/.*\/$type$/;
if ((!-l $f || $allow_symlinks) && ($l || $i || $h)) {
$f =~ s/^$path\///g;
@ -945,10 +945,10 @@ sub go
{
wanted => sub {
my $found = $File::Find::name;
my $found_nonutf8 = $found =~ s/$utf8//r;
my $found_nonutf8 = $found =~ s/$utf8//r;
my $found_nonutf8_big5 = $found_nonutf8 =~ s/$ext/.Big5$ext/r;
my $found_nonutf8_euc = $found_nonutf8 =~ s/$ext/.euc$ext/r;
my $found_relative_name = $found =~ s/$data->{'path'}\/$module\/$type\///r;
my $found_relative_name = $found =~ s/$data->{'path'}\/$module\/$type\///r;
# Check if file exists in both UTF-8 and original encoding, if so, keep original only
my @found_nonutf8 = ($found_nonutf8, $found_nonutf8_big5, $found_nonutf8_euc);
@ -1354,6 +1354,7 @@ sub go
# should be considered, unless forced to be dropped
if ($language_source_file_auto &&
$language_source_file_auto->{$key_} &&
!$language_source_file->{$key_} &&
(!@{$keys_force_translate} || any {$_ !~ /^$key_$/} @{$keys_force_translate}) &&
!@{$keys_test} &&
!$language_source_ignore_auto)
@ -1532,7 +1533,7 @@ sub go
write_file($file, \%language, undef, undef, $mfile), chmod(0664, $file)
if (%language);
write_file($file_auto, \%language_auto, undef, undef, $mfile), chmod(0664, $file_auto)
if (%language_auto && !$opt->{'only-transcode'});
if ((%language_auto || !%language_auto) && !$opt->{'only-transcode'});
# Remove empty files
unlink($file) if (-z $file);