(svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
authorDarkvater
Wed, 02 Nov 2005 23:55:10 +0000
changeset 2586 1c0f0b67a70d
parent 2585 fa2f94aa9de2
child 2587 31647a23da0b
(svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
strgen/strgen.c
--- a/strgen/strgen.c	Wed Nov 02 23:31:04 2005 +0000
+++ b/strgen/strgen.c	Wed Nov 02 23:55:10 2005 +0000
@@ -54,6 +54,7 @@
 	struct Case *next;
 } Case;
 
+static bool _masterlang;
 static bool _translated;
 static const char* _file = "(unknown file)";
 static int _cur_line;
@@ -1157,7 +1158,7 @@
 				cmdp = ls->english;
 			}
 
-			_translated = !(cmdp == ls->english);
+			_translated = _masterlang || (cmdp != ls->english);
 
 			if (casep) {
 				Case *c;
@@ -1226,6 +1227,7 @@
 
 
 	if (argc == 1) {
+		_masterlang = true;
 		// parse master file
 		ParseFile("lang/english.txt", true);
 		MakeHashOfStrings();
@@ -1237,6 +1239,7 @@
 		WriteStringsH("table/strings.h");
 
 	} else if (argc == 2) {
+		_masterlang = false;
 		ParseFile("lang/english.txt", true);
 		MakeHashOfStrings();
 		ParseFile(argv[1], false);