upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 18:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

'nick' -> 'nickname'.

Browse Source
This commit is contained in:
Steven Panek 2011-11-03 17:24:38 +00:00
parent 0ca6857bbf
commit 57dcdff73d
8 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/core/help.cfg
View File

@ -833,7 +833,7 @@ Save the game and quit the scenario (without prompting)."
Ban a user in a multiplayer game by the IP address used by that username and kick him. Can be used on users not in the game but on the server. (Of course they won’t be kicked then.)
" + "<header>text=':control <side> <username>'</header>" + _"
Change the controller for side (write here the number of the side) to username (write here the nick of the player or observer). You can check what side belongs to which player in the <bold>text='Scenario Settings'</bold> dialog (Press the <bold>text='More'</bold> button in the <bold>text='Status Table'</bold> (alt+s by default) to get there.). The host can change control of any side.
Change the controller for side (write here the number of the side) to username (write here the nickname of the player or observer). You can check what side belongs to which player in the <bold>text='Scenario Settings'</bold> dialog (Press the <bold>text='More'</bold> button in the <bold>text='Status Table'</bold> (alt+s by default) to get there.). The host can change control of any side.
" + "<header>text=':kick <username>'</header>" + _"
Kick a user in multiplayer. They will be able to rejoin the game. If you just want to change control of their side(s) use the :control command instead.

2
data/gui/default/window/mp_change_control.cfg
View File

@ -70,7 +70,7 @@
[label]
id = "nick_title"
definition = "default"
label = _ "Nick"
label = _ "Nickname"
[/label]
[/column]
[/row]

32
src/menu_events.cpp
View File

