iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

More translateable strings (#1354)

Browse Source
This commit is contained in:
Alexey Sokolov
2018-03-31 22:29:09 +01:00
parent d8327977ca
commit 1eceb5a5c7
7 changed files with 129 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/IRCSock.cpp
View File

@@ -481,7 +481,7 @@ bool CIRCSock::OnCTCPMessage(CCTCPMessage& Message) {
bool CIRCSock::OnErrorMessage(CMessage& Message) {
// ERROR :Closing Link: nick[24.24.24.24] (Excess Flood)
CString sError = Message.GetParam(0);
m_pNetwork->PutStatus("Error from Server [" + sError + "]");
m_pNetwork->PutStatus(t_f("Error from server: {1}")(sError));
return true;
}
@@ -682,8 +682,8 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
if (m_bAuthed && sServer == "irc.znc.in") {
// m_bAuthed == true => we already received another 001 => we
// might be in a traffic loop
m_pNetwork->PutStatus(
"ZNC seems to be connected to itself, disconnecting...");
m_pNetwork->PutStatus(t_s(
"ZNC seems to be connected to itself, disconnecting..."));
Quit();
return true;
}
@@ -730,11 +730,11 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
CString sPort = Message.GetParam(2);
CString sInfo = Message.GetParam(3);
m_pNetwork->PutStatus(
"Server [" + m_pNetwork->GetCurrentServer()->GetString(false) +
"] redirects us to [" + sHost + ":" + sPort +
"] with reason [" + sInfo + "]");
t_f("Server {1} redirects us to {2}:{3} with reason: {3}")(
m_pNetwork->GetCurrentServer()->GetString(false), sHost,
sPort, sInfo));
m_pNetwork->PutStatus(
"Perhaps you want to add it as a new server.");
t_s("Perhaps you want to add it as a new server."));
// Don't send server redirects to the client
return true;
}
@@ -963,9 +963,9 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
}
if (pChan) {
pChan->Disable();
m_pNetwork->PutStatus("Channel [" + pChan->GetName() +
"] is linked to "
"another channel and was thus disabled.");
m_pNetwork->PutStatus(
t_f("Channel {1} is linked to another channel and was thus "
"disabled.")(pChan->GetName()));
}
break;
}
@@ -976,7 +976,7 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
// TLS
if (!GetSSL()) {
StartTLS();
m_pNetwork->PutStatus("Switched to SSL (STARTTLS)");
m_pNetwork->PutStatus(t_s("Switched to SSL (STARTTLS)"));
}
return true;
@@ -1029,7 +1029,7 @@ bool CIRCSock::OnQuitMessage(CQuitMessage& Message) {
bool bIsVisible = false;
if (Nick.NickEquals(GetNick())) {
m_pNetwork->PutStatus("You quit [" + Message.GetReason() + "]");
m_pNetwork->PutStatus(t_f("You quit: {1}")(Message.GetReason()));
// We don't call module hooks and we don't
// forward this quit to clients (Some clients
// disconnect if they receive such a QUIT)
@@ -1235,7 +1235,7 @@ void CIRCSock::Disconnected() {
if (!m_pNetwork->GetUser()->IsBeingDeleted() &&
m_pNetwork->GetIRCConnectEnabled() &&
m_pNetwork->GetServers().size() != 0) {
m_pNetwork->PutStatus("Disconnected from IRC. Reconnecting...");
m_pNetwork->PutStatus(t_s("Disconnected from IRC. Reconnecting..."));
}
m_pNetwork->ClearRawBuffer();
m_pNetwork->ClearMotdBuffer();
@@ -1265,11 +1265,11 @@ void CIRCSock::SockError(int iErrno, const CString& sDescription) {
DEBUG(GetSockName() << " == SockError(" << iErrno << " " << sError << ")");
if (!m_pNetwork->GetUser()->IsBeingDeleted()) {
if (GetConState() != CST_OK) {
m_pNetwork->PutStatus("Cannot connect to IRC (" + sError +
"). Retrying...");
m_pNetwork->PutStatus(
t_f("Cannot connect to IRC ({1}). Retrying...")(sError));
} else {
m_pNetwork->PutStatus("Disconnected from IRC (" + sError +
"). Reconnecting...");
m_pNetwork->PutStatus(
t_f("Disconnected from IRC ({1}). Reconnecting...")(sError));
}
#ifdef HAVE_LIBSSL
if (iErrno == errnoBadSSLCert) {
@@ -1299,9 +1299,8 @@ void CIRCSock::SockError(int iErrno, const CString& sDescription) {
CString sSHA256 = GetSSLPeerFingerprint();
m_pNetwork->PutStatus("SHA-256: " + sSHA256);
m_pNetwork->PutStatus(
"If you trust this certificate, do /znc "
"AddTrustedServerFingerprint " +
sSHA256);
t_f("If you trust this certificate, do /znc "
"AddTrustedServerFingerprint {1}")(sSHA256));
}
}
#endif
@@ -1316,7 +1315,8 @@ void CIRCSock::SockError(int iErrno, const CString& sDescription) {
void CIRCSock::Timeout() {
DEBUG(GetSockName() << " == Timeout()");
if (!m_pNetwork->GetUser()->IsBeingDeleted()) {
m_pNetwork->PutStatus("IRC connection timed out. Reconnecting...");
m_pNetwork->PutStatus(
t_s("IRC connection timed out. Reconnecting..."));
}
m_pNetwork->ClearRawBuffer();
m_pNetwork->ClearMotdBuffer();
@@ -1328,7 +1328,7 @@ void CIRCSock::Timeout() {
void CIRCSock::ConnectionRefused() {
DEBUG(GetSockName() << " == ConnectionRefused()");
if (!m_pNetwork->GetUser()->IsBeingDeleted()) {
m_pNetwork->PutStatus("Connection Refused. Reconnecting...");
m_pNetwork->PutStatus(t_s("Connection Refused. Reconnecting..."));
}
m_pNetwork->ClearRawBuffer();
m_pNetwork->ClearMotdBuffer();
@@ -1336,7 +1336,7 @@ void CIRCSock::ConnectionRefused() {
void CIRCSock::ReachedMaxBuffer() {
DEBUG(GetSockName() << " == ReachedMaxBuffer()");
m_pNetwork->PutStatus("Received a too long line from the IRC server!");
m_pNetwork->PutStatus(t_s("Received a too long line from the IRC server!"));
Quit();
}
@@ -1440,7 +1440,7 @@ void CIRCSock::SendAltNick(const CString& sBadNick) {
} else {
char cLetter = 0;
if (sBadNick.empty()) {
m_pNetwork->PutUser("No free nick available");
m_pNetwork->PutUser(t_s("No free nick available"));
Quit();
return;
}
@@ -1448,7 +1448,7 @@ void CIRCSock::SendAltNick(const CString& sBadNick) {
cLetter = sBadNick.back();
if (cLetter == 'z') {
m_pNetwork->PutUser("No free nick found");
m_pNetwork->PutUser(t_s("No free nick found"));
Quit();
return;
}