summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-28 09:14:56 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-28 09:17:46 -0400
commit2aeeeb43c9f8dec0d82a610674facf780fc8603d (patch)
tree79c3af871f0e42a687d3751dad8683e40574f7d9
parent42e514c80015472e74fe74bc53abcad828eba832 (diff)
downloadrockbox-2aeeeb43c9f8dec0d82a610674facf780fc8603d.tar.gz
rockbox-2aeeeb43c9f8dec0d82a610674facf780fc8603d.zip
updatelang: Fix false warnings about deprecated strings
Change-Id: Ia208909ed42dc7f9b8bd7d22ca88f1a1e47d0576
-rwxr-xr-xtools/updatelang7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/updatelang b/tools/updatelang
index 1e6ae59269..7f7de59686 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -42,7 +42,10 @@ sub parselangfile {
42 42
43 foreach my $line (@lines) { 43 foreach my $line (@lines) {
44 $line = trim($line); 44 $line = trim($line);
45 if($line =~ /^ *#/) { 45 if($line =~ /^ *###/) {
46 # Filter out warnings from prior runs
47 next;
48 } elsif($line =~ /^ *#/) {
46 push(@comments, "$line\n") if ($pos eq 'lang'); 49 push(@comments, "$line\n") if ($pos eq 'lang');
47 # comments are ignored! 50 # comments are ignored!
48 next; 51 next;
@@ -271,7 +274,7 @@ foreach my $id (@langorder) {
271 my %ep = %{$english{$id}{'phrase'}}; 274 my %ep = %{$english{$id}{'phrase'}};
272 my %lp = %{$lang{$id}{'phrase'}}; 275 my %lp = %{$lang{$id}{'phrase'}};
273 276
274 if ($lp{'desc'} ne $ep{'desc'}) { 277 if ($lp{'desc'} ne $ep{'desc'} || $ep{'desc'} eq 'deprecated') {
275 if ($ep{'desc'} eq 'deprecated') { 278 if ($ep{'desc'} eq 'deprecated') {
276 # Nuke all deprecated targets; just copy from English 279 # Nuke all deprecated targets; just copy from English
277# print "#!! '$id' deprecated, deleting\n"; 280# print "#!! '$id' deprecated, deleting\n";