mirror of
https://github.com/anope/anope.git
synced 2026-06-12 19:14:47 +02:00
Consistently use email instead of e-mail.
This commit is contained in:
Sadie Powell
@@ -918,7 +918,7 @@ opertype
|
||||
/*
|
||||
* [OPTIONAL] Mail Config
|
||||
*
|
||||
* This section contains settings related to the use of e-mail from services.
|
||||
* This section contains settings related to the use of email from services.
|
||||
* If the usemail directive is set to yes, unless specified otherwise, all other
|
||||
* directives are required.
|
||||
*
|
||||
@@ -938,7 +938,7 @@ mail
|
||||
|
||||
/*
|
||||
* This is the command-line that will be used to call the mailer to send an
|
||||
* e-mail. It must be called with all the parameters needed to make it
|
||||
* email. It must be called with all the parameters needed to make it
|
||||
* scan the mail input to find the mail recipient; consult your mailer
|
||||
* documentation.
|
||||
*
|
||||
@@ -953,15 +953,15 @@ mail
|
||||
sendmailpath = "/usr/sbin/sendmail -t"
|
||||
|
||||
/*
|
||||
* This is the e-mail address from which all the e-mails are to be sent from.
|
||||
* This is the email address from which all the emails are to be sent from.
|
||||
* It should really exist.
|
||||
*/
|
||||
sendfrom = "services@example.com"
|
||||
|
||||
/*
|
||||
* This controls the minimum amount of time a user must wait before sending
|
||||
* another e-mail after they have sent one. It also controls the minimum time
|
||||
* a user must wait before they can receive another e-mail.
|
||||
* another email after they have sent one. It also controls the minimum time
|
||||
* a user must wait before they can receive another email.
|
||||
*
|
||||
* This feature prevents users from being mail bombed using services and
|
||||
* it is highly recommended that it be used.
|
||||
@@ -972,10 +972,10 @@ mail
|
||||
|
||||
/*
|
||||
* If set, Anope will not put quotes around the TO: fields
|
||||
* in e-mails.
|
||||
* in emails.
|
||||
*
|
||||
* This directive is optional, and as far as we know, it's only needed
|
||||
* if you are using ESMTP or QMail to send out e-mails.
|
||||
* if you are using ESMTP or QMail to send out emails.
|
||||
*/
|
||||
#dontquoteaddresses = yes
|
||||
|
||||
|
||||
@@ -1247,7 +1247,7 @@ command { service = "ChanServ"; name = "SET NOEXPIRE"; command = "chanserv/saset
|
||||
*/
|
||||
module { name = "cs_set_misc" }
|
||||
command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; misc_description = _("Associate a URL with the channel"); }
|
||||
command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; misc_description = _("Associate an E-mail address with the channel"); }
|
||||
command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; misc_description = _("Associate an email address with the channel"); }
|
||||
|
||||
/*
|
||||
* cs_status
|
||||
|
||||
@@ -59,7 +59,7 @@ module { name = "help" }
|
||||
* SOA record information.
|
||||
*/
|
||||
|
||||
/* E-mail address of the DNS administrator. */
|
||||
/* Email address of the DNS administrator. */
|
||||
admin = "admin@example.com"
|
||||
|
||||
/* This should be the names of the public facing nameservers serving the records. */
|
||||
|
||||
@@ -90,7 +90,7 @@ module
|
||||
* - kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
|
||||
* and kill_quick options and the killprotect option must be specified with this one
|
||||
* - ns_private: Hide the nick from NickServ's LIST command
|
||||
* - hide_email: Hide the nick's e-mail address from NickServ's INFO command
|
||||
* - hide_email: Hide the nick's email address from NickServ's INFO command
|
||||
* - hide_mask: Hide the nick's last or current user@host from NickServ's INFO command
|
||||
* - hide_status: Hide the nick's services operator access status from NickServ's INFO command
|
||||
* - hide_quit: Hide the nick's last quit message from NickServ's INFO command
|
||||
@@ -615,7 +615,7 @@ command { service = "NickServ"; name = "UPDATE"; command = "nickserv/update"; }
|
||||
name = "ns_maxemail"
|
||||
|
||||
/*
|
||||
* The limit to how many registered nicks can use the same e-mail address. If set to 0 or left
|
||||
* The limit to how many registered nicks can use the same email address. If set to 0 or left
|
||||
* commented, there will be no limit enforced when registering new accounts or using
|
||||
* /msg NickServ SET EMAIL.
|
||||
*/
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ Anope Multi Language Support
|
||||
po files (especially on Windows).
|
||||
|
||||
If you have finished a language file translation and you want others to use it, please send it to team@anope.org
|
||||
(don't forget to mention clearly your (nick)name, your e-mail and the language name). You'll of course get full credit for it.
|
||||
(don't forget to mention clearly your (nick)name, your email and the language name). You'll of course get full credit for it.
|
||||
|
||||
NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
|
||||
|
||||
|
||||
+2
-2
@@ -87,7 +87,7 @@ namespace Language
|
||||
#define CHAN_X_NOT_REGISTERED _("Channel \002%s\002 isn't registered.")
|
||||
#define CHAN_X_NOT_IN_USE _("Channel \002%s\002 doesn't exist.")
|
||||
#define NICK_IDENTIFY_REQUIRED _("You must be logged into an account to use that command.")
|
||||
#define MAIL_X_INVALID _("\002%s\002 is not a valid e-mail address.")
|
||||
#define MAIL_X_INVALID _("\002%s\002 is not a valid email address.")
|
||||
#define UNKNOWN _("<unknown>")
|
||||
#define NO_EXPIRE _("does not expire")
|
||||
#define LIST_INCORRECT_RANGE _("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
|
||||
@@ -98,7 +98,7 @@ namespace Language
|
||||
#define NICK_CANNOT_BE_REGISTERED _("Nickname \002%s\002 may not be registered.")
|
||||
#define NICK_ALREADY_REGISTERED _("Nickname \002%s\002 is already registered!")
|
||||
#define NICK_SET_DISPLAY_CHANGED _("The new display is now \002%s\002.")
|
||||
#define NICK_CONFIRM_INVALID _("Invalid passcode has been entered, please check the e-mail again, and retry.")
|
||||
#define NICK_CONFIRM_INVALID _("Invalid passcode has been entered, please check the email again, and retry.")
|
||||
#define CHAN_NOT_ALLOWED_TO_JOIN _("You are not permitted to be on this channel.")
|
||||
#define CHAN_X_INVALID _("Channel %s is not a valid channel.")
|
||||
#define CHAN_REACHED_CHANNEL_LIMIT _("Sorry, you have already reached your limit of \002%d\002 channels.")
|
||||
|
||||
+47
-47
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Anope\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-03-07 21:18+0000\n"
|
||||
"PO-Revision-Date: 2024-03-07 21:19+0000\n"
|
||||
"POT-Creation-Date: 2024-03-07 22:40+0000\n"
|
||||
"PO-Revision-Date: 2024-03-07 22:40+0000\n"
|
||||
"Last-Translator: Sadie Powell <sadie@witchery.services>\n"
|
||||
"Language-Team: English\n"
|
||||
"Language: en_US\n"
|
||||
@@ -283,8 +283,8 @@ msgid "%s is not a valid bot or registered channel."
|
||||
msgstr "%s is not a valid bot or registered channel."
|
||||
|
||||
#, c-format
|
||||
msgid "%s is not a valid e-mail address."
|
||||
msgstr "%s is not a valid e-mail address."
|
||||
msgid "%s is not a valid email address."
|
||||
msgstr "%s is not a valid email address."
|
||||
|
||||
#, c-format
|
||||
msgid "%s is not currently on channel %s."
|
||||
@@ -1685,8 +1685,8 @@ msgid "<unknown>"
|
||||
msgstr "<unknown>"
|
||||
|
||||
#, c-format
|
||||
msgid "A confirmation e-mail has been sent to %s. Follow the instructions in it to change your e-mail address."
|
||||
msgstr "A confirmation e-mail has been sent to %s. Follow the instructions in it to change your e-mail address."
|
||||
msgid "A confirmation email has been sent to %s. Follow the instructions in it to change your email address."
|
||||
msgstr "A confirmation email has been sent to %s. Follow the instructions in it to change your email address."
|
||||
|
||||
msgid "A massmemo has been sent to all registered users."
|
||||
msgstr "A massmemo has been sent to all registered users."
|
||||
@@ -2352,7 +2352,7 @@ msgstr ""
|
||||
msgid ""
|
||||
"Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s INFO on the\n"
|
||||
"nick. You can hide the E-mail address (EMAIL), last seen\n"
|
||||
"nick. You can hide the email address (EMAIL), last seen\n"
|
||||
"user@host mask (USERMASK), the services access status\n"
|
||||
"(STATUS) and last quit message (QUIT).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
@@ -2360,7 +2360,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s INFO on the\n"
|
||||
"nick. You can hide the E-mail address (EMAIL), last seen\n"
|
||||
"nick. You can hide the email address (EMAIL), last seen\n"
|
||||
"user@host mask (USERMASK), the services access status\n"
|
||||
"(STATUS) and last quit message (QUIT).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
@@ -2370,7 +2370,7 @@ msgstr ""
|
||||
msgid ""
|
||||
"Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s INFO on your\n"
|
||||
"nick. You can hide your E-mail address (EMAIL), last seen\n"
|
||||
"nick. You can hide your email address (EMAIL), last seen\n"
|
||||
"user@host mask (USERMASK), your services access status\n"
|
||||
"(STATUS) and last quit message (QUIT).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
@@ -2378,7 +2378,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s INFO on your\n"
|
||||
"nick. You can hide your E-mail address (EMAIL), last seen\n"
|
||||
"nick. You can hide your email address (EMAIL), last seen\n"
|
||||
"user@host mask (USERMASK), your services access status\n"
|
||||
"(STATUS) and last quit message (QUIT).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
@@ -2439,24 +2439,24 @@ msgstr "Associate a URL with your account"
|
||||
msgid "Associate a greet message with your nickname"
|
||||
msgstr "Associate a greet message with your nickname"
|
||||
|
||||
msgid "Associate an E-mail address with the channel"
|
||||
msgstr "Associate an E-mail address with the channel"
|
||||
msgid "Associate an email address with the channel"
|
||||
msgstr "Associate an email address with the channel"
|
||||
|
||||
msgid "Associate an E-mail address with your nickname"
|
||||
msgstr "Associate an E-mail address with your nickname"
|
||||
msgid "Associate an email address with your nickname"
|
||||
msgstr "Associate an email address with your nickname"
|
||||
|
||||
msgid "Associate oper info with a nick or channel"
|
||||
msgstr "Associate oper info with a nick or channel"
|
||||
|
||||
msgid "Associates the given E-mail address with the nickname."
|
||||
msgstr "Associates the given E-mail address with the nickname."
|
||||
msgid "Associates the given email address with the nickname."
|
||||
msgstr "Associates the given email address with the nickname."
|
||||
|
||||
msgid ""
|
||||
"Associates the given E-mail address with your nickname.\n"
|
||||
"Associates the given email address with your nickname.\n"
|
||||
"This address will be displayed whenever someone requests\n"
|
||||
"information on the nickname with the INFO command."
|
||||
msgstr ""
|
||||
"Associates the given E-mail address with your nickname.\n"
|
||||
"Associates the given email address with your nickname.\n"
|
||||
"This address will be displayed whenever someone requests\n"
|
||||
"information on the nickname with the INFO command."
|
||||
|
||||
@@ -3537,14 +3537,6 @@ msgstr ""
|
||||
"you may own. Any other user will be able to gain control of\n"
|
||||
"this nick."
|
||||
|
||||
#, c-format
|
||||
msgid "E-mail address for %s changed to %s."
|
||||
msgstr "E-mail address for %s changed to %s."
|
||||
|
||||
#, c-format
|
||||
msgid "E-mail for %s is invalid."
|
||||
msgstr "E-mail for %s is invalid."
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Edits or displays the list of logon news messages. When a\n"
|
||||
@@ -3585,6 +3577,14 @@ msgstr ""
|
||||
msgid "Email address"
|
||||
msgstr "Email address"
|
||||
|
||||
#, c-format
|
||||
msgid "Email address for %s changed to %s."
|
||||
msgstr "Email address for %s changed to %s."
|
||||
|
||||
#, c-format
|
||||
msgid "Email for %s is invalid."
|
||||
msgstr "Email for %s is invalid."
|
||||
|
||||
#, c-format
|
||||
msgid "Email matched: %s (%s) to %s."
|
||||
msgstr "Email matched: %s (%s) to %s."
|
||||
@@ -4135,8 +4135,8 @@ msgstr "Invalid hostmask. Only real hostmasks are valid, as exceptions are not m
|
||||
msgid "Invalid limit %s, using %d."
|
||||
msgstr "Invalid limit %s, using %d."
|
||||
|
||||
msgid "Invalid passcode has been entered, please check the e-mail again, and retry."
|
||||
msgstr "Invalid passcode has been entered, please check the e-mail again, and retry."
|
||||
msgid "Invalid passcode has been entered, please check the email again, and retry."
|
||||
msgstr "Invalid passcode has been entered, please check the email again, and retry."
|
||||
|
||||
msgid "Invalid passcode."
|
||||
msgstr "Invalid passcode."
|
||||
@@ -7210,14 +7210,6 @@ msgstr "The AKILL list has been cleared."
|
||||
msgid "The Defcon level is now at: %d"
|
||||
msgstr "The Defcon level is now at: %d"
|
||||
|
||||
#, c-format
|
||||
msgid "The E-mail address of %s will now be hidden from %s INFO displays."
|
||||
msgstr "The E-mail address of %s will now be hidden from %s INFO displays."
|
||||
|
||||
#, c-format
|
||||
msgid "The E-mail address of %s will now be shown in %s INFO displays."
|
||||
msgstr "The E-mail address of %s will now be shown in %s INFO displays."
|
||||
|
||||
msgid "The available flags are:"
|
||||
msgstr "The available flags are:"
|
||||
|
||||
@@ -7238,6 +7230,14 @@ msgstr "The email address %s has reached its usage limit of %d users."
|
||||
msgid "The email address %s has reached its usage limit of 1 user."
|
||||
msgstr "The email address %s has reached its usage limit of 1 user."
|
||||
|
||||
#, c-format
|
||||
msgid "The email address of %s will now be hidden from %s INFO displays."
|
||||
msgstr "The email address of %s will now be hidden from %s INFO displays."
|
||||
|
||||
#, c-format
|
||||
msgid "The email address of %s will now be shown in %s INFO displays."
|
||||
msgstr "The email address of %s will now be shown in %s INFO displays."
|
||||
|
||||
#, c-format
|
||||
msgid "The entry message list for %s is full."
|
||||
msgstr "The entry message list for %s is full."
|
||||
@@ -7876,12 +7876,12 @@ msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
|
||||
"Your privacy is respected; this e-mail won't be given to\n"
|
||||
"Type %s%s SET EMAIL email in order to set your email.\n"
|
||||
"Your privacy is respected; this email won't be given to\n"
|
||||
"any third-party person."
|
||||
msgstr ""
|
||||
"Type %s%s SET EMAIL e-mail in order to set your e-mail.\n"
|
||||
"Your privacy is respected; this e-mail won't be given to\n"
|
||||
"Type %s%s SET EMAIL email in order to set your email.\n"
|
||||
"Your privacy is respected; this email won't be given to\n"
|
||||
"any third-party person."
|
||||
|
||||
msgid "Un-Load a module"
|
||||
@@ -8376,12 +8376,12 @@ msgstr "You may drop any nick within your group."
|
||||
msgid "You may not (un)lock mode %c."
|
||||
msgstr "You may not (un)lock mode %c."
|
||||
|
||||
msgid "You may not change the e-mail of other Services Operators."
|
||||
msgstr "You may not change the e-mail of other Services Operators."
|
||||
|
||||
msgid "You may not change the email of an unconfirmed account."
|
||||
msgstr "You may not change the email of an unconfirmed account."
|
||||
|
||||
msgid "You may not change the email of other Services Operators."
|
||||
msgstr "You may not change the email of other Services Operators."
|
||||
|
||||
msgid "You may not change the password of other Services Operators."
|
||||
msgstr "You may not change the password of other Services Operators."
|
||||
|
||||
@@ -8429,12 +8429,12 @@ msgid "You must have the %s(ME) privilege on the channel to use this command."
|
||||
msgstr "You must have the %s(ME) privilege on the channel to use this command."
|
||||
|
||||
msgid ""
|
||||
"You must now supply an e-mail for your nick.\n"
|
||||
"This e-mail will allow you to retrieve your password in\n"
|
||||
"You must now supply an email for your nick.\n"
|
||||
"This email will allow you to retrieve your password in\n"
|
||||
"case you forget it."
|
||||
msgstr ""
|
||||
"You must now supply an e-mail for your nick.\n"
|
||||
"This e-mail will allow you to retrieve your password in\n"
|
||||
"You must now supply an email for your nick.\n"
|
||||
"This email will allow you to retrieve your password in\n"
|
||||
"case you forget it."
|
||||
|
||||
msgid "You need to be identified to use this command."
|
||||
|
||||
@@ -40,7 +40,7 @@ else \
|
||||
#define OLD_NI_MEMO_SIGNON 0x00000010 /* Notify of memos at signon and un-away */
|
||||
#define OLD_NI_MEMO_RECEIVE 0x00000020 /* Notify of new memos when sent */
|
||||
#define OLD_NI_PRIVATE 0x00000040 /* Don't show in LIST to non-servadmins */
|
||||
#define OLD_NI_HIDE_EMAIL 0x00000080 /* Don't show E-mail in INFO */
|
||||
#define OLD_NI_HIDE_EMAIL 0x00000080 /* Don't show email in INFO */
|
||||
#define OLD_NI_HIDE_MASK 0x00000100 /* Don't show last seen address in INFO */
|
||||
#define OLD_NI_HIDE_QUIT 0x00000200 /* Don't show last quit message in INFO */
|
||||
#define OLD_NI_KILL_QUICK 0x00000400 /* Kill in 20 seconds instead of 60 */
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* Contact us at team@anope.org
|
||||
*
|
||||
* Taken from IRC Services and is copyright (c) 1996-2002 Andrew Church.
|
||||
* E-mail: <achurch@achurch.org>
|
||||
* Email: <achurch@achurch.org>
|
||||
* Parts written by Andrew Kempe and others.
|
||||
* This program is free but copyrighted software; see the file COPYING for
|
||||
* details.
|
||||
|
||||
@@ -359,11 +359,11 @@ public:
|
||||
|
||||
if (u->Account()->email.empty())
|
||||
{
|
||||
u->SendMessage(NickServ, _("You must now supply an e-mail for your nick.\n"
|
||||
"This e-mail will allow you to retrieve your password in\n"
|
||||
u->SendMessage(NickServ, _("You must now supply an email for your nick.\n"
|
||||
"This email will allow you to retrieve your password in\n"
|
||||
"case you forget it."));
|
||||
u->SendMessage(NickServ, _("Type \002%s%s SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n"
|
||||
"Your privacy is respected; this e-mail won't be given to\n"
|
||||
u->SendMessage(NickServ, _("Type \002%s%s SET EMAIL \037email\037\002 in order to set your email.\n"
|
||||
"Your privacy is respected; this email won't be given to\n"
|
||||
"any third-party person."), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str());
|
||||
}
|
||||
|
||||
@@ -541,7 +541,7 @@ public:
|
||||
|
||||
if (expire)
|
||||
{
|
||||
Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (e-mail: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")";
|
||||
Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (email: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")";
|
||||
FOREACH_MOD(OnNickExpire, (na));
|
||||
delete na;
|
||||
}
|
||||
|
||||
@@ -166,8 +166,8 @@ public:
|
||||
if (param.equals_ci("EMAIL"))
|
||||
{
|
||||
flag = "HIDE_EMAIL";
|
||||
onmsg = _("The E-mail address of \002%s\002 will now be hidden from %s INFO displays.");
|
||||
offmsg = _("The E-mail address of \002%s\002 will now be shown in %s INFO displays.");
|
||||
onmsg = _("The email address of \002%s\002 will now be hidden from %s INFO displays.");
|
||||
offmsg = _("The email address of \002%s\002 will now be shown in %s INFO displays.");
|
||||
}
|
||||
else if (param.equals_ci("USERMASK"))
|
||||
{
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
source.Reply(" ");
|
||||
source.Reply(_("Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s \002INFO\002 on your\n"
|
||||
"nick. You can hide your E-mail address (\002EMAIL\002), last seen\n"
|
||||
"nick. You can hide your email address (\002EMAIL\002), last seen\n"
|
||||
"user@host mask (\002USERMASK\002), your services access status\n"
|
||||
"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
@@ -250,7 +250,7 @@ public:
|
||||
source.Reply(" ");
|
||||
source.Reply(_("Allows you to prevent certain pieces of information from\n"
|
||||
"being displayed when someone does a %s \002INFO\002 on the\n"
|
||||
"nick. You can hide the E-mail address (\002EMAIL\002), last seen\n"
|
||||
"nick. You can hide the email address (\002EMAIL\002), last seen\n"
|
||||
"user@host mask (\002USERMASK\002), the services access status\n"
|
||||
"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
|
||||
"The second parameter specifies whether the information should\n"
|
||||
|
||||
@@ -544,7 +544,7 @@ class CommandNSSetEmail
|
||||
public:
|
||||
CommandNSSetEmail(Module *creator, const Anope::string &cname = "nickserv/set/email", size_t min = 1) : Command(creator, cname, min, min + 1)
|
||||
{
|
||||
this->SetDesc(_("Associate an E-mail address with your nickname"));
|
||||
this->SetDesc(_("Associate an email address with your nickname"));
|
||||
this->SetSyntax(_("\037address\037"));
|
||||
}
|
||||
|
||||
@@ -572,7 +572,7 @@ public:
|
||||
|
||||
else if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
|
||||
{
|
||||
source.Reply(_("You may not change the e-mail of other Services Operators."));
|
||||
source.Reply(_("You may not change the email of other Services Operators."));
|
||||
return;
|
||||
}
|
||||
else if (!Mail::Validate(param))
|
||||
@@ -591,14 +591,14 @@ public:
|
||||
if (SendConfirmMail(source.GetUser(), source.GetAccount(), source.service, param))
|
||||
{
|
||||
Log(LOG_COMMAND, source, this) << "to request changing the email of " << nc->display << " to " << param;
|
||||
source.Reply(_("A confirmation e-mail has been sent to \002%s\002. Follow the instructions in it to change your e-mail address."), param.c_str());
|
||||
source.Reply(_("A confirmation email has been sent to \002%s\002. Follow the instructions in it to change your email address."), param.c_str());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email of " << nc->display << " to " << param;
|
||||
nc->email = param;
|
||||
source.Reply(_("E-mail address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
|
||||
source.Reply(_("Email address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -611,7 +611,7 @@ public:
|
||||
{
|
||||
this->SendSyntax(source);
|
||||
source.Reply(" ");
|
||||
source.Reply(_("Associates the given E-mail address with your nickname.\n"
|
||||
source.Reply(_("Associates the given email address with your nickname.\n"
|
||||
"This address will be displayed whenever someone requests\n"
|
||||
"information on the nickname with the \002INFO\002 command."));
|
||||
return true;
|
||||
@@ -637,7 +637,7 @@ public:
|
||||
{
|
||||
this->SendSyntax(source);
|
||||
source.Reply(" ");
|
||||
source.Reply(_("Associates the given E-mail address with the nickname."));
|
||||
source.Reply(_("Associates the given email address with the nickname."));
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
+3
-3
@@ -88,7 +88,7 @@ bool Mail::Send(User *u, NickCore *nc, BotInfo *service, const Anope::string &su
|
||||
else if (Anope::CurTime - u->lastmail < b->Get<time_t>("delay"))
|
||||
u->SendMessage(service, _("Please wait \002%lu\002 seconds and retry."), (unsigned long)b->Get<time_t>("delay") - (Anope::CurTime - u->lastmail));
|
||||
else if (nc->email.empty())
|
||||
u->SendMessage(service, _("E-mail for \002%s\002 is invalid."), nc->display.c_str());
|
||||
u->SendMessage(service, _("Email for \002%s\002 is invalid."), nc->display.c_str());
|
||||
else
|
||||
{
|
||||
u->lastmail = nc->lastmail = Anope::CurTime;
|
||||
@@ -115,9 +115,9 @@ bool Mail::Send(NickCore *nc, const Anope::string &subject, const Anope::string
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether we have a valid, common e-mail address.
|
||||
* Checks whether we have a valid, common email address.
|
||||
* This is NOT entirely RFC compliant, and won't be so, because I said
|
||||
* *common* cases. ;) It is very unlikely that e-mail addresses that
|
||||
* *common* cases. ;) It is very unlikely that email addresses that
|
||||
* are really being used will fail the check.
|
||||
*
|
||||
* @param email Email to Validate
|
||||
|
||||
Reference in New Issue
Block a user