From e0c62827a833a1453eeedec2bb7a8cb11bd2fa24 Mon Sep 17 00:00:00 2001 From: FranciscoPombal Date: Wed, 9 Sep 2020 21:52:45 +0100 Subject: [PATCH] Fix peer blocked message --- src/base/bittorrent/session.cpp | 12 ++++++------ src/gui/log/logmodel.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index afbd0b102..a87462fb2 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -4493,22 +4493,22 @@ void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p) QString reason; switch (p->reason) { case lt::peer_blocked_alert::ip_filter: - reason = tr("due to IP filter.", "this peer was blocked due to ip filter."); + reason = tr("IP filter", "this peer was blocked. Reason: IP filter."); break; case lt::peer_blocked_alert::port_filter: - reason = tr("due to port filter.", "this peer was blocked due to port filter."); + reason = tr("port filter", "this peer was blocked. Reason: port filter."); break; case lt::peer_blocked_alert::i2p_mixed: - reason = tr("due to i2p mixed mode restrictions.", "this peer was blocked due to i2p mixed mode restrictions."); + reason = tr("%1 mixed mode restrictions", "this peer was blocked. Reason: I2P mixed mode restrictions.").arg("I2P"); // don't translate I2P break; case lt::peer_blocked_alert::privileged_ports: - reason = tr("because it has a low port.", "this peer was blocked because it has a low port."); + reason = tr("use of privileged port", "this peer was blocked. Reason: use of privileged port."); break; case lt::peer_blocked_alert::utp_disabled: - reason = tr("because %1 is disabled.", "this peer was blocked because uTP is disabled.").arg(QString::fromUtf8(C_UTP)); // don't translate μTP + reason = tr("%1 is disabled", "this peer was blocked. Reason: uTP is disabled.").arg(QString::fromUtf8(C_UTP)); // don't translate μTP break; case lt::peer_blocked_alert::tcp_disabled: - reason = tr("because %1 is disabled.", "this peer was blocked because TCP is disabled.").arg("TCP"); // don't translate TCP + reason = tr("%1 is disabled", "this peer was blocked. Reason: TCP is disabled.").arg("TCP"); // don't translate TCP break; } diff --git a/src/gui/log/logmodel.cpp b/src/gui/log/logmodel.cpp index f460be8a9..ebccb5308 100644 --- a/src/gui/log/logmodel.cpp +++ b/src/gui/log/logmodel.cpp @@ -172,7 +172,7 @@ void LogPeerModel::handleNewMessage(const Log::Peer &peer) { const QString time = QDateTime::fromMSecsSinceEpoch(peer.timestamp).toString(Qt::SystemLocaleShortDate); const QString message = peer.blocked - ? tr("%1 was blocked due to %2", "0.0.0.0 was blocked due to reason").arg(peer.ip, peer.reason) + ? tr("%1 was blocked. Reason: %2.", "0.0.0.0 was blocked. Reason: reason for blocking.").arg(peer.ip, peer.reason) : tr("%1 was banned", "0.0.0.0 was banned").arg(peer.ip); addNewMessage({time, message, m_bannedPeerForeground, Log::NORMAL});