Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hacker <dd0t@users.sourceforge.net>2012-11-12 19:53:22 +0400
committerStefan Hacker <dd0t@users.sourceforge.net>2012-11-12 19:56:23 +0400
commit1922df797ddabe280600a5870057f6c44a950c59 (patch)
treee9490e1b855a30e920c96e9741622a0b8a82427b
parent09f2ec0d8e62f0a723861fc875dfbd785b895040 (diff)
Connection reject messages weren't translated properly client-side.
* Re-use MainWindow::serverDisconnected title strings as to not break the string freeze.
-rw-r--r--src/mumble/Messages.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp
index 77245e7f9..d6763e9cc 100644
--- a/src/mumble/Messages.cpp
+++ b/src/mumble/Messages.cpp
@@ -87,7 +87,27 @@ void MainWindow::msgBanList(const MumbleProto::BanList &msg) {
void MainWindow::msgReject(const MumbleProto::Reject &msg) {
rtLast = msg.type();
- g.l->log(Log::ServerDisconnected, tr("Server connection rejected: %1.").arg(u8(msg.reason())));
+
+ QString reason(u8(msg.reason()));;
+
+ switch (rtLast) {
+ case MumbleProto::Reject_RejectType_InvalidUsername:
+ reason = tr("Invalid username");
+ break;
+ case MumbleProto::Reject_RejectType_UsernameInUse:
+ reason = tr("Username in use");
+ break;
+ case MumbleProto::Reject_RejectType_WrongUserPW:
+ reason = tr("Wrong certificate or password");
+ break;
+ case MumbleProto::Reject_RejectType_WrongServerPW:
+ reason = tr("Wrong password");
+ break;
+ default:
+ break;
+ }
+
+ g.l->log(Log::ServerDisconnected, tr("Server connection rejected: %1.").arg(reason));
g.l->setIgnore(Log::ServerDisconnected, 1);
}