From 6b3e59474f6122824f729dd7dba5a07c124cd798 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 18 Jan 2007 15:27:57 +0000 Subject: [PATCH] (svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's. --- src/strgen/strgen.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 9b6ae5102e..c837b3664d 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -913,12 +913,12 @@ static void ParseFile(const char *file, bool english) _file = file; - // For each new file we parse, reset the genders. + /* For each new file we parse, reset the genders, and language codes */ _numgenders = 0; + _lang_name[0] = _lang_ownname[0] = _lang_isocode[0] = '\0'; // TODO:!! We can't reset the cases. In case the translated strings // derive some strings from english.... - in = fopen(file, "r"); if (in == NULL) fatal("Cannot open file"); _cur_line = 1; @@ -928,6 +928,10 @@ static void ParseFile(const char *file, bool english) _cur_line++; } fclose(in); + + if (StrEmpty(_lang_name) || StrEmpty(_lang_ownname) || StrEmpty(_lang_isocode)) { + fatal("Language must include ##name, ##ownname and ##isocode"); + } }