0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make failure loading textdomains non-fatal

Browse source 
Prior to this, if any .po file included a \v (vertical tab), then the game
exited before reaching the title screen. It didn't have to be in a mainline
translation - any add-on could break the game, and would do so before the title
screen appeared, thus preventing the user from using the add-on manager or
language selection to avoid the problem.

Instead, treat a parsing error similarly to the .po file simply not existing.
Fixes #5923.
This commit is contained in:
Steve Cotton 2021-07-07 00:38:35 +02:00 • committed by Steve Cotton
parent f9fc806fd2
commit 23a0377b56
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gettext.cpp
View file

@ -135,19 +135,18 @@ namespace
const auto& cat = spirit_po::default_catalog::from_istream(*po_file);
extra_messages_.emplace(get_base().domain(domain), cat);
} catch(const spirit_po::catalog_exception& e) {
throw_po_error(lang_name_long, domain, e.what());
// Treat any parsing error in the same way as the file not existing - just leave
// this domain untranslated but continue to load other domains.
log_po_error(lang_name_long, domain, e.what());
} catch(const std::ios::failure&) {
throw_po_error(lang_name_long, domain, strerror(errno));
log_po_error(lang_name_long, domain, strerror(errno));
}
}
}
[[noreturn]] static void throw_po_error(const std::string& lang, const std::string& dom, const std::string& detail) {
std::ostringstream err;
err << "Error opening language file for " << lang << ", textdomain " << dom
<< ":\n " << detail << '\n';
ERR_G << err.str() << std::flush;
throw game::error(err.str());
static void log_po_error(const std::string& lang, const std::string& dom, const std::string& detail) {
ERR_G << "Error opening language file for " << lang << ", textdomain " << dom
<< ":\n " << detail << '\n' << std::flush;
}
const char* get(int domain_id, const char* ctx, const char* msg_id) const override