summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-01-31 00:34:32 +0000
committerJens Arnold <amiconn@rockbox.org>2005-01-31 00:34:32 +0000
commit19afad88f8bb973726af0c6a7850dbd992996a9f (patch)
tree2d629e85073a893ad58cae9bb58803cb60e212c0
parent89f401a956aa61dfa5345bee07391d514c128be2 (diff)
downloadrockbox-19afad88f8bb973726af0c6a7850dbd992996a9f.zip
rockbox-19afad88f8bb973726af0c6a7850dbd992996a9f.tar.gz
rockbox-19afad88f8bb973726af0c6a7850dbd992996a9f.tar.bz2
rockbox-19afad88f8bb973726af0c6a7850dbd992996a9f.tar.xz
Fix: Deprecated voice-only entries were treated as (deprecated) standard LANG_ entries. Now they are detected by the id matching VOICE_*.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5720 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xtools/binlang2
-rwxr-xr-xtools/genlang2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/binlang b/tools/binlang
index 7cfa562..13c969e 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'} ne "\"\"") {
+ if($set{'id'} =~ /^VOICE_/) {
$idnum{$set{'id'}} = '_done_';
next;
}
diff --git a/tools/genlang b/tools/genlang
index 2677735..21182b7 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -85,7 +85,7 @@ while(<LANG>) {
# print "VOICE: ".$set{'voice'}." VALUE: $value\n";
# Note: if both entries are "", the string is deprecated,
# but must be included to maintain compatibility
- if(($value eq "\"\"") && $set{'voice'} ne "\"\"") {
+ if($set{'id'} =~ /^VOICE_/) {
# voice-only
push @vfile, $set{'id'};
}