upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-14 16:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Typography update for source code (in addition to .cfg data files previously reviewed).

Browse Source
This commit is contained in:
Wedge009 2024-09-18 21:05:55 +10:00
parent 5ec94b5904
commit 558650bd14
29 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/campaigns/Eastern_Invasion/lua/bandits.lua
View File

@ -81,7 +81,7 @@ function wml_actions.bandit_village_capture(cfg)
vars.villages_visited = visited + 1
wesnoth.game_events.fire("addogin_advice", x, y, unit);
wml.fire("message" , { x = x , y = y , message = _"They're here!"})
wml.fire("message" , { x = x , y = y , message = _"They’re here!"})
bandits_found(x,y)
return

2
data/campaigns/World_Conquest/lua/campaign/enemy_themed.lua
View File

@ -2,7 +2,7 @@ local _ = wesnoth.textdomain 'wesnoth-wc'
local on_event = wesnoth.require("on_event")
local strings = {
enemy_pet = _ "$name|'s pet"
enemy_pet = _ "$name|’s pet"
}
-- in the later scenarios there is a small chance that a scenario will be themed for an enemy
-- which means in paticular changing the castle of the enemy accorign to the unit type of that

2
src/addon/validation.cpp
View File

@ -500,7 +500,7 @@ std::string addon_check_status_desc(unsigned int code)
},
{
ADDON_CHECK_STATUS::AUTH_TYPE_MISMATCH,
N_("The add-on's forum_auth attribute does not match what was previously uploaded.")
N_("The add-on’s forum_auth attribute does not match what was previously uploaded.")
},
//

2
src/editor/map/map_context.cpp
View File