@ -2330,16 +2330,16 @@ class chat_command_handler : public map_command_handler<chat_command_handler>
register_alias("query", "q");
register_command("ban", &chat_command_handler::do_network_send_req_arg,
_("Ban and kick a player or observer. If he is not in the"
" game but on the server he will only be banned."), _("<nick>"));
" game but on the server he will only be banned."), _("<nickname>"));
register_command("unban", &chat_command_handler::do_network_send_req_arg,
_("Unban a user. He does not have to be in the game but on"
" the server."), _("<nick>"));
" the server."), _("<nickname>"));
register_command("kick", &chat_command_handler::do_network_send_req_arg,
_("Kick a player or observer."), _("<nick>"));
_("Kick a player or observer."), _("<nickname>"));
register_command("mute", &chat_command_handler::do_network_send,
_("Mute an observer. Without an argument displays the mute status."), _("<nick>"));
_("Mute an observer. Without an argument displays the mute status."), _("<nickname>"));
register_command("unmute", &chat_command_handler::do_network_send,
_("Unmute an observer. Without an argument unmutes everyone."), _("<nick>"));
_("Unmute an observer. Without an argument unmutes everyone."), _("<nickname>"));
register_command("muteall", &chat_command_handler::do_network_send,
_("Mute/Unmute all observers. (toggles)"), "");
register_command("ping", &chat_command_handler::do_network_send,
@ -2352,7 +2352,7 @@ class chat_command_handler : public map_command_handler<chat_command_handler>
"", "", "A");
register_command("report", &chat_command_handler::do_network_send_req_arg,
_("Report abuse, rule violations, etc. to the server moderators. "
"Make sure to mention relevant nicks, etc."), "");
"Make sure to mention relevant nicknames, etc."), "");
register_alias("report", "adminmsg"); // deprecated
register_command("emote", &chat_command_handler::do_emote,
_("Send an emotion or personal action in chat."), _("<message>"));
@ -2360,33 +2360,33 @@ class chat_command_handler : public map_command_handler<chat_command_handler>
register_command("whisper", &chat_command_handler::do_whisper,
_("Sends a private message. "
"You cannot send private messages to players in a running game you observe or play in."),
_("<nick> <message>"));
_("<nickname> <message>"));
register_alias("whisper", "msg");
register_alias("whisper", "m");
register_command("log", &chat_command_handler::do_log,
_("Change the log level of a log domain."), _("<level> <domain>"));
register_command("ignore", &chat_command_handler::do_ignore,
_("Add a nick to your ignores list."), _("<nick>"));
_("Add a nickname to your ignores list."), _("<nickname>"));
register_command("friend", &chat_command_handler::do_friend,
_("Add a nick to your friends list."), _("<nick>"));
_("Add a nickname to your friends list."), _("<nickname>"));
register_command("remove", &chat_command_handler::do_remove,
_("Remove a nick from your ignores or friends list."), _("<nick>"));
_("Remove a nickname from your ignores or friends list."), _("<nickname>"));
register_command("list", &chat_command_handler::do_display,
_("Show your ignores and friends list."));
register_alias("list", "display");
register_command("version", &chat_command_handler::do_version,
_("Display version information."));
register_command("register", &chat_command_handler::do_register,
_("Register your nick"), _("<password> <email (optional)>"));
_("Register your nickname"), _("<password> <email (optional)>"));
register_command("drop", &chat_command_handler::do_drop,
_("Drop your nick."));
_("Drop your nickname."));
register_command("set", &chat_command_handler::do_set,
_("Update details for your nick. For possible details see '/details'."),
_("Update details for your nickname. For possible details see '/details'."),
_("<detail> <value>"));
register_command("info", &chat_command_handler::do_info,
_("Request information about a nick."), _("<nick>"));
_("Request information about a nickname."), _("<nickname>"));
register_command("details", &chat_command_handler::do_details,
_("Request a list of details you can set for your registered nick."));
_("Request a list of details you can set for your registered nickname."));
register_command("join", &chat_command_handler::do_network_send_req_arg,
_("Join a room."), _("<room>"));
register_alias("join", "j");
@ -2541,7 +2541,7 @@ class console_handler : public map_command_handler<console_handler>, private cha
_("Switch a side to/from AI control."), _("do not translate the on/off^[<side> [on/off]]"));
register_command("theme", &console_handler::do_theme);
register_command("control", &console_handler::do_control,
_("Assign control of a side to a different player or observer."), _("<side> <nick>"), "N");
_("Assign control of a side to a different player or observer."), _("<side> <nickname>"), "N");
register_command("clear", &console_handler::do_clear,
_("Clear chat history."));
register_command("sunset", &console_handler::do_sunset,

22
src/multiplayer.cpp
View File

@ -236,8 +236,8 @@ static server_type open_connection(game_display& disp, const std::string& origin
i18n_symbols["nick"] = login;
if((*warning)["warning_code"] == MP_NAME_INACTIVE_WARNING) {
warning_msg = vgettext("The nick '$nick' is inactive. "
"You cannot claim ownership of this nick until you "
warning_msg = vgettext("The nickname '$nick' is inactive. "
"You cannot claim ownership of this nickname until you "
"activate your account via email or ask an "
"administrator to do it for you.", i18n_symbols);
} else {
@ -334,24 +334,24 @@ static server_type open_connection(game_display& disp, const std::string& origin
if((*error)["error_code"] == MP_MUST_LOGIN) {
error_message = _("You must login first.");
} else if((*error)["error_code"] == MP_NAME_TAKEN_ERROR) {
error_message = vgettext("The nick '$nick' is already taken.", i18n_symbols);
error_message = vgettext("The nickname '$nick' is already taken.", i18n_symbols);
} else if((*error)["error_code"] == MP_INVALID_CHARS_IN_NAME_ERROR) {
error_message = vgettext("The nick '$nick' contains invalid "
error_message = vgettext("The nickname '$nick' contains invalid "
"characters. Only alpha-numeric characters, underscores and "
"hyphens are allowed.", i18n_symbols);
} else if((*error)["error_code"] == MP_NAME_TOO_LONG_ERROR) {
error_message = vgettext("The nick '$nick' is too long. Nicks must "
error_message = vgettext("The nickname '$nick' is too long. Nicks must "
"be 20 characters or less.", i18n_symbols);
} else if((*error)["error_code"] == MP_NAME_RESERVED_ERROR) {
error_message = vgettext("The nick '$nick' is reserved and cannot be used by players.", i18n_symbols);
error_message = vgettext("The nickname '$nick' is reserved and cannot be used by players.", i18n_symbols);
} else if((*error)["error_code"] == MP_NAME_UNREGISTERED_ERROR) {
error_message = vgettext("The nick '$nick' is not registered on this server.", i18n_symbols)
+ _(" This server disallows unregistered nicks.");
error_message = vgettext("The nickname '$nick' is not registered on this server.", i18n_symbols)
+ _(" This server disallows unregistered nicknames.");
} else if((*error)["error_code"] == MP_PASSWORD_REQUEST) {
error_message = vgettext("The nick '$nick' is registered on this server.", i18n_symbols);
error_message = vgettext("The nickname '$nick' is registered on this server.", i18n_symbols);
} else if((*error)["error_code"] == MP_PASSWORD_REQUEST_FOR_LOGGED_IN_NAME) {
error_message = vgettext("The nick '$nick' is registered on this server.", i18n_symbols)
+ "\n\n" + _("WARNING: There is already a client using this nick, "
error_message = vgettext("The nickname '$nick' is registered on this server.", i18n_symbols)
+ "\n\n" + _("WARNING: There is already a client using this nickname, "
"logging in will cause that client to be kicked!");
} else if((*error)["error_code"] == MP_NO_SEED_ERROR) {
error_message = _("Error in the login procedure (the server had no "

2
src/multiplayer_connect.cpp
View File

@ -1297,7 +1297,7 @@ void connect::process_network_data(const config& data, const network::connection
if(find_player_side(name) != -1) {
config response;
response["failed"] = true;
response["message"] = "The nick '" + name + "' is already in use.";
response["message"] = "The nickname '" + name + "' is already in use.";
network::send_data(response, sock);
return;
} else {

2
src/server/forum_user_handler.cpp
View File

@ -58,7 +58,7 @@ void fuh::add_user(const std::string& /*name*/, const std::string& /*mail*/, con
}
void fuh::remove_user(const std::string& /*name*/) {
throw error("'Dropping your nick is currently impossible");
throw error("'Dropping your nickname is currently impossible");
}
// The hashing code is basically taken from forum_auth.cpp

4
src/server/sample_user_handler.cpp
View File

@ -39,7 +39,7 @@ suh::suh(config c)
}
void suh::add_user(const std::string& name, const std::string& mail, const std::string& password) {
if(user_exists(name)) throw error("This nick is already registered");
if(user_exists(name)) throw error("This nickname is already registered");
users_.insert(std::pair<std::string, user>(name, user()));
@ -50,7 +50,7 @@ void suh::add_user(const std::string& name, const std::string& mail, const std::
}
void suh::remove_user(const std::string& name) {
if(!user_exists(name)) throw error("This nick is not registered");
if(!user_exists(name)) throw error("This nickname is not registered");
users_.erase(name);
}

24
src/server/server.cpp
View File

@ -311,7 +311,7 @@ namespace {
" dul|deny_unregistered_login [yes|no], kick <mask> [<reason>],"
" k[ick]ban <mask> <time> <reason>, help, games, metrics,"
" netstats [all], [lobby]msg <message>, motd [<message>],"
" pm|privatemsg <nick> <message>, requests, sample, searchlog <mask>,"
" pm|privatemsg <nickname> <message>, requests, sample, searchlog <mask>,"
" signout, stats, status [<mask>], unban <ipmask>\n"
"Specific strings (those not inbetween <> like the command names)"
" are case insensitive.";
@ -442,7 +442,7 @@ void server::send_password_request(network::connection sock, const std::string&
std::string pepper = user_handler_->create_pepper(user);
std::string spices = pepper + salt;
if(user_handler_->use_phpbb_encryption() && pepper.empty()) {
send_error(sock, "Even though your nick is registered on this server you "
send_error(sock, "Even though your nickname is registered on this server you "
"cannot log in due to an error in the hashing algorithm. "
"Logging into your forum account on http://forum.wesnoth.org "
"may fix this problem.");
@ -1025,13 +1025,13 @@ void server::process_login(const network::connection sock,
// Check if the username is valid (all alpha-numeric plus underscore and hyphen)
std::string username = (*login)["username"].to_string();
if (!utils::isvalid_username(username)) {
send_error(sock, "The nick '" + username + "' contains invalid "
send_error(sock, "The nickname '" + username + "' contains invalid "
"characters. Only alpha-numeric characters, underscores and hyphens"
"are allowed.", MP_INVALID_CHARS_IN_NAME_ERROR);
return;
}
if (username.size() > 20) {
send_error(sock, "The nick '" + username + "' is too long. Nicks must be 20 characters or less.",
send_error(sock, "The nickname '" + username + "' is too long. Nicks must be 20 characters or less.",
MP_NAME_TOO_LONG_ERROR);
return;
}
@ -1042,7 +1042,7 @@ void server::process_login(const network::connection sock,
if (utils::wildcard_string_match(utils::lowercase(username),
utils::lowercase(*d_it)))
{
send_error(sock, "The nick '" + username + "' is reserved and cannot be used by players",
send_error(sock, "The nickname '" + username + "' is reserved and cannot be used by players",
MP_NAME_RESERVED_ERROR);
return;
}
@ -1097,10 +1097,10 @@ void server::process_login(const network::connection sock,
// This name is registered and no password provided
if(password.empty()) {
if(p == players_.end()) {
send_password_request(sock, "The nick '" + username +"' is registered on this server.",
send_password_request(sock, "The nickname '" + username +"' is registered on this server.",
username, MP_PASSWORD_REQUEST);
} else {
send_password_request(sock, "The nick '" + username + "' is registered on this server."
send_password_request(sock, "The nickname '" + username + "' is registered on this server."
"\n\nWARNING: There is already a client using this username, "
"logging in will cause that client to be kicked!",
username, MP_PASSWORD_REQUEST_FOR_LOGGED_IN_NAME, true);
@ -1117,11 +1117,11 @@ void server::process_login(const network::connection sock,
else if(!(user_handler_->login(username, password, seeds_[sock]))) {
// Reset the random seed
seeds_.erase(sock);
send_password_request(sock, "The password you provided for the nick '" + username +
send_password_request(sock, "The password you provided for the nickname '" + username +
"' was incorrect.", username, MP_INCORRECT_PASSWORD_ERROR);
LOG_SERVER << network::ip_address(sock) << "\t"
<< "Login attempt with incorrect password for nick '" << username << "'.\n";
<< "Login attempt with incorrect password for nickname '" << username << "'.\n";
return;
}
// This name exists and the password was neither empty nor incorrect
@ -1134,8 +1134,8 @@ void server::process_login(const network::connection sock,
// If we disallow unregistered users and this user is not registered send an error
if(user_handler_ && !registered && deny_unregistered_login_) {
send_error(sock, "The nick '" + username + "' is not registered. "
"This server disallows unregistered nicks.", MP_NAME_UNREGISTERED_ERROR);
send_error(sock, "The nickname '" + username + "' is not registered. "
"This server disallows unregistered nicknames.", MP_NAME_UNREGISTERED_ERROR);
return;
}
@ -1144,7 +1144,7 @@ void server::process_login(const network::connection sock,
// If there is already a client using this username kick it
process_command("kick " + p->second.name() + " autokick by registered user", username);
} else {
send_error(sock, "The nick '" + username + "' is already taken.", MP_NAME_TAKEN_ERROR);
send_error(sock, "The nickname '" + username + "' is already taken.", MP_NAME_TAKEN_ERROR);
return;
}
}