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

Lobby Data: use proper names for Missing Content prompt

Browse source 
Turns out the data we need is already in the config to begin with, so we don't need to query the
addon server for anything! I kept the fallback to addon id in the case a name wasn't provided for
some reason, though.
This commit is contained in:
Charles Dang 2017-11-01 11:09:19 +11:00
parent d4d4201d75
commit ba9274ea7b
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/game_initialization/lobby_data.cpp
View file

@ -231,7 +231,13 @@ game_info::game_info(const config& game, const config& game_config, const std::v
required_addon r;
r.addon_id = c[id_key].str();
r.outcome = NEED_DOWNLOAD;
r.message = vgettext("Missing addon: $id", {{"id", c[id_key].str()}});
// Use addon name if provided, else fall back on the addon id.
if(c.has_attribute("name")) {
r.message = vgettext("Missing addon: $name", {{"name", c["name"].str()}});
} else {
r.message = vgettext("Missing addon: $id", {{"id", c[id_key].str()}});
}
required_addons.push_back(std::move(r));
@ -478,13 +484,18 @@ game_info::ADDON_REQ game_info::check_addon_version_compatibility(const config&
remote_min_ver = std::min(remote_min_ver, remote_ver);
// Use content name if provided, else fall back on the addon id.
// TODO: should this use t_string?
const std::string name = local_item.has_attribute("name")
? local_item["name"].str()
: local_item["addon_id"].str();
// Check if the host is too out of date to play.
if(local_min_ver > remote_ver) {
r.outcome = CANNOT_SATISFY;
// TODO: Figure out how to ask the add-on manager for the user-friendly name of this add-on.
r.message = vgettext("The host's version of <i>$addon</i> is incompatible. They have version <b>$host_ver</b> while you have version <b>$local_ver</b>.", {
{"addon", r.addon_id},
{"addon", name},
{"host_ver", remote_ver.str()},
{"local_ver", local_ver.str()}
});
@ -497,10 +508,9 @@ game_info::ADDON_REQ game_info::check_addon_version_compatibility(const config&
if(remote_min_ver > local_ver) {
r.outcome = NEED_DOWNLOAD;
// TODO: Figure out how to ask the add-on manager for the user-friendly name of this add-on.
r.message = vgettext("Your version of <i>$addon</i> is incompatible. You have version <b>$local_ver</b> while the host has version <b>$host_ver</b>.", {
{"addon", r.addon_id},
{"host_ver", remote_ver.str()},
{"addon", name},
{"host_ver", remote_ver.str()},
{"local_ver", local_ver.str()}
});