binlang and genlang couldn't handle deprecated strings

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4713 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 3 deletions

diff --git a/tools/binlang b/tools/binlang
index 83824e3..7cfa562 100755
--- a/tools/binlang
+++ b/tools/binlang
@@ -70,7 +70,7 @@ while(<ENG>) {
             
             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 36d46f1..6032c84 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -2,7 +2,7 @@
 
 if(!$ARGV[0]) {
     print <<MOO
-Usage: lang.pl [-p=<prefix>] <language file>
+Usage: genlang [-p=<prefix>] <language file>
 
 When running this program. <prefix>.h and <prefix>.c will be created in the
 "current directory". <prefix> is "lang" by default.
@@ -77,7 +77,9 @@ while(<LANG>) {
                 $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'};
             }