summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/buysellhandler.cpp10
-rw-r--r--src/net/ea/charserverhandler.cpp6
-rw-r--r--src/net/ea/chathandler.cpp6
-rw-r--r--src/net/ea/inventoryhandler.cpp9
-rw-r--r--src/net/ea/loginhandler.cpp2
-rw-r--r--src/net/ea/playerhandler.cpp6
-rw-r--r--src/net/ea/playerhandler.h4
-rw-r--r--src/net/ea/tradehandler.cpp45
-rw-r--r--src/net/playerhandler.h4
-rw-r--r--src/net/tmwserv/chathandler.cpp13
-rw-r--r--src/net/tmwserv/guildhandler.cpp25
-rw-r--r--src/net/tmwserv/partyhandler.cpp8
-rw-r--r--src/net/tmwserv/playerhandler.cpp6
-rw-r--r--src/net/tmwserv/playerhandler.h4
-rw-r--r--src/net/tmwserv/tradehandler.cpp19
15 files changed, 96 insertions, 71 deletions
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index ca155228..48e856e4 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -108,7 +108,7 @@ void BuySellHandler::handleMessage(MessageIn &msg)
}
else
{
- localChatTab->chatLog(_("Nothing to sell"), BY_SERVER);
+ localChatTab->chatLog(_("Nothing to sell."), BY_SERVER);
current_npc = 0;
}
break;
@@ -116,22 +116,22 @@ void BuySellHandler::handleMessage(MessageIn &msg)
case SMSG_NPC_BUY_RESPONSE:
if (msg.readInt8() == 0)
{
- localChatTab->chatLog(_("Thanks for buying"), BY_SERVER);
+ localChatTab->chatLog(_("Thanks for buying."), BY_SERVER);
}
else
{
// Reset player money since buy dialog already assumed purchase
// would go fine
buyDialog->setMoney(player_node->getMoney());
- localChatTab->chatLog(_("Unable to buy"), BY_SERVER);
+ localChatTab->chatLog(_("Unable to buy."), BY_SERVER);
}
break;
case SMSG_NPC_SELL_RESPONSE:
if (msg.readInt8() == 0)
- localChatTab->chatLog(_("Thanks for selling"), BY_SERVER);
+ localChatTab->chatLog(_("Thanks for selling."), BY_SERVER);
else
- localChatTab->chatLog(_("Unable to sell"), BY_SERVER);
+ localChatTab->chatLog(_("Unable to sell."), BY_SERVER);
break;
}
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index b28961b6..77bfaa50 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -120,8 +120,8 @@ void CharServerHandler::handleMessage(MessageIn &msg)
break;
case SMSG_CHAR_CREATE_FAILED:
- new OkDialog(_("Error"), _("Failed to create character. Most likely"
- " the name is already taken."));
+ new OkDialog(_("Error"), _("Failed to create character. Most "
+ "likely the name is already taken."));
if (mCharCreateDialog)
mCharCreateDialog->unlock();
@@ -132,7 +132,7 @@ void CharServerHandler::handleMessage(MessageIn &msg)
mCharInfo->setEntry(0);
mCharInfo->unlock();
n_character--;
- new OkDialog(_("Info"), _("Player deleted"));
+ new OkDialog(_("Info"), _("Character deleted."));
break;
case SMSG_CHAR_DELETE_FAILED:
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 09eca6f9..49f83e67 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -75,10 +75,12 @@ void ChatHandler::handleMessage(MessageIn &msg)
//localChatTab->chatLog("Whisper sent", BY_SERVER);
break;
case 0x01:
- localChatTab->chatLog(_("Whisper could not be sent, user is offline"), BY_SERVER);
+ localChatTab->chatLog(_("Whisper could not be sent, user "
+ "is offline."), BY_SERVER);
break;
case 0x02:
- localChatTab->chatLog(_("Whisper could not be sent, ignored by user"), BY_SERVER);
+ localChatTab->chatLog(_("Whisper could not be sent, "
+ "ignored by user."), BY_SERVER);
break;
}
break;
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 30c583b8..e91a1c19 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -181,7 +181,10 @@ void InventoryHandler::handleMessage(MessageIn &msg)
if (msg.readInt8() > 0)
{
if (config.getValue("showpickupchat", 1))
- localChatTab->chatLog(_("Unable to pick up item"), BY_SERVER);
+ {
+ localChatTab->chatLog(_("Unable to pick up item."),
+ BY_SERVER);
+ }
}
else
{
@@ -191,7 +194,7 @@ void InventoryHandler::handleMessage(MessageIn &msg)
if (config.getValue("showpickupchat", 1))
{
- localChatTab->chatLog(strprintf(_("You picked up %s [@@%d|%s@@]"),
+ localChatTab->chatLog(strprintf(_("You picked up %s [@@%d|%s@@]."),
amountStr.c_str(), itemInfo.getId(), itemInfo.getName().c_str()),
BY_SERVER);
}
@@ -237,7 +240,7 @@ void InventoryHandler::handleMessage(MessageIn &msg)
amount = msg.readInt16();
if (msg.readInt8() == 0) {
- localChatTab->chatLog(_("Failed to use item"), BY_SERVER);
+ localChatTab->chatLog(_("Failed to use item."), BY_SERVER);
} else {
if (Item *item = inventory->getItem(index))
item->setQuantity(amount);
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 44eabe46..31d2c020 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -126,7 +126,7 @@ void LoginHandler::handleMessage(MessageIn &msg)
case 6:
errorMessage = strprintf(_("You have been temporarily "
"banned from the game until "
- "%s.\n Please contact the GM "
+ "%s.\nPlease contact the GM "
"team via the forums."),
msg.readString(20).c_str());
break;
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 8cc4b44f..c1b7cc84 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -410,7 +410,7 @@ void PlayerHandler::handleMessage(MessageIn &msg)
switch (type) {
case 0:
- localChatTab->chatLog(_("Equip arrows first"),
+ localChatTab->chatLog(_("Equip arrows first."),
BY_SERVER);
break;
default:
@@ -513,12 +513,12 @@ void PlayerHandler::respawn()
outMsg.writeInt8(0);
}
-void PlayerHandler::ingorePlayer(const std::string &player, bool ignore)
+void PlayerHandler::ignorePlayer(const std::string &player, bool ignore)
{
// TODO
}
-void PlayerHandler::ingoreAll(bool ignore)
+void PlayerHandler::ignoreAll(bool ignore)
{
// TODO
}
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 4429d856..5dbc171b 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -53,9 +53,9 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
void respawn();
- void ingorePlayer(const std::string &player, bool ignore);
+ void ignorePlayer(const std::string &player, bool ignore);
- void ingoreAll(bool ignore);
+ void ignoreAll(bool ignore);
};
} // namespace EAthena
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 74722332..4f045573 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -38,6 +38,7 @@
#include "gui/widgets/chattab.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
std::string tradePartnerName;
@@ -88,7 +89,8 @@ void TradeHandler::handleMessage(MessageIn &msg)
// special message about the player being occupied.
tradePartnerName = msg.readString(24);
- if (player_relations.hasPermission(tradePartnerName, PlayerRelation::TRADE))
+ if (player_relations.hasPermission(tradePartnerName,
+ PlayerRelation::TRADE))
{
if (!player_node->tradeRequestOk())
{
@@ -98,9 +100,9 @@ void TradeHandler::handleMessage(MessageIn &msg)
player_node->setTrading(true);
ConfirmDialog *dlg;
- dlg = new ConfirmDialog(_("Request for trade"),
- tradePartnerName +
- _(" wants to trade with you, do you accept?"));
+ dlg = new ConfirmDialog(_("Request for Trade"),
+ strprintf(_("%s wants to trade with you, do you "
+ "accept?"), tradePartnerName.c_str()));
dlg->addActionListener(&listener);
}
else
@@ -114,35 +116,36 @@ void TradeHandler::handleMessage(MessageIn &msg)
switch (msg.readInt8())
{
case 0: // Too far away
- localChatTab->chatLog(_("Trading isn't possible. Trade partner is too far away."),
- BY_SERVER);
+ localChatTab->chatLog(_("Trading isn't possible. Trade "
+ "partner is too far away."), BY_SERVER);
break;
case 1: // Character doesn't exist
- localChatTab->chatLog(_("Trading isn't possible. Character doesn't exist."),
- BY_SERVER);
+ localChatTab->chatLog(_("Trading isn't possible. Character "
+ "doesn't exist."), BY_SERVER);
break;
case 2: // Invite request check failed...
- localChatTab->chatLog(_("Trade cancelled due to an unknown reason."),
- BY_SERVER);
+ localChatTab->chatLog(_("Trade cancelled due to an unknown "
+ "reason."), BY_SERVER);
break;
case 3: // Trade accepted
tradeWindow->reset();
- tradeWindow->setCaption(
- _("Trade: You and ") + tradePartnerName);
+ tradeWindow->setCaption(strprintf(_("Trade: You and %s"),
+ tradePartnerName.c_str()));
tradeWindow->setVisible(true);
break;
case 4: // Trade cancelled
if (player_relations.hasPermission(tradePartnerName,
PlayerRelation::SPEECH_LOG))
- localChatTab->chatLog(_("Trade with ") + tradePartnerName +
- _(" cancelled"), BY_SERVER);
+ localChatTab->chatLog(strprintf(_("Trade with %s "
+ "cancelled."), tradePartnerName.c_str()),
+ BY_SERVER);
// otherwise ignore silently
tradeWindow->setVisible(false);
player_node->setTrading(false);
break;
default: // Shouldn't happen as well, but to be sure
- localChatTab->chatLog(_("Unhandled trade cancel packet"),
+ localChatTab->chatLog(_("Unhandled trade cancel packet."),
BY_SERVER);
break;
}
@@ -192,17 +195,17 @@ void TradeHandler::handleMessage(MessageIn &msg)
break;
case 1:
// Add item failed - player overweighted
- localChatTab->chatLog(_("Failed adding item. Trade partner is over weighted."),
- BY_SERVER);
+ localChatTab->chatLog(_("Failed adding item. Trade "
+ "partner is over weighted."), BY_SERVER);
break;
case 2:
// Add item failed - player has no free slot
- localChatTab->chatLog(_("Failed adding item. Trade partner has no free slot."),
- BY_SERVER);
+ localChatTab->chatLog(_("Failed adding item. Trade "
+ "partner has no free slot."), BY_SERVER);
break;
default:
- localChatTab->chatLog(_("Failed adding item for unknown reason."),
- BY_SERVER);
+ localChatTab->chatLog(_("Failed adding item for "
+ "unknown reason."), BY_SERVER);
break;
}
}
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index c51c59c0..163b48f3 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -49,9 +49,9 @@ class PlayerHandler
virtual void respawn() = 0;
- virtual void ingorePlayer(const std::string &player, bool ignore) = 0;
+ virtual void ignorePlayer(const std::string &player, bool ignore) = 0;
- virtual void ingoreAll(bool ignore) = 0;
+ virtual void ignoreAll(bool ignore) = 0;
};
} // namespace Net
diff --git a/src/net/tmwserv/chathandler.cpp b/src/net/tmwserv/chathandler.cpp
index 41dc7bee..e2d09534 100644
--- a/src/net/tmwserv/chathandler.cpp
+++ b/src/net/tmwserv/chathandler.cpp
@@ -43,11 +43,12 @@
#include "gui/chat.h"
#include "gui/guildwindow.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
#include <string>
#include <iostream>
-#include "utils/gettext.h"
-
extern Being *player_node;
Net::ChatHandler *chatHandler;
@@ -154,7 +155,7 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
Channel *channel = new Channel(channelId, channelName, announcement);
channelManager->addChannel(channel);
ChatTab *tab = channel->getTab();
- tab->chatLog(_("Topic: ") + announcement, BY_CHANNEL);
+ tab->chatLog(strprintf(_("Topic: %s"), announcement.c_str()), BY_CHANNEL);
std::string user;
std::string userModes;
@@ -175,13 +176,13 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
}
else
{
- localChatTab->chatLog("Error joining channel", BY_SERVER);
+ localChatTab->chatLog("Error joining channel.", BY_SERVER);
}
}
void ChatHandler::handleListChannelsResponse(MessageIn &msg)
{
- localChatTab->chatLog("Listing Channels", BY_SERVER);
+ localChatTab->chatLog("Listing channels", BY_SERVER);
while(msg.getUnreadLength())
{
std::string channelName = msg.readString();
@@ -193,7 +194,7 @@ void ChatHandler::handleListChannelsResponse(MessageIn &msg)
channelName += numUsers.str();
localChatTab->chatLog(channelName, BY_SERVER);
}
- localChatTab->chatLog("End of channel list", BY_SERVER);
+ localChatTab->chatLog("End of channel list.", BY_SERVER);
}
void ChatHandler::handlePrivateMessage(MessageIn &msg)
diff --git a/src/net/tmwserv/guildhandler.cpp b/src/net/tmwserv/guildhandler.cpp
index 92057e6e..8d078740 100644
--- a/src/net/tmwserv/guildhandler.cpp
+++ b/src/net/tmwserv/guildhandler.cpp
@@ -37,6 +37,9 @@
#include "channel.h"
#include "channelmanager.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
#include <iostream>
namespace TmwServ {
@@ -68,12 +71,12 @@ void GuildHandler::handleMessage(MessageIn &msg)
if(msg.readInt8() == ERRMSG_OK)
{
// TODO - Acknowledge guild was created
- localChatTab->chatLog("Guild created.");
+ localChatTab->chatLog(_("Guild created."));
joinedGuild(msg);
}
else
{
- localChatTab->chatLog("Error creating guild.");
+ localChatTab->chatLog(_("Error creating guild."));
}
} break;
@@ -83,7 +86,7 @@ void GuildHandler::handleMessage(MessageIn &msg)
if(msg.readInt8() == ERRMSG_OK)
{
// TODO - Acknowledge invite was sent
- localChatTab->chatLog("Invite sent.");
+ localChatTab->chatLog(_("Invite sent."));
}
} break;
@@ -144,7 +147,8 @@ void GuildHandler::handleMessage(MessageIn &msg)
{
case GUILD_EVENT_NEW_PLAYER:
guild->addMember(guildMember);
- guildWindow->setOnline(guild->getName(), guildMember, true);
+ guildWindow->setOnline(guild->getName(), guildMember,
+ true);
break;
case GUILD_EVENT_LEAVING_PLAYER:
@@ -152,11 +156,13 @@ void GuildHandler::handleMessage(MessageIn &msg)
break;
case GUILD_EVENT_ONLINE_PLAYER:
- guildWindow->setOnline(guild->getName(), guildMember, true);
+ guildWindow->setOnline(guild->getName(), guildMember,
+ true);
break;
case GUILD_EVENT_OFFLINE_PLAYER:
- guildWindow->setOnline(guild->getName(), guildMember, false);
+ guildWindow->setOnline(guild->getName(), guildMember,
+ false);
break;
default:
@@ -185,12 +191,12 @@ void GuildHandler::handleMessage(MessageIn &msg)
if (msg.readInt8() == ERRMSG_OK)
{
// promotion succeeded
- localChatTab->chatLog("Member was promoted successfully");
+ localChatTab->chatLog(_("Member was promoted successfully."));
}
else
{
// promotion failed
- localChatTab->chatLog("Failed to promote member");
+ localChatTab->chatLog(_("Failed to promote member."));
}
}
@@ -241,7 +247,8 @@ void GuildHandler::joinedGuild(MessageIn &msg)
// COMMENT: Should this go here??
Channel *channel = new Channel(channelId, guildName, announcement);
channelManager->addChannel(channel);
- channel->getTab()->chatLog("Topic: " + announcement, BY_CHANNEL);
+ channel->getTab()->chatLog(strprintf(_("Topic: %s"), announcement.c_str()),
+ BY_CHANNEL);
}
} // namespace TmwServ
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index 47ef791c..557a3a43 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -35,6 +35,9 @@
#include "log.h"
#include "localplayer.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
#include <iostream>
Net::PartyHandler *partyHandler;
@@ -80,7 +83,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
if (msg.readInt8() == ERRMSG_OK)
{
player_node->setInParty(true);
- localChatTab->chatLog("Joined party");
+ localChatTab->chatLog(_("Joined party."));
}
}
@@ -97,7 +100,8 @@ void PartyHandler::handleMessage(MessageIn &msg)
int id = msg.readInt16(); // being id
std::string name = msg.readString();
- localChatTab->chatLog(name + " joined the party");
+ localChatTab->chatLog(strprintf(_("%s joined the "
+ "party."), name.c_str()));
if (!player_node->isInParty())
player_node->setInParty(true);
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index 543d18d8..e2b922f8 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -284,7 +284,7 @@ void PlayerHandler::handleMessage(MessageIn &msg)
switch (type) {
case 0:
- localChatTab->chatLog("Equip arrows first",
+ localChatTab->chatLog(_("Equip arrows first."),
BY_SERVER);
break;
default:
@@ -393,12 +393,12 @@ void PlayerHandler::respawn()
// TODO
}
-void PlayerHandler::ingorePlayer(const std::string &player, bool ignore)
+void PlayerHandler::ignorePlayer(const std::string &player, bool ignore)
{
// TODO
}
-void PlayerHandler::ingoreAll(bool ignore)
+void PlayerHandler::ignoreAll(bool ignore)
{
// TODO
}
diff --git a/src/net/tmwserv/playerhandler.h b/src/net/tmwserv/playerhandler.h
index 238da182..164d30ae 100644
--- a/src/net/tmwserv/playerhandler.h
+++ b/src/net/tmwserv/playerhandler.h
@@ -52,9 +52,9 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
void respawn();
- void ingorePlayer(const std::string &player, bool ignore);
+ void ignorePlayer(const std::string &player, bool ignore);
- void ingoreAll(bool ignore);
+ void ignoreAll(bool ignore);
private:
void handleMapChangeMessage(MessageIn &msg);
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 74789a34..aabd8b2a 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -40,6 +40,9 @@
#include "gui/widgets/chattab.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
std::string tradePartnerName;
int tradePartnerID;
@@ -87,9 +90,9 @@ void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
{
mAcceptTradeRequests = acceptTradeRequests;
if (mAcceptTradeRequests) {
- localChatTab->chatLog("Accepting incoming trade requests", BY_SERVER);
+ localChatTab->chatLog(_("Accepting incoming trade requests."), BY_SERVER);
} else {
- localChatTab->chatLog("Ignoring incoming trade requests", BY_SERVER);
+ localChatTab->chatLog(_("Ignoring incoming trade requests."), BY_SERVER);
}
}
@@ -108,8 +111,9 @@ void TradeHandler::handleMessage(MessageIn &msg)
player_node->setTrading(true);
tradePartnerName = being->getName();
tradePartnerID = being->getId();
- ConfirmDialog *dlg = new ConfirmDialog("Request for trade",
- tradePartnerName + " wants to trade with you, do you accept?");
+ ConfirmDialog *dlg = new ConfirmDialog(_("Request for Trade"),
+ strprintf(_("%s wants to trade with you, do you accept?"),
+ tradePartnerName.c_str()));
dlg->addActionListener(&listener);
} break;
@@ -126,7 +130,8 @@ void TradeHandler::handleMessage(MessageIn &msg)
case GPMSG_TRADE_START:
tradeWindow->reset();
- tradeWindow->setCaption("Trading with " + tradePartnerName);
+ tradeWindow->setCaption(strprintf(_("Trading with %s"),
+ tradePartnerName.c_str()));
tradeWindow->setVisible(true);
break;
@@ -139,14 +144,14 @@ void TradeHandler::handleMessage(MessageIn &msg)
break;
case GPMSG_TRADE_CANCEL:
- localChatTab->chatLog("Trade canceled.", BY_SERVER);
+ localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
tradeWindow->setVisible(false);
tradeWindow->reset();
player_node->setTrading(false);
break;
case GPMSG_TRADE_COMPLETE:
- localChatTab->chatLog("Trade completed.", BY_SERVER);
+ localChatTab->chatLog(_("Trade completed."), BY_SERVER);
tradeWindow->setVisible(false);
tradeWindow->reset();
player_node->setTrading(false);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-18 08:56:22 +0000