From f84e93edfeb50c91e8102b2bd4ec40c898cb08d4 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Thu, 3 Jun 2004 08:23:05 +0000 Subject: [PATCH] binlang and genlang couldn't handle deprecated strings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4713 a1c6a512-1295-4272-9138-f99709370657 --- tools/binlang | 2 +- tools/genlang | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/binlang b/tools/binlang index 83824e38b3..7cfa562227 100755 --- a/tools/binlang +++ b/tools/binlang @@ -70,7 +70,7 @@ while() { if($value =~ s/^\"(.*)\"\s*$/$1/g) { # Skip voice-only entries - if(!$value && $set{'voice'}) { + if(!$value && $set{'voice'} ne "\"\"") { $idnum{$set{'id'}} = '_done_'; next; } diff --git a/tools/genlang b/tools/genlang index 36d46f1ea6..6032c84899 100755 --- a/tools/genlang +++ b/tools/genlang @@ -2,7 +2,7 @@ if(!$ARGV[0]) { print <] +Usage: genlang [-p=] When running this program. .h and .c will be created in the "current directory". is "lang" by default. @@ -77,7 +77,9 @@ while() { $value = $set{'eng'}; } # print "VOICE: ".$set{'voice'}." VALUE: $value\n"; - if(($value eq "\"\"") && $set{'voice'}) { + # Note: if both entries are "", the string is deprecated, + # but must be included to maintain compatibility + if(($value eq "\"\"") && $set{'voice'} ne "\"\"") { # voice-only push @vfile, $set{'id'}; }