summaryrefslogtreecommitdiffstats
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.tar.bz2
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 {
foreach my $line (@lines) {
$line = trim($line);
- if($line =~ /^ *#/) {
+ if($line =~ /^ *###/) {
+ # Filter out warnings from prior runs
+ next;
+ } elsif($line =~ /^ *#/) {
push(@comments, "$line\n") if ($pos eq 'lang');
# comments are ignored!
next;
@@ -271,7 +274,7 @@ foreach my $id (@langorder) {
my %ep = %{$english{$id}{'phrase'}};
my %lp = %{$lang{$id}{'phrase'}};
- if ($lp{'desc'} ne $ep{'desc'}) {
+ if ($lp{'desc'} ne $ep{'desc'} || $ep{'desc'} eq 'deprecated') {
if ($ep{'desc'} eq 'deprecated') {
# Nuke all deprecated targets; just copy from English
# print "#!! '$id' deprecated, deleting\n";