From b6fb0203886debf786662b0bbc47c41e0578e905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Tue, 29 Jun 2021 22:19:24 +0200 Subject: [PATCH] Change: [strgen] Change warnings for translations into infos (#9406) Unless invoked with -w, --warning ("print a warning for any untranslated strings") or -t, --todo ("replace any untranslated strings with ''"). Eints normally fixes the warnings after a Pull Request, so it is not really useful information for the developer to see as a warning. --- src/strgen/strgen.cpp | 6 +++++- src/strgen/strgen_base.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 68002cc3f0..025f9406df 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -46,7 +46,11 @@ void CDECL strgen_warning(const char *s, ...) va_start(va, s); vseprintf(buf, lastof(buf), s, va); va_end(va); - fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf); + if (_show_todo > 0) { + fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf); + } else { + fprintf(stderr, LINE_NUM_FMT("info"), _file, _cur_line, buf); + } _warnings++; } diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 9d1346e17f..078e0abbf2 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -818,9 +818,13 @@ void StringReader::ParseFile() char buf[2048]; _warnings = _errors = 0; - _translation = this->master || this->translation; + _translation = this->translation; _file = this->file; + /* Abusing _show_todo to replace "warning" with "info" for translations. */ + _show_todo &= 3; + if (!this->translation) _show_todo |= 4; + /* For each new file we parse, reset the genders, and language codes. */ MemSetT(&_lang, 0); strecpy(_lang.digit_group_separator, ",", lastof(_lang.digit_group_separator));