Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 00:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 114060. Added two new error msgs for smtp and nntp send/post errors. r=ducarroz, sr=mscott.

Browse Source
This commit is contained in:
cavin%netscape.com 2002-01-24 02:41:52 +00:00
parent 0123183cd5
commit 9385f7b29d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/compose/resources/locale/en-US/composeMsgs.properties
View File

@ -75,6 +75,9 @@
## @name NS_ERROR_SENDING_MESSAGE
12517=An error occurred while sending mail. The mail server responded: %s. Please check the message and try again.
## @name NS_ERROR_POST_FAILED
12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server setting is correct and try again, or else contact your network administrator.
## @name NS_ERROR_QUEUED_DELIVERY_FAILED
12519=An error occurred delivering unsent messages.
@ -200,6 +203,9 @@ noIdentities=You don't have any email identities yet. Create one with the Accou
## @name NS_FOLLOWUPTO_SENDER
12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
## @name NS_ERROR_SMTP_SEND_FAILED
12565=The message could not be sent because connecting to the SMTP server failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server setting is correct and try again, or else contact your network administrator.
## Strings use for the save message dialog shown when the user close a message compose window
saveDlogTitle=Save Message
saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?

4
mailnews/compose/src/nsMsgComposeStringBundle.h
View File

@ -79,7 +79,7 @@ private:
#define NS_ERROR_SENDING_RCPT_COMMAND NS_MSG_GENERATE_FAILURE(12515)
#define NS_ERROR_SENDING_DATA_COMMAND NS_MSG_GENERATE_FAILURE(12516)
#define NS_ERROR_SENDING_MESSAGE NS_MSG_GENERATE_FAILURE(12517)
#define NS_ERROR_POST_FAILED NS_MSG_GENERATE_FAILURE(12520) // Fix me: should use it's own string 12518!
#define NS_ERROR_POST_FAILED NS_MSG_GENERATE_FAILURE(12518)
#define NS_ERROR_QUEUED_DELIVERY_FAILED NS_MSG_GENERATE_FAILURE(12519)
#define NS_ERROR_SEND_FAILED NS_MSG_GENERATE_FAILURE(12520)
#define SMTP_DELIV_MAIL NS_MSG_GENERATE_SUCCESS(12521)
@ -131,4 +131,6 @@ private:
#define NS_MSG_ERROR_READING_FILE NS_MSG_GENERATE_FAILURE(12563)
#define NS_MSG_FOLLOWUPTO_ALERT NS_MSG_GENERATE_SUCCESS(12564)
#define NS_ERROR_SMTP_SEND_FAILED NS_MSG_GENERATE_FAILURE(12565)
#endif /* _nsMsgComposeStringBundle_H_ */

2
mailnews/compose/src/nsMsgSend.cpp
View File

@ -2959,7 +2959,7 @@ SendDeliveryCallback(nsIURI *aUrl, nsresult aExitCode, nsMsgDeliveryType deliver
break;
default:
if (aExitCode != NS_ERROR_ABORT && !NS_IS_MSG_ERROR(aExitCode))
aExitCode = NS_ERROR_SEND_FAILED;
aExitCode = NS_ERROR_SMTP_SEND_FAILED;
break;
}
msgSend->DeliverAsMailExit(aUrl, aExitCode);