diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/cs_suspend.cpp | 2 | ||||
| -rw-r--r-- | modules/core/ms_main.cpp | 6 | ||||
| -rw-r--r-- | modules/core/ms_read.cpp | 2 | ||||
| -rw-r--r-- | modules/core/ns_resetpass.cpp | 6 | ||||
| -rw-r--r-- | modules/core/ns_sendpass.cpp | 6 | ||||
| -rw-r--r-- | modules/extra/os_defcon.cpp | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/modules/core/cs_suspend.cpp b/modules/core/cs_suspend.cpp index 1836da858..32d75bbeb 100644 --- a/modules/core/cs_suspend.cpp +++ b/modules/core/cs_suspend.cpp @@ -54,7 +54,7 @@ class CommandCSSuspend : public Command if (uc->user->HasMode(UMODE_OPER)) continue; - c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), "This channel has been suspended.").c_str()); + c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), gtl("This channel has been suspended.")).c_str()); } } diff --git a/modules/core/ms_main.cpp b/modules/core/ms_main.cpp index 393c2b89e..c2933254c 100644 --- a/modules/core/ms_main.cpp +++ b/modules/core/ms_main.cpp @@ -17,16 +17,16 @@ static BotInfo *MemoServ = NULL; static bool SendMemoMail(NickCore *nc, MemoInfo *mi, Memo *m) { - Anope::string message = Anope::printf(GetString(nc, + Anope::string message = Anope::printf(GetString(nc, gtl( "Hi %s\n" " \n" "You've just received a new memo from %s. This is memo number %d.\n" " \n" "Memo text:\n" " \n" - "%s").c_str(), nc->display.c_str(), m->sender.c_str(), mi->GetIndex(m), m->text.c_str()); + "%s")).c_str(), nc->display.c_str(), m->sender.c_str(), mi->GetIndex(m), m->text.c_str()); - return Mail(nc, GetString(nc, _("New memo")), message); + return Mail(nc, GetString(nc, gtl("New memo")), message); } class MyMemoServService : public MemoServService diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp index e8868abe2..706906be4 100644 --- a/modules/core/ms_read.cpp +++ b/modules/core/ms_read.cpp @@ -33,7 +33,7 @@ void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Anope::str /* Text of the memo varies if the recepient was a nick or channel */ - Anope::string text = Anope::printf(GetString(na->nc, _("\002[auto-memo]\002 The memo you sent to %s has been viewed.")).c_str(), targ.c_str()); + Anope::string text = Anope::printf(GetString(na->nc, gtl("\002[auto-memo]\002 The memo you sent to %s has been viewed.")).c_str(), targ.c_str()); /* Send notification */ memoserv->Send(source.u->nick, m->sender, text, true); diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp index d84f12e24..903e136fb 100644 --- a/modules/core/ns_resetpass.cpp +++ b/modules/core/ns_resetpass.cpp @@ -138,8 +138,8 @@ static bool SendResetEmail(User *u, NickAlias *na) for (idx = 0; idx < 20; ++idx) passcode += chars[1 + static_cast<int>((static_cast<float>(max - min)) * getrandom16() / 65536.0) + min]; - Anope::string subject = Anope::printf(GetString(na->nc, "Reset password request for %s").c_str(), na->nick.c_str()); - Anope::string message = Anope::printf(GetString(na->nc, + Anope::string subject = Anope::printf(GetString(na->nc, gtl("Reset password request for %s")).c_str(), na->nick.c_str()); + Anope::string message = Anope::printf(GetString(na->nc, gtl( "Hi,\n" " \n" "You have requested to have the password for %s reset.\n" @@ -147,7 +147,7 @@ static bool SendResetEmail(User *u, NickAlias *na) " \n" "If you don't know why this mail was sent to you, please ignore it silently.\n" " \n" - "%s administrators.").c_str(), na->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str()); + "%s administrators.")).c_str(), na->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str()); na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular<Anope::string>(passcode)); na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(Anope::CurTime)); diff --git a/modules/core/ns_sendpass.cpp b/modules/core/ns_sendpass.cpp index 47e8d6a82..e9ef06d59 100644 --- a/modules/core/ns_sendpass.cpp +++ b/modules/core/ns_sendpass.cpp @@ -98,8 +98,8 @@ static bool SendPassMail(User *u, NickAlias *na, const Anope::string &pass) { char subject[BUFSIZE], message[BUFSIZE]; - snprintf(subject, sizeof(subject), GetString(na->nc, "Nickname password (%s)").c_str(), na->nick.c_str()); - snprintf(message, sizeof(message), GetString(na->nc, + snprintf(subject, sizeof(subject), GetString(na->nc, gtl("Nickname password (%s)")).c_str(), na->nick.c_str()); + snprintf(message, sizeof(message), GetString(na->nc, gtl( "Hi,\n" " \n" "You have requested to receive the password of nickname %s by e-mail.\n" @@ -107,7 +107,7 @@ static bool SendPassMail(User *u, NickAlias *na, const Anope::string &pass) " \n" "If you don't know why this mail was sent to you, please ignore it silently.\n" " \n" - "%s administrators.").c_str(), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str()); + "%s administrators.")).c_str(), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str()); return Mail(u, na->nc, nickserv->Bot(), subject, message); } diff --git a/modules/extra/os_defcon.cpp b/modules/extra/os_defcon.cpp index eed8724fe..a23a1a4a8 100644 --- a/modules/extra/os_defcon.cpp +++ b/modules/extra/os_defcon.cpp @@ -119,14 +119,14 @@ class DefConTimeout : public CallBack DConfig.defaultlevel = level; FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(level)); Log(operserv->Bot(), "operserv/defcon") << "Defcon level timeout, returning to level " << level; - ircdproto->SendGlobops(operserv->Bot(), GetString(NULL, _("\002%s\002 Changed the DEFCON level to \002%d\002")).c_str(), Config->s_OperServ.c_str(), level); + ircdproto->SendGlobops(operserv->Bot(), GetString(NULL, gtl("\002%s\002 Changed the DEFCON level to \002%d\002")).c_str(), Config->s_OperServ.c_str(), level); if (DConfig.globalondefcon) { if (!DConfig.offmessage.empty()) global->SendGlobal(global->Bot(), "", DConfig.offmessage); else - global->SendGlobal(global->Bot(), "", Anope::printf(GetString(NULL, _("The Defcon Level is now at Level: \002%d\002")).c_str(), DConfig.defaultlevel)); + global->SendGlobal(global->Bot(), "", Anope::printf(GetString(NULL, gtl("The Defcon Level is now at Level: \002%d\002")).c_str(), DConfig.defaultlevel)); if (!DConfig.message.empty()) global->SendGlobal(global->Bot(), "", DConfig.message); |