зеркало из https://github.com/mozilla/gecko-dev.git
fix for #63994, fix string used in news error alert. sr=bienvenu.
This commit is contained in:
Родитель
5dc2fa42a9
Коммит
571284efc2
|
@ -44,7 +44,6 @@ downloadingHeaders=Downloading %S of %S headers
|
|||
downloadingArticles=Downloading articles %S-%S
|
||||
bytesReceived=Downloading newsgroups: %S received (%SK read at %SK/sec)
|
||||
checkingForNewNews=Checking newsgroup %S of %S for new messages
|
||||
newsError=NEWS ERROR:
|
||||
|
||||
# LOCALIZATION NOTE (Error -304): In the following item, don't translate "NNTP"
|
||||
# Error - server error
|
||||
|
|
|
@ -5467,12 +5467,14 @@ nsNNTPProtocol::AlertError(PRInt32 errorCode, const char *text)
|
|||
|
||||
nsAutoString alertText;
|
||||
nsXPIDLString str;
|
||||
rv = GetNewsStringByName("newsError", getter_Copies(str));
|
||||
rv = GetNewsStringByID(MK_NNTP_ERROR_MESSAGE, getter_Copies(str));
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
alertText.Append(str);
|
||||
|
||||
if (text)
|
||||
alertText.AppendWithConversion(text);
|
||||
if (text) {
|
||||
alertText.Append(NS_LITERAL_STRING(" ").get());
|
||||
alertText.AppendWithConversion(text);
|
||||
}
|
||||
|
||||
rv = dialog->Alert(nsnull, alertText.GetUnicode());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
|
Загрузка…
Ссылка в новой задаче