check for quotes better and warn/skip bad ones

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

2 files changed, 18 insertions, 7 deletions

diff --git a/tools/binlang b/tools/binlang
index ed158e7..e77830f 100755
--- a/tools/binlang
+++ b/tools/binlang
@@ -89,14 +89,18 @@ while(<LANG>) {
                 $value = $set{'eng'};
             }
 
-            $value =~ s/^\"(.*)\"/$1/g;
+            if($value =~ s/^\"(.*)\"/$1/g) {
 
-            $idnum = $idnum{$set{'id'}};
-            $idnum{$set{'id'}} = '_done_';
+                $idnum = $idnum{$set{'id'}};
+                $idnum{$set{'id'}} = '_done_';
 
-            printf OFILE ("%c%c%s\x00",
-                          ($idnum>>8), ($idnum&0xff),
-                          $value);
+                printf OFILE ("%c%c%s\x00",
+                              ($idnum>>8), ($idnum&0xff),
+                              $value);
+            }
+            else {
+                warn "String for ".$set{'id'}." misses quotes\n";
+            }
 
             undef %set;
         }
diff --git a/tools/genlang b/tools/genlang
index 3d77540..448784e 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -48,6 +48,7 @@ MOO
 
 open(LANG, "<$input");
 while(<LANG>) {
+    $line++;
     if($_ =~ / *\#/) {
         # comment
         next;
@@ -56,10 +57,16 @@ while(<LANG>) {
     $_ =~ s/\r//g;
     if($_ =~ / *([a-z]+): *(.*)/) {
         ($var, $value) = ($1, $2);
-  #      print "$var => $value\n";
+        # print "$var => $value\n";
 
         $set{$var} = $value;
 
+        if( (($var eq "new") && $value && ($value !~ /^\"(.*)\"$/)) ||
+            (($var eq "eng") && ($value !~ /^\"(.*)\"$/)) ) {
+            print "missing quotes on line $line for ".$set{'id'}."\n";
+            next;
+        }
+
         if($var eq "new") {
             # the last one for a single phrase