@ -261,7 +261,7 @@ map_context::map_context(const game_config_view& game_config, const std::string&
try {
// 5.1 The file can be loaded by the editor as a scenario
if(file_string.find("<<") != std::string::npos) {
throw editor_map_load_exception(filename, _("Found the characters '<<' indicating inline lua is present - aborting"));
throw editor_map_load_exception(filename, _("Found the characters ‘<<’ indicating inline lua is present — aborting"));
}
load_scenario();
} catch(const std::exception&) {

2
src/game_config_manager.cpp
View File

@ -298,7 +298,7 @@ void game_config_manager::load_game_config(bool reload_everything, const game_cl
events::call_in_main_thread([&]() {
gui2::dialogs::wml_error::display(
_("Error loading core data."),
_("Can't locate the default core.")
_("Can’t locate the default core.")
+ '\n' + _("The game will now exit."));
});
throw;

4
src/game_initialization/depcheck.cpp
View File

@ -513,7 +513,7 @@ bool manager::change_scenario(const std::string& id)
{
// Checking for missing dependencies
if(!get_required_not_installed(elem(id, "scenario")).empty()) {
std::string msg = _("Scenario can't be activated. Some dependencies are missing: ");
std::string msg = _("Scenario can’t be activated. Some dependencies are missing: ");
msg += utils::join(get_required_not_installed(elem(id, "scenario")), ", ");
@ -582,7 +582,7 @@ bool manager::change_era(const std::string& id)
{
// Checking for missing dependencies
if(!get_required_not_installed(elem(id, "era")).empty()) {
std::string msg = _("Era can't be activated. Some dependencies are missing: ");
std::string msg = _("Era can’t be activated. Some dependencies are missing: ");
msg += utils::join(get_required_not_installed(elem(id, "era")), ", ");
failure_dialog(msg);

2
src/game_initialization/lobby_data.cpp
View File

@ -441,7 +441,7 @@ game_info::addon_req game_info::check_addon_version_compatibility(const config&
<< "'";
r.outcome = addon_req::CANNOT_SATISFY;
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>.", {
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", local_item["addon_title"].str()},
{"host_ver", remote_ver.str()},
{"local_ver", local_ver.str()}

2
src/game_initialization/mp_game_utils.cpp
View File

@ -100,7 +100,7 @@ config initial_level_config(saved_game& state)
if(!era_cfg) {
if(params.saved_game == saved_game_mode::type::no) {
throw config::error(VGETTEXT("Cannot find era '$era'", {{"era", era}}));
throw config::error(VGETTEXT("Cannot find era ‘$era’", {{"era", era}}));
}
// FIXME: @todo We should tell user about missing era but still load game...

2
src/game_initialization/multiplayer.cpp
View File

@ -265,7 +265,7 @@ std::unique_ptr<wesnothd_connection> mp_manager::open_connection(std::string hos
i18n_symbols["required_version"] = version;
i18n_symbols["your_version"] = game_config::wesnoth_version.str();
const std::string errorstring = VGETTEXT("The server accepts versions '$required_version', but you are using version '$your_version'", i18n_symbols);
const std::string errorstring = VGETTEXT("The server accepts versions ‘$required_version’, but you are using version ‘$your_version’", i18n_symbols);
throw wesnothd_error(errorstring);
}

2
src/game_initialization/playcampaign.cpp
View File

@ -276,7 +276,7 @@ level_result::type campaign_controller::play_game()
utils::string_map symbols;
symbols["scenario"] = state_.get_scenario_id();
std::string message = _("Unknown scenario: '$scenario|'");
std::string message = _("Unknown scenario: ‘$scenario|’");
message = utils::interpolate_variables_into_string(message, &symbols);
gui2::show_error_message(message);

4
src/generators/default_map_generator_job.cpp
View File

@ -703,7 +703,7 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
<< " show_labels=" << data.show_labels;
// Odd widths are nasty
VALIDATE(is_even(data.width), _("Random maps with an odd width aren't supported."));
VALIDATE(is_even(data.width), _("Random maps with an odd width aren’t supported."));
// Try to find configuration for castles
auto castle_config = cfg.optional_child("castle");
@ -966,7 +966,7 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
if(best_ranking == 0) {
ERR_NG << "No castle location found, for " << data.nplayers << " players aborting. ";
const std::string error = _("No valid castle location found. Too many or too few mountain hexes? (please check the 'max hill size' parameter)");
const std::string error = _("No valid castle location found. Too many or too few mountain hexes? (please check the ‘max hill size’ parameter)");
throw mapgen_exception(error);
}

2
src/gui/core/canvas.cpp
View File

@ -274,7 +274,7 @@ void image_shape::dimension_validation(unsigned value, const std::string& name,
{
const int as_int = static_cast<int>(value);
VALIDATE_WITH_DEV_MESSAGE(as_int >= 0, _("Image doesn't fit on canvas."),
VALIDATE_WITH_DEV_MESSAGE(as_int >= 0, _("Image doesn’t fit on canvas."),
formatter() << "Image '" << name << "', " << key << " = " << as_int << "."
);
}

4
src/gui/core/window_builder.cpp
View File

@ -217,7 +217,7 @@ builder_grid::builder_grid(const config& cfg)
}
if(col == 0) {
const t_string msg = VGETTEXT("Grid '$grid' row $row must have at least one column.", {
const t_string msg = VGETTEXT("Grid ‘$grid’ row $row must have at least one column.", {
{"grid", id}, {"row", std::to_string(rows)}
});
@ -229,7 +229,7 @@ builder_grid::builder_grid(const config& cfg)
if(rows == 1) {
cols = col;
} else if(col != cols) {
const t_string msg = VGETTEXT("Grid '$grid' row $row has a differing number of columns ($found found, $expected expected)", {
const t_string msg = VGETTEXT("Grid ‘$grid’ row $row has a differing number of columns ($found found, $expected expected)", {
{"grid", id}, {"row", std::to_string(rows)}, {"found", std::to_string(col)}, {"expected", std::to_string(cols)}
});

2
src/gui/dialogs/editor/custom_tod.cpp
View File

@ -175,7 +175,7 @@ void custom_tod::select_file(const std::string& default_dir)
if(dlg.show()) {
dn = dlg.path();
const std::string& message
= _("This file is outside Wesnoth's data dirs. Do you wish to copy it into your add-on?");
= _("This file is outside Wesnoth’s data dirs. Do you wish to copy it into your add-on?");
if(data.first == "image") {
if (!filesystem::to_asset_path(dn, addon_id_, "images")) {

2
src/gui/dialogs/editor/edit_unit.cpp
View File

@ -317,7 +317,7 @@ void editor_edit_unit::select_file(const std::string& default_dir, const std::st
std::string dn = dlg.path();
const std::string& message
= _("This file is outside Wesnoth's data dirs. Do you wish to copy it into your add-on?");
= _("This file is outside Wesnoth’s data dirs. Do you wish to copy it into your add-on?");
if(id_stem == "unit_image") {

2
src/gui/dialogs/lua_interpreter.cpp
View File

@ -624,7 +624,7 @@ void lua_interpreter::display(lua_kernel_base * lk) {
#ifndef ALWAYS_HAVE_LUA_CONSOLE
if(!game_config::debug && resources::controller) {
display_chat_manager& chat_man = resources::controller->get_display().get_chat_manager();
const std::string& message = _("The lua console can only be used in debug mode! (Run ':debug' first)");
const std::string& message = _("The lua console can only be used in debug mode! (Run ‘:debug’ first)");
chat_man.add_chat_message(time(nullptr), _("lua console"), 0, message, events::chat_handler::MESSAGE_PRIVATE, false);
return;
}

4
src/gui/dialogs/multiplayer/lobby.cpp
View File

@ -170,7 +170,7 @@ bool handle_addon_requirements_gui(const std::vector<mp::game_info::required_add
{
if(addon_outcome == mp::game_info::addon_req::CANNOT_SATISFY) {
std::string e_title = _("Incompatible User-made Content");
std::string err_msg = _("This game cannot be joined because the host has out-of-date add-ons that are incompatible with your version. You might wish to suggest that the host's add-ons be updated.");
std::string err_msg = _("This game cannot be joined because the host has out-of-date add-ons that are incompatible with your version. You might wish to suggest that the host’s add-ons be updated.");
err_msg +="\n\n";
err_msg += _("Details:");
@ -830,7 +830,7 @@ void mp_lobby::enter_game(const mp::game_info& game, JOIN_MODE mode)
// prompt moderators for whether they want to join a game with observers disabled
if(!game.observers && mp::logged_in_as_moderator()) {
if(gui2::show_message(_("Observe"), _("This game doesn't allow observers. Observe using moderator rights anyway?"), gui2::dialogs::message::yes_no_buttons) != gui2::retval::OK) {
if(gui2::show_message(_("Observe"), _("This game doesn’t allow observers. Observe using moderator rights anyway?"), gui2::dialogs::message::yes_no_buttons) != gui2::retval::OK) {
return;
}
}

2
src/gui/widgets/helper.cpp
View File

@ -119,7 +119,7 @@ std::string encode_text_alignment(const PangoAlignment alignment)
t_string missing_widget(const std::string& id)
{
return t_string(VGETTEXT("Mandatory widget '$id' hasn't been defined.", {{"id", id}}));
return t_string(VGETTEXT("Mandatory widget ‘$id’ hasn't been defined.", {{"id", id}}));
}
void get_screen_size_variables(wfl::map_formula_callable& variable)

8
src/gui/widgets/listbox.cpp
View File

@ -721,7 +721,7 @@ static std::vector<widget_data> parse_list_data(const config& data, const unsign
auto cols = row.child_range("column");
VALIDATE(static_cast<unsigned>(cols.size()) == req_cols,
_("'list_data' must have the same number of columns as the 'list_definition'.")
_("‘list_data’ must have the same number of columns as the ‘list_definition’.")
);
for(const auto& c : cols) {
@ -771,7 +771,7 @@ builder_listbox::builder_listbox(const config& cfg)
list_builder = std::make_shared<builder_grid>(*l);
assert(list_builder);
VALIDATE(list_builder->rows == 1, _("A 'list_definition' should contain one row."));
VALIDATE(list_builder->rows == 1, _("A ‘list_definition’ should contain one row."));
if(cfg.has_child("list_data")) {
list_data = parse_list_data(cfg.mandatory_child("list_data"), list_builder->cols);
@ -814,7 +814,7 @@ builder_horizontal_listbox::builder_horizontal_listbox(const config& cfg)
list_builder = std::make_shared<builder_grid>(*l);
assert(list_builder);
VALIDATE(list_builder->rows == 1, _("A 'list_definition' should contain one row."));
VALIDATE(list_builder->rows == 1, _("A ‘list_definition’ should contain one row."));
if(cfg.has_child("list_data")) {
list_data = parse_list_data(cfg.mandatory_child("list_data"), list_builder->cols);
@ -857,7 +857,7 @@ builder_grid_listbox::builder_grid_listbox(const config& cfg)
list_builder = std::make_shared<builder_grid>(*l);
assert(list_builder);
VALIDATE(list_builder->rows == 1, _("A 'list_definition' should contain one row."));
VALIDATE(list_builder->rows == 1, _("A ‘list_definition’ should contain one row."));
if(cfg.has_child("list_data")) {
list_data = parse_list_data(cfg.mandatory_child("list_data"), list_builder->cols);

4
src/gui/widgets/multi_page.cpp
View File

@ -216,8 +216,8 @@ builder_multi_page::builder_multi_page(const config& cfg)
}
VALIDATE(col == builder->cols,
_("'list_data' must have "
"the same number of columns as the 'list_definition'."));
_("‘list_data’ must have "
"the same number of columns as the ‘list_definition’."));
}
}

2
src/gui/widgets/slider.cpp
View File

@ -353,7 +353,7 @@ std::unique_ptr<widget> builder_slider::build() const
if(!value_labels_.empty()) {
VALIDATE(value_labels_.size() == static_cast<std::size_t>(widget->get_item_count()),
_("The number of value_labels and values don't match."));
_("The number of value_labels and values don’t match."));
widget->set_value_labels(value_labels_);

2
src/gui/widgets/tree_view.cpp
View File

@ -322,7 +322,7 @@ tree_node::tree_node(const config& cfg)
VALIDATE(!id.empty(), missing_mandatory_wml_key("node", "id"));
// TODO: interpolate this value into the error message
VALIDATE(id != tree_view::root_node_id, _("[node]id 'root' is reserved for the implementation."));
VALIDATE(id != tree_view::root_node_id, _("[node]id ‘root’ is reserved for the implementation."));
auto node_definition = VALIDATE_WML_CHILD(cfg, "node_definition", missing_mandatory_wml_tag("node", "node_definition"));
builder = std::make_shared<builder_grid>(node_definition);

8
src/gui/widgets/window.cpp
View File

@ -418,7 +418,7 @@ void window::finish_build(const builder_window::window_resolution& definition)
{
for(const auto& lg : definition.linked_groups) {
if(has_linked_size_group(lg.id)) {
t_string msg = VGETTEXT("Linked '$id' group has multiple definitions.", {{"id", lg.id}});
t_string msg = VGETTEXT("Linked ‘$id’ group has multiple definitions.", {{"id", lg.id}});
FAIL(msg);
}
@ -902,7 +902,7 @@ void window::layout()
click_dismiss_button = btn;
}
VALIDATE(click_dismiss_button,
_("Click dismiss needs a 'click_dismiss' or 'ok' button."));
_("Click dismiss needs a ‘click_dismiss’ or ‘ok’ button."));
}
/***** Layout. *****/
@ -928,7 +928,7 @@ void window::layout()
<< settings::screen_width << ',' << settings::screen_height << '.';
throw wml_exception(_("Failed to show a dialog, "
"which doesn't fit on the screen."),
"which doesn’t fit on the screen."),
sstr.str());
}
@ -965,7 +965,7 @@ void window::layout()
<< '.';
throw wml_exception(_("Failed to show a dialog, "
"which doesn't fit on the screen."),
"which doesn’t fit on the screen."),
sstr.str());
}
}

4
src/map_command_handler.hpp
View File

@ -222,11 +222,11 @@ public:
}
// If a proposal for a command is found, print it
if(has_command_proposal) {
print("help", VGETTEXT("Unknown command '$command', did you mean '$command_proposal'? try $help_command "
print("help", VGETTEXT("Unknown command ‘$command’, did you mean ‘$command_proposal’? try $help_command "
"for a list of available commands.", symbols));
}
else {
print("help", VGETTEXT("Unknown command '$command', try $help_command "
print("help", VGETTEXT("Unknown command ‘$command’, try $help_command "
"for a list of available commands.", symbols));
}
}

58
src/menu_events.cpp
View File

@ -391,7 +391,7 @@ void menu_handler::recall(int side_num, const map_location& last_hex)
return;
}
if(recall_list_team.empty()) {
gui2::show_transient_message("", _("You currently can't recall at the highlighted location."));
gui2::show_transient_message("", _("You currently can’t recall at the highlighted location."));
return;
}
@ -1239,7 +1239,7 @@ protected:
register_command(
"layers", &console_handler::do_layers, _("Debug layers from terrain under the mouse."), "", "D");
register_command("fps", &console_handler::do_fps, _("Display and log fps (Frames Per Second)."));
register_command("benchmark", &console_handler::do_benchmark, _("Similar to the 'fps' command, but also forces everything to redraw instead of only things that have changed."));
register_command("benchmark", &console_handler::do_benchmark, _("Similar to the ‘fps’ command, but also forces everything to redraw instead of only things that have changed."));
register_command("save", &console_handler::do_save, _("Save game."));
register_alias("save", "w");
register_command("quit", &console_handler::do_quit, _("Quit game."));
@ -1250,7 +1250,7 @@ protected:
register_command("ignore_replay_errors", &console_handler::do_ignore_replay_errors, _("Ignore replay errors."));
register_command("nosaves", &console_handler::do_nosaves, _("Disable autosaves."));
register_command("next_level", &console_handler::do_next_level,
_("Advance to the next scenario, or scenario identified by 'id'"), _("<id>"), "DS");
_("Advance to the next scenario, or scenario identified by ‘id’"), _("<id>"), "DS");
register_alias("next_level", "n");
register_command("choose_level", &console_handler::do_choose_level, _("Choose next scenario"), "", "DS");
register_alias("choose_level", "cl");
@ -1286,7 +1286,7 @@ protected:
// register_command("unbuff", &console_handler::do_unbuff,
// _("Remove a trait from a unit. (Does not work yet.)"), "", "D");
register_command("discover", &console_handler::do_discover, _("Discover all units in help."), "");
register_command("undiscover", &console_handler::do_undiscover, _("'Undiscover' all units in help."), "");
register_command("undiscover", &console_handler::do_undiscover, _("‘Undiscover’ all units in help."), "");
register_command("create", &console_handler::do_create, _("Create a unit."), _("<unit type id>"), "DS");
register_command("fog", &console_handler::do_fog, _("Toggle fog for the current player."), "", "DS");
register_command("shroud", &console_handler::do_shroud, _("Toggle shroud for the current player."), "", "DS");
@ -1467,10 +1467,10 @@ void console_handler::do_droid()
symbols["side"] = std::to_string(side);
if(side < 1 || side > menu_handler_.pc_.get_teams().size()) {
command_failed(VGETTEXT("Can't droid invalid side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t droid invalid side: ‘$side’.", symbols));
return;
} else if(menu_handler_.board().get_team(side).is_network()) {
command_failed(VGETTEXT("Can't droid networked side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t droid networked side: ‘$side’.", symbols));
return;
} else if(menu_handler_.board().get_team(side).is_local()) {
bool changed = false;
@ -1482,7 +1482,7 @@ void console_handler::do_droid()
if(action == "on") {
if(is_ai && !is_your_turn) {
command_failed(_("It is not allowed to change a side from AI to human control when it's not your turn."));
command_failed(_("It is not allowed to change a side from AI to human control when it’s not your turn."));
return;
}
if(!is_human || !is_droid) {
@ -1492,13 +1492,13 @@ void console_handler::do_droid()
if(is_ai) {
menu_handler_.pc_.send_to_wesnothd(config {"change_controller", config {"side", side, "player", prefs::get().login(), "to", side_controller::human}});
}
print(get_cmd(), VGETTEXT("Side '$side' controller is now controlled by: AI.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ controller is now controlled by: AI.", symbols));
} else {
print(get_cmd(), VGETTEXT("Side '$side' is already droided.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ is already droided.", symbols));
}
} else if(action == "off") {
if(is_ai && !is_your_turn) {
command_failed(_("It is not allowed to change a side from AI to human control when it's not your turn."));
command_failed(_("It is not allowed to change a side from AI to human control when it’s not your turn."));
return;
}
if(!is_human || !is_proxy_human) {
@ -1508,13 +1508,13 @@ void console_handler::do_droid()
if(is_ai) {
menu_handler_.pc_.send_to_wesnothd(config {"change_controller", config {"side", side, "player", prefs::get().login(), "to", side_controller::human}});
}
print(get_cmd(), VGETTEXT("Side '$side' controller is now controlled by: human.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ controller is now controlled by: human.", symbols));
} else {
print(get_cmd(), VGETTEXT("Side '$side' is already not droided.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ is already not droided.", symbols));
}
} else if(action == "full") {
if(!is_your_turn) {
command_failed(_("It is not allowed to change a side from human to AI control when it's not your turn."));
command_failed(_("It is not allowed to change a side from human to AI control when it’s not your turn."));
return;
}
if(!is_ai || !is_droid) {
@ -1524,13 +1524,13 @@ void console_handler::do_droid()
if(is_human || is_proxy_human) {
menu_handler_.pc_.send_to_wesnothd(config {"change_controller", config {"side", side, "player", prefs::get().login(), "to", side_controller::ai}});
}
print(get_cmd(), VGETTEXT("Side '$side' controller is now fully controlled by: AI.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ controller is now fully controlled by: AI.", symbols));
} else {
print(get_cmd(), VGETTEXT("Side '$side' is already fully AI controlled.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ is already fully AI controlled.", symbols));
}
} else if(action == "") {
if(is_ai && !is_your_turn) {
command_failed(_("It is not allowed to change a side from AI to human control when it's not your turn."));
command_failed(_("It is not allowed to change a side from AI to human control when it’s not your turn."));
return;
}
if(is_ai || is_droid) {
@ -1540,7 +1540,7 @@ void console_handler::do_droid()
if(is_ai) {
menu_handler_.pc_.send_to_wesnothd(config {"change_controller", config {"side", side, "player", prefs::get().login(), "to", side_controller::human}});
}
print(get_cmd(), VGETTEXT("Side '$side' controller is now controlled by: human.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ controller is now controlled by: human.", symbols));
} else {
menu_handler_.board().get_team(side).make_human();
menu_handler_.board().get_team(side).make_droid();
@ -1548,10 +1548,10 @@ void console_handler::do_droid()
if(is_ai) {
menu_handler_.pc_.send_to_wesnothd(config {"change_controller", config {"side", side, "player", prefs::get().login(), "to", side_controller::human}});
}
print(get_cmd(), VGETTEXT("Side '$side' controller is now controlled by: AI.", symbols));
print(get_cmd(), VGETTEXT("Side ‘$side’ controller is now controlled by: AI.", symbols));
}
} else {
print(get_cmd(), VGETTEXT("Invalid action provided for side '$side'. Valid actions are: on, off, full.", symbols));
print(get_cmd(), VGETTEXT("Invalid action provided for side ‘$side’. Valid actions are: on, off, full.", symbols));
}
if(team_num_ == side && changed) {
@ -1560,7 +1560,7 @@ void console_handler::do_droid()
}
}
} else {
command_failed(VGETTEXT("Side '$side' is not a human or AI player.", symbols));
command_failed(VGETTEXT("Side ‘$side’ is not a human or AI player.", symbols));
return;
}
menu_handler_.textbox_info_.close();
@ -1596,17 +1596,17 @@ void console_handler::do_idle()
if(side < 1 || side > menu_handler_.pc_.get_teams().size()) {
utils::string_map symbols;
symbols["side"] = side_s;
command_failed(VGETTEXT("Can't idle invalid side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t idle invalid side: ‘$side’.", symbols));
return;
} else if(menu_handler_.board().get_team(side).is_network()) {
utils::string_map symbols;
symbols["side"] = std::to_string(side);
command_failed(VGETTEXT("Can't idle networked side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t idle networked side: ‘$side’.", symbols));
return;
} else if(menu_handler_.board().get_team(side).is_local_ai()) {
utils::string_map symbols;
symbols["side"] = std::to_string(side);
command_failed(VGETTEXT("Can't idle local ai side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t idle local ai side: ‘$side’.", symbols));
return;
} else if(menu_handler_.board().get_team(side).is_local_human()) {
if(menu_handler_.board().get_team(side).is_idle() ? action == " on" : action == " off") {
@ -1667,7 +1667,7 @@ void console_handler::do_control()
if(it_t == teams.end()) {
utils::string_map symbols;
symbols["side"] = side;
command_failed(VGETTEXT("Can't change control of invalid side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t change control of invalid side: ‘$side’.", symbols));
return;
} else {
side_num = it_t->side();
@ -1677,7 +1677,7 @@ void console_handler::do_control()
if(side_num < 1 || side_num > menu_handler_.pc_.get_teams().size()) {
utils::string_map symbols;
symbols["side"] = side;
command_failed(VGETTEXT("Can't change control of out-of-bounds side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t change control of out-of-bounds side: ‘$side’.", symbols));
return;
}
@ -1694,14 +1694,14 @@ void console_handler::do_controller()
} catch(const bad_lexical_cast&) {
utils::string_map symbols;
symbols["side"] = side;
command_failed(VGETTEXT("Can't query control of invalid side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t query control of invalid side: ‘$side’.", symbols));
return;
}
if(side_num < 1 || side_num > menu_handler_.pc_.get_teams().size()) {
utils::string_map symbols;
symbols["side"] = side;
command_failed(VGETTEXT("Can't query control of out-of-bounds side: '$side'.", symbols));
command_failed(VGETTEXT("Can’t query control of out-of-bounds side: ‘$side’.", symbols));
return;
}
@ -1977,7 +1977,7 @@ void console_handler::do_unit()
utils::string_map symbols;
symbols["unit"] = get_arg(1);
command_failed(VGETTEXT(
"Debug command 'unit: $unit' failed: no unit selected or hovered over.",
"Debug command ‘unit: $unit’ failed: no unit selected or hovered over.",
symbols));
return;
}
@ -1995,7 +1995,7 @@ void console_handler::do_unit()
utils::string_map symbols;
symbols["alignment"] = get_arg(1);
command_failed(VGETTEXT(
"Invalid alignment: '$alignment', needs to be one of lawful, neutral, chaotic, or liminal.",
"Invalid alignment: ‘$alignment’, needs to be one of lawful, neutral, chaotic, or liminal.",
symbols));
return;
}

2
src/playsingle_controller.cpp
View File

@ -180,7 +180,7 @@ void playsingle_controller::play_scenario_init(const config& level)
gui2::show_transient_message(
// TODO: find a better title
_("Game Error"),
_("This multiplayer game uses an alternative random mode, if you don't know what this message means, then "
_("This multiplayer game uses an alternative random mode, if you don’t know what this message means, then "
"most likely someone is cheating or someone reloaded a corrupt game."));
}
}

2
src/savegame.cpp
View File

@ -428,7 +428,7 @@ bool savegame::check_overwrite()
bool savegame::check_filename(const std::string& filename)
{
if(filesystem::is_compressed_file(filename)) {
gui2::show_error_message(_("Save names should not end on '.gz' or '.bz2'. Please remove the extension."));
gui2::show_error_message(_("Save names should not end on ‘.gz’ or ‘.bz2’. Please remove the extension."));
return false;
} else if(!filesystem::is_legal_user_file_name(filename)) {
// This message is not all-inclusive. This is on purpose. Few people

2
src/serialization/parser.cpp
View File

@ -476,7 +476,7 @@ void parser::error(const std::string& error_type, const std::string& pos_format)
i18n_symbols["value"] = tok_.current_token().value;
i18n_symbols["previous_value"] = tok_.previous_token().value;
const std::string& tok_state = _("Value: '$value' Previous: '$previous_value'");
const std::string& tok_state = _("Value: ‘$value’ Previous: ‘$previous_value’");
#else
const std::string& tok_state = "";
#endif

2
src/tests/gui/test_gui2.cpp
View File

@ -739,7 +739,7 @@ BOOST_AUTO_TEST_CASE(test_make_test_fake)
message dlg("title", "message", true, false, false);
dlg.show(1);
} catch(const wml_exception& e) {
BOOST_CHECK(e.user_message == _("Failed to show a dialog, which doesn't fit on the screen."));
BOOST_CHECK(e.user_message == _("Failed to show a dialog, which doesn’t fit on the screen."));
return;
} catch(...) {
BOOST_ERROR("Didn't catch the wanted exception, instead caught " << utils::get_unknown_exception_type() << ".");