changeset 2585:90474709b23c draft

(svn r3122) - Fix (regression): recent change to strgen which 'fixed' all strings with wrong plural forms. Thanks for glx for pointing this out (after I changed his original patch which was correct..whohoo braindeadness; here I come)
author Darkvater <Darkvater@openttd.org>
date Wed, 02 Nov 2005 23:31:04 +0000
parents 4089e98b32f8
children 50c492a95d08
files strgen/strgen.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/strgen/strgen.c
+++ b/strgen/strgen.c
@@ -54,7 +54,7 @@
 	struct Case *next;
 } Case;
 
-static bool _masterlang;
+static bool _translated;
 static const char* _file = "(unknown file)";
 static int _cur_line;
 static int _errors, _warnings;
@@ -332,7 +332,7 @@
 		Fatal("%s: No plural words", _cur_ident);
 
 	if (_plural_form_counts[_lang_pluralform] != nw)
-		if (_masterlang) {
+		if (_translated) {
 			Fatal("%s: Invalid number of plural forms. Expecting %d, found %d.", _cur_ident,
 				_plural_form_counts[_lang_pluralform], nw);
 		} else {
@@ -1157,6 +1157,8 @@
 				cmdp = ls->english;
 			}
 
+			_translated = !(cmdp == ls->english);
+
 			if (casep) {
 				Case *c;
 				int num;
@@ -1224,7 +1226,6 @@
 
 
 	if (argc == 1) {
-		_masterlang = true;
 		// parse master file
 		ParseFile("lang/english.txt", true);
 		MakeHashOfStrings();
@@ -1236,7 +1237,6 @@
 		WriteStringsH("table/strings.h");
 
 	} else if (argc == 2) {
-		_masterlang = false;
 		ParseFile("lang/english.txt", true);
 		MakeHashOfStrings();
 		ParseFile(argv[1], false);