Bug 858238 - Convert localMsgs.properties to use string based identifiers rather than numeric. r=Neil
This commit is contained in:
sshagarwal
Родитель
ddf4929517
Коммит
d87a983b6b
|
|
@ -19,8 +19,6 @@ pop3EnterPasswordPrompt=Enter your password for %1$S on %2$S:
|
|||
pop3PreviouslyEnteredPasswordIsInvalidPrompt=Please enter a new password for user %1$S on %2$S:
|
||||
|
||||
# Status - Downloading message n of m to account
|
||||
## @name receivingMsgs
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$S in the following lines.
|
||||
# Place the word %1$S where the number of messages downloaded so far should appear.
|
||||
# Place the word %2$S where the total number of messages to receive should appear;
|
||||
|
|
@ -28,197 +26,119 @@ pop3PreviouslyEnteredPasswordIsInvalidPrompt=Please enter a new password for use
|
|||
receivingMsgs=Downloading message %1$S of %2$S to %3$S
|
||||
|
||||
# Status - connecting to host
|
||||
## @name hostContacted
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S in the following line.
|
||||
# Place %1$S where the account name should appear
|
||||
hostContacted=Connect: Host for %1$S contacted, sending login information…
|
||||
|
||||
# Status - no messages to download
|
||||
## @name noMessages
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S in the following line.
|
||||
# Place %1$S where the account name should appear
|
||||
noMessages=There are no new messages for %1$S.
|
||||
|
||||
# Status - messages received after the download
|
||||
## @name receivedMessages
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
|
||||
# %1$S will receive the number of messages received
|
||||
# %2$S will receive the total number of messages
|
||||
# Place %3$S where the account name should appear
|
||||
receivedMessages=%3$S Received %1$S of %2$S messages
|
||||
|
||||
## @name MK_POP3_OUT_OF_DISK_SPACE
|
||||
## @loc None
|
||||
-321=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
|
||||
pop3OutOfDiskSpace=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
|
||||
|
||||
# Status - parsing folder
|
||||
## @name LOCAL_STATUS_SELECTING_MAILBOX
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (4000): Do not translate %s in the following line.
|
||||
# Place the word %s where the name of the mailbox should appear
|
||||
4000=Building summary file for %S…
|
||||
#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
|
||||
# Place the word %S where the name of the mailbox should appear
|
||||
buildingSummary=Building summary file for %S…
|
||||
|
||||
# Status - parsing folder
|
||||
## @name LOCAL_STATUS_DOCUMENT_DONE
|
||||
## @loc None
|
||||
4001=Done
|
||||
localStatusDocumentDone=Done
|
||||
|
||||
# Status - pop3 server error
|
||||
## @name POP3_SERVER_ERROR
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
|
||||
4003=An error occurred with the POP3 mail server.
|
||||
#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
|
||||
pop3ServerError=An error occurred with the POP3 mail server.
|
||||
|
||||
# Status - pop3 user name failed
|
||||
## @name POP3_USERNAME_FAILURE
|
||||
## @loc None
|
||||
4004=Sending of username did not succeed.
|
||||
pop3UsernameFailure=Sending of username did not succeed.
|
||||
|
||||
# Status - password failed
|
||||
## @name POP3_PASSWORD_FAILURE
|
||||
## @loc None
|
||||
4005=Sending of password did not succeed.
|
||||
pop3PasswordFailure=Sending of password did not succeed.
|
||||
|
||||
# Status - write error occurred
|
||||
## @name POP3_MESSAGE_WRITE_ERROR
|
||||
## @loc None
|
||||
4006=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
|
||||
pop3MessageWriteError=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
|
||||
|
||||
# Status - retr failure from the server
|
||||
## @name POP3_RETR_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
|
||||
4012=The RETR command did not succeed. Error retrieving a message.
|
||||
pop3RetrFailure=The RETR command did not succeed. Error retrieving a message.
|
||||
|
||||
# Status - password undefined
|
||||
## @name POP3_PASSWORD_UNDEFINED
|
||||
## @loc None
|
||||
4013=Error getting mail password.
|
||||
pop3PasswordUndefined=Error getting mail password.
|
||||
|
||||
# Status - username undefined
|
||||
## @name POP3_USERNAME_UNDEFINED
|
||||
## @loc None
|
||||
4014=You have not supplied a username for this server. Please provide one in the account setup menu and try again.
|
||||
pop3UsernameUndefined=You have not supplied a username for this server. Please provide one in the account setup menu and try again.
|
||||
|
||||
# Status - list failure
|
||||
## @name POP3_LIST_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
|
||||
4015=The LIST command did not succeed. Error getting the ID and size of a message.
|
||||
pop3ListFailure=The LIST command did not succeed. Error getting the ID and size of a message.
|
||||
|
||||
# Status - delete error
|
||||
## @name POP3_DELE_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
|
||||
4016=The DELE command did not succeed. Error marking a message as deleted.
|
||||
pop3DeleFailure=The DELE command did not succeed. Error marking a message as deleted.
|
||||
|
||||
# Status - stat failed
|
||||
## @name POP3_STAT
|
||||
## @loc None
|
||||
4024= The STAT command did not succeed. Error getting message number and sizes.
|
||||
pop3StatFail=The STAT command did not succeed. Error getting message number and sizes.
|
||||
|
||||
## @name POP3_SERVER_SAID
|
||||
## @loc None
|
||||
4025= Mail server %S responded:
|
||||
#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
|
||||
pop3ServerSaid= Mail server %S responded:
|
||||
|
||||
## @name COPYING_MSGS_STATUS
|
||||
## @loc None
|
||||
4027=Copying %S of %S messages to %S
|
||||
copyingMessagesStatus=Copying %S of %S messages to %S
|
||||
|
||||
## @name MOVING_MSGS_STATUS
|
||||
## @loc None
|
||||
4028=Moving %S of %S messages to %S
|
||||
movingMessagesStatus=Moving %S of %S messages to %S
|
||||
|
||||
# Status - write error occurred
|
||||
## @name POP3_MESSAGE_FOLDER_BUSY
|
||||
## @loc None
|
||||
4029=This folder is being processed. Please wait until processing is complete to get messages.
|
||||
pop3MessageFolderBusy=This folder is being processed. Please wait until processing is complete to get messages.
|
||||
|
||||
## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
|
||||
## @loc None
|
||||
4033=Unable to open mail spool file %S.
|
||||
movemailCantOpenSpoolFile=Unable to open mail spool file %S.
|
||||
|
||||
## @name MOVEMAIL_CANT_CREATE_LOCK
|
||||
## @loc None
|
||||
4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
|
||||
movemailCantCreateLock=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
|
||||
|
||||
## @name MOVEMAIL_CANT_DELETE_LOCK
|
||||
## @loc None
|
||||
4035=Unable to delete lock file %S.
|
||||
movemailCantDeleteLock=Unable to delete lock file %S.
|
||||
|
||||
## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
|
||||
## @loc None
|
||||
4036=Unable to truncate spool file %S.
|
||||
movemailCantTruncateSpoolFile=Unable to truncate spool file %S.
|
||||
|
||||
## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
|
||||
## @loc None
|
||||
4037=Unable to locate mail spool file.
|
||||
movemailSpoolFileNotFound=Unable to locate mail spool file.
|
||||
|
||||
## @name POP3_TMP_DOWNLOAD_FAILED
|
||||
## @loc None
|
||||
4038=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
|
||||
pop3TmpDownloadError=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
|
||||
|
||||
# Status - the server doesn't support UIDL…
|
||||
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
|
||||
# LOCALIZATION NOTE(pop3ServerDoesNotSupportUidlEtc): The following sentence should be translated in this way:
|
||||
# Do not translate "POP3"
|
||||
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
|
||||
# Do not translate "UIDL"
|
||||
4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
|
||||
pop3ServerDoesNotSupportUidlEtc=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
|
||||
|
||||
# Status - the server doesn't support the top command
|
||||
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
|
||||
# LOCALIZATION NOTE(pop3ServerDoesNotSupportTopCommand): The following sentence should be translated in this way:
|
||||
# Do not translate "POP3"
|
||||
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
|
||||
# Do not translate "TOP"
|
||||
4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
|
||||
pop3ServerDoesNotSupportTopCommand=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
|
||||
## @loc None
|
||||
4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
|
||||
nsErrorCouldNotConnectViaTls=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
|
||||
|
||||
## @name POP3_MOVE_FOLDER_TO_TRASH
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE (4044): Do not translate the word %S below.
|
||||
# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
|
||||
# "%S" is the the name of the folder.
|
||||
4044=Are you sure you want to delete the folder '%S'?
|
||||
pop3MoveFolderToTrash=Are you sure you want to delete the folder '%S'?
|
||||
|
||||
## @name POP3_DELETE_FOLDER_DIALOG_TITLE
|
||||
## @loc None
|
||||
4045=Delete Folder
|
||||
pop3DeleteFolderDialogTitle=Delete Folder
|
||||
|
||||
## @name POP3_DELETE_FOLDER_BUTTON_LABEL
|
||||
## @loc None
|
||||
4046=&Delete Folder
|
||||
pop3DeleteFolderButtonLabel=&Delete Folder
|
||||
|
||||
## @name POP3_AUTH_INTERNAL_ERROR
|
||||
## @loc None
|
||||
4047=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
|
||||
pop3AuthInternalError=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
|
||||
## @loc None
|
||||
4048=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
|
||||
pop3AuthChangeEncryptToPlainNoSSL=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
|
||||
## @loc None
|
||||
4049=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
|
||||
pop3AuthChangeEncryptToPlainSSL=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
|
||||
## @loc None
|
||||
4050=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
pop3AuthChangePlainToEncrypt=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
|
||||
# Authentication server caps and pref don't match
|
||||
## @name POP3_AUTH_MECH_NOT_SUPPORTED
|
||||
## @loc None
|
||||
4051=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
pop3AuthMechNotSupported=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
|
||||
# Status - Could not log in to GSSAPI, and it was the only method
|
||||
## @name POP3_GSSAPI_FAILURE
|
||||
## @loc None
|
||||
4052=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
|
||||
pop3GssapiFailure=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@
|
|||
#include "nsNetUtil.h"
|
||||
#include "nsIMsgFolderNotificationService.h"
|
||||
#include "nsReadLine.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsArrayUtils.h"
|
||||
#include "nsIMsgTraitService.h"
|
||||
#include "nsIStringEnumerator.h"
|
||||
|
|
@ -841,18 +840,21 @@ nsresult nsMsgLocalMailFolder::ConfirmFolderDeletion(nsIMsgWindow *aMsgWindow,
|
|||
const PRUnichar *formatStrings[1] = { folderName.get() };
|
||||
|
||||
nsAutoString deleteFolderDialogTitle;
|
||||
rv = bundle->GetStringFromID(POP3_DELETE_FOLDER_DIALOG_TITLE,
|
||||
getter_Copies(deleteFolderDialogTitle));
|
||||
rv = bundle->GetStringFromName(
|
||||
NS_LITERAL_STRING("pop3DeleteFolderDialogTitle").get(),
|
||||
getter_Copies(deleteFolderDialogTitle));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsAutoString deleteFolderButtonLabel;
|
||||
rv = bundle->GetStringFromID(POP3_DELETE_FOLDER_BUTTON_LABEL,
|
||||
getter_Copies(deleteFolderButtonLabel));
|
||||
rv = bundle->GetStringFromName(
|
||||
NS_LITERAL_STRING("pop3DeleteFolderButtonLabel").get(),
|
||||
getter_Copies(deleteFolderButtonLabel));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsAutoString confirmationStr;
|
||||
rv = bundle->FormatStringFromID(POP3_MOVE_FOLDER_TO_TRASH, formatStrings, 1,
|
||||
getter_Copies(confirmationStr));
|
||||
rv = bundle->FormatStringFromName(
|
||||
NS_LITERAL_STRING("pop3MoveFolderToTrash").get(), formatStrings, 1,
|
||||
getter_Copies(confirmationStr));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsCOMPtr<nsIPrompt> dialog(do_GetInterface(docShell));
|
||||
|
|
@ -3152,7 +3154,6 @@ nsresult nsMsgLocalMailFolder::DisplayMoveCopyStatusMsg()
|
|||
{
|
||||
nsString folderName;
|
||||
GetName(folderName);
|
||||
int32_t statusMsgId = (mCopyState->m_isMove) ? MOVING_MSGS_STATUS : COPYING_MSGS_STATUS;
|
||||
nsAutoString numMsgSoFarString;
|
||||
numMsgSoFarString.AppendInt((mCopyState->m_copyingMultipleMessages) ? mCopyState->m_curCopyIndex : 1);
|
||||
|
||||
|
|
@ -3160,8 +3161,11 @@ nsresult nsMsgLocalMailFolder::DisplayMoveCopyStatusMsg()
|
|||
totalMessagesString.AppendInt(mCopyState->m_totalMsgCount);
|
||||
nsString finalString;
|
||||
const PRUnichar * stringArray[] = { numMsgSoFarString.get(), totalMessagesString.get(), folderName.get() };
|
||||
rv = mCopyState->m_stringBundle->FormatStringFromID(statusMsgId, stringArray, 3,
|
||||
getter_Copies(finalString));
|
||||
rv = mCopyState->m_stringBundle->FormatStringFromName(
|
||||
(mCopyState->m_isMove) ?
|
||||
NS_LITERAL_STRING("movingMessagesStatus").get() :
|
||||
NS_LITERAL_STRING("copyingMessagesStatus").get(),
|
||||
stringArray, 3, getter_Copies(finalString));
|
||||
int64_t nowMS = PR_IntervalToMilliseconds(PR_IntervalNow());
|
||||
|
||||
// only update status/progress every half second
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/**
|
||||
String Ids used by mailnews\local.
|
||||
To Do: Conver the callers to use names instead of ids and then make this file obsolete.
|
||||
*/
|
||||
|
||||
#ifndef _nsLocalStrings_H__
|
||||
#define _nsLocalStrings_H__
|
||||
|
||||
#define LOCAL_STATUS_SELECTING_MAILBOX 4000
|
||||
#define LOCAL_STATUS_DOCUMENT_DONE 4001
|
||||
#define POP3_SERVER_ERROR 4003
|
||||
#define POP3_USERNAME_FAILURE 4004
|
||||
#define POP3_PASSWORD_FAILURE 4005
|
||||
#define POP3_MESSAGE_WRITE_ERROR 4006
|
||||
#define POP3_RETR_FAILURE 4012
|
||||
#define POP3_PASSWORD_UNDEFINED 4013
|
||||
#define POP3_USERNAME_UNDEFINED 4014
|
||||
#define POP3_LIST_FAILURE 4015
|
||||
#define POP3_DELE_FAILURE 4016
|
||||
#define POP3_STAT_FAILURE 4024
|
||||
#define POP3_SERVER_SAID 4025
|
||||
#define COPYING_MSGS_STATUS 4027
|
||||
#define MOVING_MSGS_STATUS 4028
|
||||
#define POP3_MESSAGE_FOLDER_BUSY 4029
|
||||
#define MOVEMAIL_CANT_OPEN_SPOOL_FILE 4033
|
||||
#define MOVEMAIL_CANT_CREATE_LOCK 4034
|
||||
#define MOVEMAIL_CANT_DELETE_LOCK 4035
|
||||
#define MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE 4036
|
||||
#define MOVEMAIL_SPOOL_FILE_NOT_FOUND 4037
|
||||
#define POP3_TMP_DOWNLOAD_FAILED 4038
|
||||
#define POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC 4040
|
||||
#define POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND 4041
|
||||
#define NS_ERROR_COULD_NOT_CONNECT_VIA_TLS 4043
|
||||
#define POP3_MOVE_FOLDER_TO_TRASH 4044
|
||||
#define POP3_DELETE_FOLDER_DIALOG_TITLE 4045
|
||||
#define POP3_DELETE_FOLDER_BUTTON_LABEL 4046
|
||||
#define POP3_AUTH_INTERNAL_ERROR 4047
|
||||
#define POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL 4048
|
||||
#define POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL 4049
|
||||
#define POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT 4050
|
||||
#define POP3_AUTH_MECH_NOT_SUPPORTED 4051
|
||||
#define POP3_GSSAPI_FAILURE 4052
|
||||
|
||||
#endif /* _nsLocalStrings_H__ */
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
#include "nsNetUtil.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsIMsgPluggableStore.h"
|
||||
#include "mozilla/Services.h"
|
||||
|
||||
|
|
@ -94,7 +93,7 @@ nsMovemailService::CheckForNewMail(nsIUrlListener * aUrlListener,
|
|||
}
|
||||
|
||||
void
|
||||
nsMovemailService::Error(int32_t errorCode,
|
||||
nsMovemailService::Error(const char* errorCode,
|
||||
const PRUnichar **params,
|
||||
uint32_t length)
|
||||
{
|
||||
|
|
@ -117,9 +116,11 @@ nsMovemailService::Error(int32_t errorCode,
|
|||
nsString errStr;
|
||||
// Format the error string if necessary
|
||||
if (params)
|
||||
bundle->FormatStringFromID(errorCode, params, length, getter_Copies(errStr));
|
||||
bundle->FormatStringFromName(NS_ConvertASCIItoUTF16(errorCode).get(),
|
||||
params, length, getter_Copies(errStr));
|
||||
else
|
||||
bundle->GetStringFromID(errorCode, getter_Copies(errStr));
|
||||
bundle->GetStringFromName(NS_ConvertASCIItoUTF16(errorCode).get(),
|
||||
getter_Copies(errStr));
|
||||
|
||||
if (!errStr.IsEmpty()) {
|
||||
dialog->Alert(nullptr, errStr.get());
|
||||
|
|
@ -365,7 +366,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow,
|
|||
if (spoolPath.IsEmpty())
|
||||
rv = LocateSpoolFile(spoolPath);
|
||||
if (NS_FAILED(rv) || spoolPath.IsEmpty()) {
|
||||
Error(MOVEMAIL_SPOOL_FILE_NOT_FOUND, nullptr, 0);
|
||||
Error("movemailSpoolFileNotFound", nullptr, 0);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
|
@ -379,7 +380,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow,
|
|||
const PRUnichar *params[] = {
|
||||
NS_ConvertUTF8toUTF16(spoolPath).get()
|
||||
};
|
||||
Error(MOVEMAIL_CANT_OPEN_SPOOL_FILE, params, 1);
|
||||
Error("movemailCantOpenSpoolFile", params, 1);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -423,7 +424,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow,
|
|||
const PRUnichar *params[] = {
|
||||
lockFile.get()
|
||||
};
|
||||
Error(MOVEMAIL_CANT_CREATE_LOCK, params, 1);
|
||||
Error("movemailCantCreateLock", params, 1);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
|
@ -488,7 +489,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow,
|
|||
const PRUnichar *params[] = {
|
||||
NS_ConvertUTF8toUTF16(spoolPath).get()
|
||||
};
|
||||
Error(MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE, params, 1);
|
||||
Error("movemailCantTruncateSpoolFile", params, 1);
|
||||
}
|
||||
|
||||
if (!YieldSpoolLock(spoolPath.get(), usingLockFile)) {
|
||||
|
|
@ -497,7 +498,7 @@ nsMovemailService::GetNewMail(nsIMsgWindow *aMsgWindow,
|
|||
const PRUnichar *params[] = {
|
||||
spoolLock.get()
|
||||
};
|
||||
Error(MOVEMAIL_CANT_DELETE_LOCK, params, 1);
|
||||
Error("movemailCantDeleteLock", params, 1);
|
||||
}
|
||||
|
||||
in_server->SetServerBusy(false);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public:
|
|||
NS_DECL_NSIMSGPROTOCOLINFO
|
||||
|
||||
private:
|
||||
void Error(int32_t errorCode, const PRUnichar **params, uint32_t length);
|
||||
void Error(const char* errorCode, const PRUnichar **params, uint32_t length);
|
||||
nsCOMPtr<nsIMsgWindow> mMsgWindow;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
#include "nsIMsgCopyService.h"
|
||||
#include "nsICryptoHash.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsIMsgFilterPlugin.h"
|
||||
#include "nsIMutableArray.h"
|
||||
#include "nsArrayUtils.h"
|
||||
|
|
@ -118,8 +117,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStartRequest(nsIRequest *request, nsISupport
|
|||
path->GetFileSize(&fileSize);
|
||||
// the size of the mailbox file is our total base line for measuring progress
|
||||
m_graph_progress_total = (uint32_t) fileSize;
|
||||
UpdateStatusText(LOCAL_STATUS_SELECTING_MAILBOX);
|
||||
|
||||
UpdateStatusText("buildingSummary");
|
||||
nsCOMPtr<nsIMsgDBService> msgDBService = do_GetService(NS_MSGDB_SERVICE_CONTRACTID, &rv);
|
||||
if (msgDBService)
|
||||
{
|
||||
|
|
@ -176,7 +174,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIRequest *request, nsISupports
|
|||
// be sure to clear any status text and progress info..
|
||||
m_graph_progress_received = 0;
|
||||
UpdateProgressPercent();
|
||||
UpdateStatusText(LOCAL_STATUS_DOCUMENT_DONE);
|
||||
UpdateStatusText("localStatusDocumentDone");
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -279,7 +277,7 @@ nsresult nsMsgMailboxParser::Init()
|
|||
return AcquireFolderLock();
|
||||
}
|
||||
|
||||
void nsMsgMailboxParser::UpdateStatusText (uint32_t stringID)
|
||||
void nsMsgMailboxParser::UpdateStatusText (const char* stringName)
|
||||
{
|
||||
if (m_statusFeedback)
|
||||
{
|
||||
|
|
@ -293,14 +291,9 @@ void nsMsgMailboxParser::UpdateStatusText (uint32_t stringID)
|
|||
if (NS_FAILED(rv))
|
||||
return;
|
||||
nsString finalString;
|
||||
if (stringID == LOCAL_STATUS_SELECTING_MAILBOX)
|
||||
{
|
||||
const PRUnichar * stringArray[] = { m_folderName.get() };
|
||||
rv = bundle->FormatStringFromID(stringID, stringArray, 1,
|
||||
getter_Copies(finalString));
|
||||
}
|
||||
else
|
||||
bundle->GetStringFromID(stringID, getter_Copies(finalString));
|
||||
const PRUnichar * stringArray[] = { m_folderName.get() };
|
||||
rv = bundle->FormatStringFromName(NS_ConvertASCIItoUTF16(stringName).get(),
|
||||
stringArray, 1, getter_Copies(finalString));
|
||||
m_statusFeedback->ShowStatusString(finalString);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ public:
|
|||
|
||||
void UpdateDBFolderInfo();
|
||||
void UpdateDBFolderInfo(nsIMsgDatabase *mailDB);
|
||||
void UpdateStatusText (uint32_t stringID);
|
||||
void UpdateStatusText(const char* stringName);
|
||||
|
||||
// Update the progress bar based on what we know.
|
||||
virtual void UpdateProgressPercent ();
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include "nsISocketTransport.h"
|
||||
#include "nsISSLSocketControl.h"
|
||||
#include "nsILineInputStream.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsIInterfaceRequestor.h"
|
||||
#include "nsMsgMessageFlags.h"
|
||||
#include "nsMsgBaseCID.h"
|
||||
|
|
@ -1247,16 +1246,17 @@ nsPop3Protocol::WaitForResponse(nsIInputStream* inputStream, uint32_t length)
|
|||
}
|
||||
|
||||
int32_t
|
||||
nsPop3Protocol::Error(int32_t err_code)
|
||||
nsPop3Protocol::Error(const char* err_code)
|
||||
{
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_ALWAYS, ("ERROR: %d", err_code));
|
||||
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_ALWAYS, ("ERROR: %s", err_code));
|
||||
|
||||
// the error code is just the resource id for the error string...
|
||||
// the error code is just the resource name for the error string...
|
||||
// so print out that error message!
|
||||
nsresult rv = NS_OK;
|
||||
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(m_url, &rv);
|
||||
// we handle POP3_TMP_DOWNLOAD_FAILED earlier...
|
||||
if (err_code != POP3_TMP_DOWNLOAD_FAILED && NS_SUCCEEDED(rv))
|
||||
// we handle "pop3TmpDownloadError" earlier...
|
||||
if (strcmp(err_code, "pop3TmpDownloadError") && NS_SUCCEEDED(rv))
|
||||
{
|
||||
nsCOMPtr<nsIMsgWindow> msgWindow;
|
||||
nsCOMPtr<nsIPrompt> dialog;
|
||||
|
|
@ -1267,7 +1267,8 @@ nsPop3Protocol::Error(int32_t err_code)
|
|||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
nsString alertString;
|
||||
mLocalBundle->GetStringFromID(err_code, getter_Copies(alertString));
|
||||
mLocalBundle->GetStringFromName(NS_ConvertASCIItoUTF16(err_code).get(),
|
||||
getter_Copies(alertString));
|
||||
if (m_pop3ConData->command_succeeded) //not a server error message
|
||||
dialog->Alert(nullptr, alertString.get());
|
||||
else
|
||||
|
|
@ -1283,7 +1284,9 @@ nsPop3Protocol::Error(int32_t err_code)
|
|||
nsAutoString hostStr;
|
||||
CopyASCIItoUTF16(hostName, hostStr);
|
||||
const PRUnichar *params[] = { hostStr.get() };
|
||||
mLocalBundle->FormatStringFromID(POP3_SERVER_SAID, params, 1, getter_Copies(serverSaidPrefix));
|
||||
mLocalBundle->FormatStringFromName(
|
||||
NS_LITERAL_STRING("pop3ServerSaid").get(),
|
||||
params, 1, getter_Copies(serverSaidPrefix));
|
||||
}
|
||||
|
||||
nsAutoString message(alertString);
|
||||
|
|
@ -1334,7 +1337,7 @@ int32_t nsPop3Protocol::Pop3SendData(const char * dataBuffer, bool aSuppressLogg
|
|||
int32_t nsPop3Protocol::SendAuth()
|
||||
{
|
||||
if(!m_pop3ConData->command_succeeded)
|
||||
return(Error(POP3_SERVER_ERROR));
|
||||
return Error("pop3ServerError");
|
||||
|
||||
nsAutoCString command("AUTH" CRLF);
|
||||
|
||||
|
|
@ -1413,7 +1416,7 @@ int32_t nsPop3Protocol::SendCapa()
|
|||
{
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_MAX, ("SendCapa()"));
|
||||
if(!m_pop3ConData->command_succeeded)
|
||||
return(Error(POP3_SERVER_ERROR));
|
||||
return Error("pop3ServerError");
|
||||
|
||||
nsAutoCString command("CAPA" CRLF);
|
||||
|
||||
|
|
@ -1705,7 +1708,7 @@ int32_t nsPop3Protocol::ProcessAuth()
|
|||
else if (m_socketType == nsMsgSocketType::alwaysSTARTTLS)
|
||||
{
|
||||
m_pop3ConData->next_state = POP3_ERROR_DONE;
|
||||
return(Error(NS_ERROR_COULD_NOT_CONNECT_VIA_TLS));
|
||||
return Error("nsErrorCouldNotConnectViaTls");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1723,14 +1726,14 @@ int32_t nsPop3Protocol::ProcessAuth()
|
|||
// the user is just not logged in yet, and show an appropriate error.
|
||||
if (m_prefAuthMethods == POP3_HAS_AUTH_GSSAPI &&
|
||||
m_failedAuthMethods == POP3_HAS_AUTH_GSSAPI)
|
||||
return Error(POP3_GSSAPI_FAILURE);
|
||||
return Error("pop3GssapiFailure");
|
||||
|
||||
// pref has plaintext pw & server claims to support encrypted pw
|
||||
if (m_prefAuthMethods == (POP3_HAS_AUTH_USER | POP3_HAS_AUTH_LOGIN |
|
||||
POP3_HAS_AUTH_PLAIN) &&
|
||||
GetCapFlags() & (POP3_HAS_AUTH_CRAM_MD5 | POP3_HAS_AUTH_APOP))
|
||||
// tell user to change to encrypted pw
|
||||
return Error(POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT);
|
||||
return Error("pop3AuthChangePlainToEncrypt");
|
||||
// pref has encrypted pw & server claims to support plaintext pw
|
||||
else if (m_prefAuthMethods == (POP3_HAS_AUTH_CRAM_MD5 |
|
||||
POP3_HAS_AUTH_APOP) &&
|
||||
|
|
@ -1741,14 +1744,14 @@ int32_t nsPop3Protocol::ProcessAuth()
|
|||
if (m_socketType == nsMsgSocketType::SSL ||
|
||||
m_socketType == nsMsgSocketType::alwaysSTARTTLS)
|
||||
// tell user to change to plaintext pw
|
||||
return Error(POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL);
|
||||
return Error("pop3AuthChangeEncryptToPlainSSL");
|
||||
else
|
||||
// tell user to change to plaintext pw, with big warning
|
||||
return Error(POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL);
|
||||
return Error("pop3AuthChangeEncryptToPlainNoSSL");
|
||||
}
|
||||
else
|
||||
// just "change auth method"
|
||||
return Error(POP3_AUTH_MECH_NOT_SUPPORTED);
|
||||
return Error("pop3AuthMechNotSupported");
|
||||
}
|
||||
|
||||
switch (m_currentAuthMethod)
|
||||
|
|
@ -1784,7 +1787,7 @@ int32_t nsPop3Protocol::ProcessAuth()
|
|||
default:
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_ERROR,
|
||||
("POP: m_currentAuthMethod has unknown value"));
|
||||
return Error(POP3_AUTH_MECH_NOT_SUPPORTED);
|
||||
return Error("pop3AuthMechNotSupported");
|
||||
}
|
||||
|
||||
m_pop3ConData->pause_for_read = false;
|
||||
|
|
@ -1824,8 +1827,8 @@ int32_t nsPop3Protocol::NextAuthStep()
|
|||
// response code received shows that login failed not because of
|
||||
// wrong credential -> stop login without retry or pw dialog, only alert
|
||||
if (TestFlag(POP3_STOPLOGIN))
|
||||
return(Error((m_password_already_sent)
|
||||
? POP3_PASSWORD_FAILURE : POP3_USERNAME_FAILURE));
|
||||
return Error((m_password_already_sent) ? "pop3PasswordFailure" :
|
||||
"pop3UsernameFailure");
|
||||
|
||||
// response code received shows that server is certain about the
|
||||
// credential was wrong -> no fallback, show alert and pw dialog
|
||||
|
|
@ -1833,8 +1836,8 @@ int32_t nsPop3Protocol::NextAuthStep()
|
|||
{
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_DEBUG,
|
||||
("auth failure, setting password failed"));
|
||||
Error((m_password_already_sent)
|
||||
? POP3_PASSWORD_FAILURE : POP3_USERNAME_FAILURE);
|
||||
Error((m_password_already_sent) ? "pop3PasswordFailure" :
|
||||
"pop3UsernameFailure");
|
||||
SetFlag(POP3_PASSWORD_FAILED);
|
||||
ClearFlag(POP3_AUTH_FAILURE);
|
||||
return 0;
|
||||
|
|
@ -1851,7 +1854,7 @@ int32_t nsPop3Protocol::NextAuthStep()
|
|||
// if USER auth method failed before sending the password,
|
||||
// the username was wrong.
|
||||
// no fallback but return error
|
||||
return Error(POP3_USERNAME_FAILURE);
|
||||
return Error("pop3UsernameFailure");
|
||||
}
|
||||
|
||||
// If we have no auth method left, ask user to try with new password
|
||||
|
|
@ -1869,7 +1872,7 @@ int32_t nsPop3Protocol::NextAuthStep()
|
|||
prompting the user for a password: just fail silently.
|
||||
*/
|
||||
SetFlag(POP3_PASSWORD_FAILED);
|
||||
Error(POP3_PASSWORD_FAILURE);
|
||||
Error("pop3PasswordFailure");
|
||||
|
||||
if (m_nsIPop3Sink)
|
||||
m_nsIPop3Sink->SetMailAccountURL(NULL);
|
||||
|
|
@ -2030,7 +2033,7 @@ int32_t nsPop3Protocol::SendUsername()
|
|||
{
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_MAX, ("SendUsername()"));
|
||||
if(m_username.IsEmpty())
|
||||
return(Error(POP3_USERNAME_UNDEFINED));
|
||||
return Error("pop3UsernameUndefined");
|
||||
|
||||
// <copied from="SendPassword()">
|
||||
// Needed for NTLM
|
||||
|
|
@ -2041,7 +2044,7 @@ int32_t nsPop3Protocol::SendUsername()
|
|||
if (m_passwordResult.IsEmpty())
|
||||
{
|
||||
m_pop3ConData->next_state = POP3_ERROR_DONE;
|
||||
return Error(POP3_PASSWORD_UNDEFINED);
|
||||
return Error("pop3PasswordUndefined");
|
||||
}
|
||||
// </copied>
|
||||
|
||||
|
|
@ -2070,7 +2073,7 @@ int32_t nsPop3Protocol::SendUsername()
|
|||
PR_LOG(POP3LOGMODULE, PR_LOG_ERROR,
|
||||
("In nsPop3Protocol::SendUsername(), m_currentAuthMethod is 0x%X, "
|
||||
"but that is unexpected", m_currentAuthMethod));
|
||||
return Error(POP3_AUTH_INTERNAL_ERROR);
|
||||
return Error("pop3AuthInternalError");
|
||||
}
|
||||
|
||||
cmd += CRLF;
|
||||
|
|
@ -2086,7 +2089,7 @@ int32_t nsPop3Protocol::SendPassword()
|
|||
{
|
||||
PR_LOG(POP3LOGMODULE, PR_LOG_MAX, ("SendPassword()"));
|
||||
if (m_username.IsEmpty())
|
||||
return(Error(POP3_USERNAME_UNDEFINED));
|
||||
return Error("pop3UsernameUndefined");
|
||||
|
||||
// <copied to="SendUsername()">
|
||||
// Needed here, too, because APOP skips SendUsername()
|
||||
|
|
@ -2096,7 +2099,7 @@ int32_t nsPop3Protocol::SendPassword()
|
|||
if (m_passwordResult.IsEmpty())
|
||||
{
|
||||
m_pop3ConData->next_state = POP3_ERROR_DONE;
|
||||
return Error(POP3_PASSWORD_UNDEFINED);
|
||||
return Error("pop3PasswordUndefined");
|
||||
}
|
||||
// </copied>
|
||||
|
||||
|
|
@ -2221,7 +2224,7 @@ int32_t nsPop3Protocol::SendPassword()
|
|||
PR_LOG(POP3LOGMODULE, PR_LOG_ERROR,
|
||||
("In nsPop3Protocol::SendPassword(), m_currentAuthMethod is %X, "
|
||||
"but that is unexpected", m_currentAuthMethod));
|
||||
return Error(POP3_AUTH_INTERNAL_ERROR);
|
||||
return Error("pop3AuthInternalError");
|
||||
}
|
||||
|
||||
cmd += CRLF;
|
||||
|
|
@ -2267,7 +2270,7 @@ nsPop3Protocol::GetStat()
|
|||
{
|
||||
// check stat response
|
||||
if (!m_pop3ConData->command_succeeded)
|
||||
return(Error(POP3_STAT_FAILURE));
|
||||
return Error("pop3StatFail");
|
||||
|
||||
/* stat response looks like: %d %d
|
||||
* The first number is the number of articles
|
||||
|
|
@ -2339,14 +2342,12 @@ nsPop3Protocol::GetStat()
|
|||
if (NS_FAILED(rv))
|
||||
{
|
||||
m_nsIPop3Sink->AbortMailDelivery(this);
|
||||
if (rv == NS_MSG_FOLDER_BUSY)
|
||||
return(Error(POP3_MESSAGE_FOLDER_BUSY));
|
||||
else
|
||||
return(Error(POP3_MESSAGE_WRITE_ERROR));
|
||||
return Error(rv == NS_MSG_FOLDER_BUSY ? "pop3MessageFolderBusy" :
|
||||
"pop3MessageWriteError");
|
||||
}
|
||||
|
||||
if(!m_pop3ConData->msg_del_started)
|
||||
return(Error(POP3_MESSAGE_WRITE_ERROR));
|
||||
return Error("pop3MessageWriteError");
|
||||
}
|
||||
|
||||
m_pop3ConData->next_state = POP3_SEND_LIST;
|
||||
|
|
@ -2421,7 +2422,7 @@ nsPop3Protocol::GetList(nsIInputStream* inputStream,
|
|||
* will remain constant
|
||||
*/
|
||||
if(!m_pop3ConData->command_succeeded)
|
||||
return(Error(POP3_LIST_FAILURE));
|
||||
return Error("pop3ListFailure");
|
||||
|
||||
uint32_t ln = 0;
|
||||
bool pauseForMoreData = false;
|
||||
|
|
@ -2536,7 +2537,8 @@ int32_t nsPop3Protocol::HandleNoUidListAvailable()
|
|||
CopyASCIItoUTF16(hostName, hostNameUnicode);
|
||||
const PRUnichar *formatStrings[] = { hostNameUnicode.get() };
|
||||
nsString alertString;
|
||||
rv = mLocalBundle->FormatStringFromID(POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC,
|
||||
rv = mLocalBundle->FormatStringFromName(
|
||||
NS_LITERAL_STRING("pop3ServerDoesNotSupportUidlEtc").get(),
|
||||
formatStrings, 1, getter_Copies(alertString));
|
||||
NS_ENSURE_SUCCESS(rv, -1);
|
||||
|
||||
|
|
@ -2949,7 +2951,7 @@ int32_t nsPop3Protocol::GetMsg()
|
|||
#ifdef DEBUG
|
||||
printf("Not enough disk space! Raising error!\n");
|
||||
#endif
|
||||
return (Error(MK_POP3_OUT_OF_DISK_SPACE));
|
||||
return Error("pop3OutOfDiskSpace");
|
||||
}
|
||||
|
||||
// Here we know how many messages we're going to download, so let
|
||||
|
|
@ -3195,7 +3197,7 @@ nsPop3Protocol::RetrResponse(nsIInputStream* inputStream,
|
|||
* get the response code and byte size
|
||||
*/
|
||||
if(!m_pop3ConData->command_succeeded)
|
||||
return Error(POP3_RETR_FAILURE);
|
||||
return Error("pop3RetrFailure");
|
||||
|
||||
/* a successful RETR response looks like: #num_bytes Junk
|
||||
from TOP we only get the +OK and data
|
||||
|
|
@ -3250,7 +3252,7 @@ nsPop3Protocol::RetrResponse(nsIInputStream* inputStream,
|
|||
PR_LOG(POP3LOGMODULE, PR_LOG_ALWAYS, ("Done opening message stream!"));
|
||||
|
||||
if(!m_pop3ConData->msg_closure || NS_FAILED(rv))
|
||||
return(Error(POP3_MESSAGE_WRITE_ERROR));
|
||||
return Error("pop3MessageWriteError");
|
||||
}
|
||||
|
||||
m_pop3ConData->pause_for_read = true;
|
||||
|
|
@ -3276,7 +3278,7 @@ nsPop3Protocol::RetrResponse(nsIInputStream* inputStream,
|
|||
{
|
||||
rv = HandleLine(line, buffer_size);
|
||||
if (NS_FAILED(rv))
|
||||
return (Error(POP3_MESSAGE_WRITE_ERROR));
|
||||
return Error("pop3MessageWriteError");
|
||||
|
||||
// buffer_size already includes MSG_LINEBREAK_LEN so
|
||||
// subtract and add CRLF
|
||||
|
|
@ -3329,9 +3331,9 @@ nsPop3Protocol::RetrResponse(nsIInputStream* inputStream,
|
|||
// fixed to return errors)
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return (Error((rv == NS_MSG_ERROR_COPYING_FROM_TMP_DOWNLOAD)
|
||||
? POP3_TMP_DOWNLOAD_FAILED
|
||||
: POP3_MESSAGE_WRITE_ERROR));
|
||||
return Error((rv == NS_MSG_ERROR_COPYING_FROM_TMP_DOWNLOAD) ?
|
||||
"pop3TmpDownloadError" :
|
||||
"pop3MessageWriteError");
|
||||
|
||||
m_pop3ConData->msg_closure = nullptr;
|
||||
}
|
||||
|
|
@ -3430,7 +3432,9 @@ nsPop3Protocol::TopResponse(nsIInputStream* inputStream, uint32_t length)
|
|||
m_pop3ConData->truncating_cur_msg = false;
|
||||
|
||||
nsString statusTemplate;
|
||||
mLocalBundle->GetStringFromID(POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND, getter_Copies(statusTemplate));
|
||||
mLocalBundle->GetStringFromName(
|
||||
NS_LITERAL_STRING("pop3ServerDoesNotSupportTopCommand").get(),
|
||||
getter_Copies(statusTemplate));
|
||||
if (!statusTemplate.IsEmpty())
|
||||
{
|
||||
nsAutoCString hostName;
|
||||
|
|
@ -3496,12 +3500,12 @@ nsPop3Protocol::HandleLine(char *line, uint32_t line_length)
|
|||
// (Note: This is only a temp hack until the underlying XPCOM is
|
||||
// fixed to return errors)
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
// XXX Error() returns -1, which is not a valid nsresult
|
||||
return static_cast<nsresult>(Error(
|
||||
(rv == NS_MSG_ERROR_COPYING_FROM_TMP_DOWNLOAD)
|
||||
? POP3_TMP_DOWNLOAD_FAILED
|
||||
: POP3_MESSAGE_WRITE_ERROR));
|
||||
if (NS_FAILED(rv)) {
|
||||
Error((rv == NS_MSG_ERROR_COPYING_FROM_TMP_DOWNLOAD) ?
|
||||
"pop3TmpDownloadError" :
|
||||
"pop3MessageWriteError");
|
||||
return rv;
|
||||
}
|
||||
|
||||
m_pop3ConData->msg_closure = nullptr;
|
||||
return rv;
|
||||
|
|
@ -3544,7 +3548,7 @@ int32_t nsPop3Protocol::DeleResponse()
|
|||
/* the return from the delete will come here
|
||||
*/
|
||||
if(!m_pop3ConData->command_succeeded)
|
||||
return(Error(POP3_DELE_FAILURE));
|
||||
return Error("pop3DeleFailure");
|
||||
|
||||
|
||||
/* ###chrisf
|
||||
|
|
@ -3665,8 +3669,8 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn
|
|||
if(m_username.IsEmpty())
|
||||
{
|
||||
// net_pop3_block = false;
|
||||
// XXX Error() returns -1, which is not a valid nsresult
|
||||
return static_cast<nsresult>(Error(POP3_USERNAME_UNDEFINED));
|
||||
Error("pop3UsernameUndefined");
|
||||
return NS_MSG_SERVER_USERNAME_MISSING;
|
||||
}
|
||||
|
||||
while(!m_pop3ConData->pause_for_read)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ and change the POP3_QUIT_RESPONSE state to flush the newly committed deletes. */
|
|||
*/
|
||||
|
||||
#define MK_OUT_OF_MEMORY -207
|
||||
#define MK_POP3_OUT_OF_DISK_SPACE -321
|
||||
#define MK_POP3_PASSWORD_UNDEFINED -313
|
||||
#define XP_NO_ANSWER 14401
|
||||
#define XP_THE_PREVIOUSLY_ENTERED_PASSWORD_IS_INVALID_ETC 14405
|
||||
|
|
@ -355,7 +354,7 @@ private:
|
|||
uint32_t length);
|
||||
int32_t WaitForResponse(nsIInputStream* inputStream,
|
||||
uint32_t length);
|
||||
int32_t Error(int32_t err_code);
|
||||
int32_t Error(const char* err_code);
|
||||
int32_t SendAuth();
|
||||
int32_t AuthResponse(nsIInputStream* inputStream, uint32_t length);
|
||||
int32_t SendCapa();
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include "nsLocalMailFolder.h"
|
||||
#include "nsIMailboxUrl.h"
|
||||
#include "nsIPrompt.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsINetUtil.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
|
|
@ -455,7 +454,9 @@ void nsPop3Service::AlertServerBusy(nsIMsgMailNewsUrl *url)
|
|||
NS_ENSURE_SUCCESS(rv, void(0));
|
||||
|
||||
nsString alertString;
|
||||
bundle->GetStringFromID(POP3_MESSAGE_FOLDER_BUSY, getter_Copies(alertString));
|
||||
bundle->GetStringFromName(
|
||||
NS_LITERAL_STRING("pop3MessageFolderBusy").get(),
|
||||
getter_Copies(alertString));
|
||||
if (!alertString.IsEmpty())
|
||||
dialog->Alert(nullptr, alertString.get());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include "nsEmbedCID.h"
|
||||
#include "nsMsgUtils.h"
|
||||
#include "nsMsgBaseCID.h"
|
||||
#include "nsLocalStrings.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsIPop3Service.h"
|
||||
#include "nsMsgLocalCID.h"
|
||||
|
|
@ -744,7 +743,9 @@ nsresult nsPop3Sink::HandleTempDownloadFailed(nsIMsgWindow *msgWindow)
|
|||
m_newMailParser->m_newMsgHdr->GetMime2DecodedSubject(subjectStr);
|
||||
m_newMailParser->m_newMsgHdr->GetMime2DecodedAuthor(fromStr);
|
||||
const PRUnichar *params[] = { fromStr.get(), subjectStr.get() };
|
||||
bundle->FormatStringFromID(POP3_TMP_DOWNLOAD_FAILED, params, 2, getter_Copies(confirmString));
|
||||
bundle->FormatStringFromName(
|
||||
NS_LITERAL_STRING("pop3TmpDownloadError").get(),
|
||||
params, 2, getter_Copies(confirmString));
|
||||
nsCOMPtr<nsIDOMWindow> parentWindow;
|
||||
nsCOMPtr<nsIPromptService> promptService = do_GetService(NS_PROMPTSERVICE_CONTRACTID);
|
||||
nsCOMPtr<nsIDocShell> docShell;
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ pop3EnterPasswordPrompt=Enter your password for %1$S on %2$S:
|
|||
pop3PreviouslyEnteredPasswordIsInvalidPrompt=Please enter a new password for user %1$S on %2$S:
|
||||
|
||||
# Status - Downloading message n of m to account
|
||||
## @name receivingMsgs
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$S in the following lines.
|
||||
# Place the word %1$S where the number of messages downloaded so far should appear.
|
||||
# Place the word %2$S where the total number of messages to receive should appear;
|
||||
|
|
@ -28,197 +26,119 @@ pop3PreviouslyEnteredPasswordIsInvalidPrompt=Please enter a new password for use
|
|||
receivingMsgs=Downloading message %1$S of %2$S to %3$S
|
||||
|
||||
# Status - connecting to host
|
||||
## @name hostContacted
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S in the following line.
|
||||
# Place %1$S where the account name should appear
|
||||
hostContacted=Connect: Host for %1$S contacted, sending login information…
|
||||
|
||||
# Status - no messages to download
|
||||
## @name noMessages
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S in the following line.
|
||||
# Place %1$S where the account name should appear
|
||||
noMessages=There are no new messages for %1$S.
|
||||
|
||||
# Status - messages received after the download
|
||||
## @name receivedMessages
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
|
||||
# %1$S will receive the number of messages received
|
||||
# %2$S will receive the total number of messages
|
||||
# Place %3$S where the account name should appear
|
||||
receivedMessages=%3$S Received %1$S of %2$S messages
|
||||
|
||||
## @name MK_POP3_OUT_OF_DISK_SPACE
|
||||
## @loc None
|
||||
-321=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
|
||||
pop3OutOfDiskSpace=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
|
||||
|
||||
# Status - parsing folder
|
||||
## @name LOCAL_STATUS_SELECTING_MAILBOX
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (4000): Do not translate %s in the following line.
|
||||
# Place the word %s where the name of the mailbox should appear
|
||||
4000=Building summary file for %S…
|
||||
#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
|
||||
# Place the word %S where the name of the mailbox should appear
|
||||
buildingSummary=Building summary file for %S…
|
||||
|
||||
# Status - parsing folder
|
||||
## @name LOCAL_STATUS_DOCUMENT_DONE
|
||||
## @loc None
|
||||
4001=Done
|
||||
localStatusDocumentDone=Done
|
||||
|
||||
# Status - pop3 server error
|
||||
## @name POP3_SERVER_ERROR
|
||||
## @loc None
|
||||
#LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
|
||||
4003=An error occurred with the POP3 mail server.
|
||||
#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
|
||||
pop3ServerError=An error occurred with the POP3 mail server.
|
||||
|
||||
# Status - pop3 user name failed
|
||||
## @name POP3_USERNAME_FAILURE
|
||||
## @loc None
|
||||
4004=Sending of username did not succeed.
|
||||
pop3UsernameFailure=Sending of username did not succeed.
|
||||
|
||||
# Status - password failed
|
||||
## @name POP3_PASSWORD_FAILURE
|
||||
## @loc None
|
||||
4005=Sending of password did not succeed.
|
||||
pop3PasswordFailure=Sending of password did not succeed.
|
||||
|
||||
# Status - write error occurred
|
||||
## @name POP3_MESSAGE_WRITE_ERROR
|
||||
## @loc None
|
||||
4006=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
|
||||
pop3MessageWriteError=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
|
||||
|
||||
# Status - write error occurred
|
||||
## @name POP3_MESSAGE_FOLDER_BUSY
|
||||
## @loc None
|
||||
4029=This folder is being processed. Please wait until processing is complete to get messages.
|
||||
pop3MessageFolderBusy=This folder is being processed. Please wait until processing is complete to get messages.
|
||||
|
||||
# Status - retr failure from the server
|
||||
## @name POP3_RETR_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
|
||||
4012=The RETR command did not succeed. Error retrieving a message.
|
||||
pop3RetrFailure=The RETR command did not succeed. Error retrieving a message.
|
||||
|
||||
# Status - password undefined
|
||||
## @name POP3_PASSWORD_UNDEFINED
|
||||
## @loc None
|
||||
4013=Error getting mail password.
|
||||
pop3PasswordUndefined=Error getting mail password.
|
||||
|
||||
# Status - username undefined
|
||||
## @name POP3_USERNAME_UNDEFINED
|
||||
## @loc None
|
||||
4014=You have not supplied a username for this server. Please provide one in the account setup menu and try again.
|
||||
pop3UsernameUndefined=You have not supplied a username for this server. Please provide one in the account setup menu and try again.
|
||||
|
||||
# Status - list failure
|
||||
## @name POP3_LIST_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
|
||||
4015=The LIST command did not succeed. Error getting the ID and size of a message.
|
||||
pop3ListFailure=The LIST command did not succeed. Error getting the ID and size of a message.
|
||||
|
||||
# Status - delete error
|
||||
## @name POP3_DELE_FAILURE
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
|
||||
4016=The DELE command did not succeed. Error marking a message as deleted.
|
||||
pop3DeleFailure=The DELE command did not succeed. Error marking a message as deleted.
|
||||
|
||||
# Status - stat failed
|
||||
## @name POP3_STAT
|
||||
## @loc None
|
||||
4024= The STAT command did not succeed. Error getting message number and sizes.
|
||||
pop3StatFail=The STAT command did not succeed. Error getting message number and sizes.
|
||||
|
||||
## @name POP3_SERVER_SAID
|
||||
## @loc None
|
||||
4025= Mail server %S responded:
|
||||
#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
|
||||
pop3ServerSaid= Mail server %S responded:
|
||||
|
||||
## @name COPYING_MSGS_STATUS
|
||||
## @loc None
|
||||
4027=Copying %S of %S messages to %S
|
||||
copyingMessagesStatus=Copying %S of %S messages to %S
|
||||
|
||||
## @name MOVING_MSGS_STATUS
|
||||
## @loc None
|
||||
4028=Moving %S of %S messages to %S
|
||||
movingMessagesStatus=Moving %S of %S messages to %S
|
||||
|
||||
## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
|
||||
## @loc None
|
||||
4033=Unable to open mail spool file %S.
|
||||
movemailCantOpenSpoolFile=Unable to open mail spool file %S.
|
||||
|
||||
## @name MOVEMAIL_CANT_CREATE_LOCK
|
||||
## @loc None
|
||||
4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
|
||||
movemailCantCreateLock=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
|
||||
|
||||
## @name MOVEMAIL_CANT_DELETE_LOCK
|
||||
## @loc None
|
||||
4035=Unable to delete lock file %S.
|
||||
movemailCantDeleteLock=Unable to delete lock file %S.
|
||||
|
||||
## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
|
||||
## @loc None
|
||||
4036=Unable to truncate spool file %S.
|
||||
movemailCantTruncateSpoolFile=Unable to truncate spool file %S.
|
||||
|
||||
## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
|
||||
## @loc None
|
||||
4037=Unable to locate mail spool file.
|
||||
movemailSpoolFileNotFound=Unable to locate mail spool file.
|
||||
|
||||
## @name POP3_TMP_DOWNLOAD_FAILED
|
||||
## @loc None
|
||||
4038=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
|
||||
pop3TmpDownloadError=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
|
||||
|
||||
# Status - the server doesn't support UIDL…
|
||||
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
|
||||
# LOCALIZATION NOTE(pop3ServerDoesNotSupportUidlEtc): The following sentence should be translated in this way:
|
||||
# Do not translate "POP3"
|
||||
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
|
||||
# Do not translate "UIDL"
|
||||
4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
|
||||
pop3ServerDoesNotSupportUidlEtc=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
|
||||
|
||||
# Status - the server doesn't support the top command
|
||||
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
|
||||
# LOCALIZATION NOTE(pop3ServerDoesNotSupportTopCommand): The following sentence should be translated in this way:
|
||||
# Do not translate "POP3"
|
||||
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
|
||||
# Do not translate "TOP"
|
||||
4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
|
||||
pop3ServerDoesNotSupportTopCommand=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
|
||||
## @loc None
|
||||
4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
|
||||
nsErrorCouldNotConnectViaTls=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
|
||||
|
||||
## @name POP3_MOVE_FOLDER_TO_TRASH
|
||||
## @loc None
|
||||
# LOCALIZATION NOTE (4044): Do not translate the word %S below.
|
||||
# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
|
||||
# "%S" is the name of the folder.
|
||||
4044=Are you sure you want to delete the folder '%S'?
|
||||
pop3MoveFolderToTrash=Are you sure you want to delete the folder '%S'?
|
||||
|
||||
## @name POP3_DELETE_FOLDER_DIALOG_TITLE
|
||||
## @loc None
|
||||
4045=Delete Folder
|
||||
pop3DeleteFolderDialogTitle=Delete Folder
|
||||
|
||||
## @name POP3_DELETE_FOLDER_BUTTON_LABEL
|
||||
## @loc None
|
||||
4046=&Delete Folder
|
||||
pop3DeleteFolderButtonLabel=&Delete Folder
|
||||
|
||||
## @name POP3_AUTH_INTERNAL_ERROR
|
||||
## @loc None
|
||||
4047=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
|
||||
pop3AuthInternalError=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
|
||||
## @loc None
|
||||
4048=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
|
||||
pop3AuthChangeEncryptToPlainNoSSL=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
|
||||
## @loc None
|
||||
4049=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
|
||||
pop3AuthChangeEncryptToPlainSSL=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
|
||||
|
||||
## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
|
||||
## @loc None
|
||||
4050=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
pop3AuthChangePlainToEncrypt=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
|
||||
# Authentication server caps and pref don't match
|
||||
## @name POP3_AUTH_MECH_NOT_SUPPORTED
|
||||
## @loc None
|
||||
4051=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
pop3AuthMechNotSupported=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
|
||||
|
||||
# Status - Could not log in to GSSAPI, and it was the only method
|
||||
## @name POP3_GSSAPI_FAILURE
|
||||
## @loc None
|
||||
4052=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
|
||||
pop3GssapiFailure=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче