devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Revert "lang: Complain if there are multiple target matches for a given string"

Browse source 
This reverts commit a88ef80560.
This commit is contained in:
Solomon Peachy 2025-05-04 09:21:09 -04:00
parent a88ef80560
commit c08bbaac49
3 changed files with 76 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

39
tools/genlang
View file

@ -235,7 +235,6 @@ sub readenglish {
my $withindest;
my $numphrases = 0;
my $numusers = 1; # core is already in the users map
my $deststr;
while(<ENG>) {
@ -244,7 +243,8 @@ sub readenglish {
if($_ =~ /^ *\<phrase\>/) {
# this is the start of a phrase
} elsif($_ =~ /\<\/phrase\>/) {
}
elsif($_ =~ /\<\/phrase\>/) {
# if id is something, when we count and store this phrase
if($id) {
@ -253,7 +253,8 @@ sub readenglish {
# Assign an ID number to this entry
$idmap[$user]{$id}=$vidnum[$user];
$vidnum[$user]++;
} else {
}
else {
# Assign an ID number to this entry
$idmap[$user]{$id}=$idnum[$user];
$idnum[$user]++;
@ -265,7 +266,8 @@ sub readenglish {
}
undef @phrase;
$id="";
} elsif($_ ne "\n") {
}
elsif($_ ne "\n") {
# gather everything related to this phrase
push @phrase, $_;
if($_ =~ /^ *\<dest\>/i) {
@ -276,10 +278,12 @@ sub readenglish {
$withindest=0;
if($deststr && ($deststr !~ /^none\z/i)) {
die ("Missing specific target match for $maybeid\n") if ($deststr eq '"FALLBACK"');
# we unconditionally always use all IDs when the "update"
# feature is used
$id = $maybeid;
# print "DEST: use this id $id\n";
} else {
}
else {
# print "skip $maybeid for $name\n";
}
}
@ -289,24 +293,11 @@ sub readenglish {
# model name isn't "ours"
dest($_, $name, $val);
## If $dest is nonnull (ie we have a match for this target)
## if $deststr is null, accept
## if $name is '*', accept
## if $name is not '*' and $deststr is not null, COMPLAIN.
if ($dest) {
if (!$deststr) {
$deststr = $dest;
} elsif ($name eq '*') {
$deststr = $dest;
} elsif ($deststr ne 'none' && $val ne '"FALLBACK"') {
die("multiple matches on $maybeid ($name:$val / $deststr)\n");
} elsif ($deststr ne 'none' && $val eq '"FALLBACK"') {
# Ignore FALLBACK row if we already have a match
} else {
$deststr = $dest;
}
}
if($dest) {
# Store the current dest string. If this target matches
# multiple strings, it will get updated several times.
$deststr = $dest;
}
}
}

3
tools/updatelang
View file

@ -555,7 +555,6 @@ foreach my $id (@finalorder) {
print $fh " <source>\n";
foreach my $tgt (sort(keys(%lp))) {
my $w = NFC($lp{$tgt});
next if ($w eq 'FALLBACK');
if ($w eq 'none') {
print $fh " $tgt: $w\n";
} else {
@ -569,7 +568,6 @@ foreach my $id (@finalorder) {
print $fh " <dest>\n";
foreach my $tgt (sort(keys(%lp))) {
my $w = NFC($lp{$tgt});
next if ($w eq 'FALLBACK');
if ($w eq 'none') {
print $fh " $tgt: $w\n";
} else {
@ -583,7 +581,6 @@ foreach my $id (@finalorder) {
print $fh " <voice>\n";
foreach my $tgt (sort(keys(%lp))) {
my $w = NFC($lp{$tgt});
next if ($w eq 'FALLBACK');
if ($w eq 'none') {
print $fh " $tgt: $w\n";
} else {