Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for Bug 44042, checking in for Gervase Markham

Browse Source 
r=javi, sr=bin

Fix up some confusing wording in security dialgs.


git-svn-id: svn://10.0.0.236/trunk@101588 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
javi%netscape.com 2001-08-22 01:06:56 +00:00
parent 4869c56528
commit 3dc7e75605
4 changed files with 100 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/netwerk/resources/locale/en-US/security.properties
View File

@ -17,15 +17,22 @@
# Rights Reserved.
#
# Contributor(s):
# Sean Cotter <cotter@netscape.com>
#
# Note: Hash characters in the strings will be replaced by
# newlines. These are used to lay out the dialog.
Title=Security Warning
MixedContentMessage=You have requested a secure document that contains some unencrypted information.
LeaveSiteMessage=You have requested an unencrypted document. The document and any information you send back could be observed by a third party while in transit.
EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
WeakSiteMessage=You have requested a document from a site using low-grade encryption. The document and any information you send back could be observed by a third party while in transit.
PostToInsecure=Warning! Although this document is secure, the information you have submitted is unencrypted and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
PostToInsecureFromInsecure=Any information you submit is unencrypted and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
DontShowAgain=Show Me This Alert Next Time.
FindText=Please find the Personal Security Manager application
SecurityButtonTooltipText=Show security information for this window
Title=
MixedContentMessage=You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.
LeaveSecureMessage=You are about to leave an encrypted page. Information you send or receive from now on could easily be read by a third party.
EnterSecureMessage=You have requested an encrypted page. The web site has identified itself correctly, and information you see or enter on this page can't easily be read by a third party.
WeakSecureMessage=You have requested a page that uses low-grade encryption. The web site has identified itself correctly, but information you see or enter on this page could be read by a third party.
PostToInsecurefromSecureMessage=Although this page is encrypted, the information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##
PostToInsecureFromInsecureMessage=The information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##
MixedContentShowAgain=Alert me whenever I'm about to view an encrypted page that contains some unencrypted information.
LeaveSecureShowAgain=Alert me whenever I leave an encrypted page for one that isn't encrypted.
EnterSecureShowAgain=Alert me whenever I am about to view an encrypted page.
WeakSecureShowAgain=Alert me whenever I am about to view a page that uses low-grade encryption.
PostToInsecureFromInsecureShowAgain=Alert me whenever I submit information that's not encrypted.
SecurityButtonTooltipText=Displays security information about the current page
Continue=Continue

91
mozilla/security/manager/pki/src/nsNSSDialogs.cpp
View File

@ -452,7 +452,8 @@ nsNSSDialogs::AlertEnteringSecure(nsIInterfaceRequestor *ctx)
nsresult rv;
rv = AlertDialog(ctx, ENTER_SITE_PREF,
NS_LITERAL_STRING("EnterSiteMessage").get());
NS_LITERAL_STRING("EnterSecureMessage").get(),
NS_LITERAL_STRING("EnterSecureShowAgain").get());
return rv;
}
@ -463,7 +464,8 @@ nsNSSDialogs::AlertEnteringWeak(nsIInterfaceRequestor *ctx)
nsresult rv;
rv = AlertDialog(ctx, WEAK_SITE_PREF,
NS_LITERAL_STRING("WeakSiteMessage").get());
NS_LITERAL_STRING("WeakSecureMessage").get(),
NS_LITERAL_STRING("WeakSecureShowAgain").get());
return rv;
}
@ -474,7 +476,8 @@ nsNSSDialogs::AlertLeavingSecure(nsIInterfaceRequestor *ctx)
nsresult rv;
rv = AlertDialog(ctx, LEAVE_SITE_PREF,
NS_LITERAL_STRING("LeaveSiteMessage").get());
NS_LITERAL_STRING("LeaveSecureMessage").get(),
NS_LITERAL_STRING("LeaveSecureShowAgain").get());
return rv;
}
@ -486,7 +489,8 @@ nsNSSDialogs::AlertMixedMode(nsIInterfaceRequestor *ctx)
nsresult rv;
rv = AlertDialog(ctx, MIXEDCONTENT_PREF,
NS_LITERAL_STRING("MixedContentMessage").get());
NS_LITERAL_STRING("MixedContentMessage").get(),
NS_LITERAL_STRING("MixedContentShowAgain").get());
return rv;
}
@ -494,7 +498,8 @@ nsNSSDialogs::AlertMixedMode(nsIInterfaceRequestor *ctx)
nsresult
nsNSSDialogs::AlertDialog(nsIInterfaceRequestor *ctx, const char *prefName,
const PRUnichar *dialogMessageName)
const PRUnichar *dialogMessageName,
const PRUnichar *showAgainName)
{
nsresult rv;
@ -517,7 +522,7 @@ nsNSSDialogs::AlertDialog(nsIInterfaceRequestor *ctx, const char *prefName,
getter_Copies(windowTitle));
mStringBundle->GetStringFromName(dialogMessageName,
getter_Copies(message));
mStringBundle->GetStringFromName(NS_LITERAL_STRING("DontShowAgain").get(),
mStringBundle->GetStringFromName(showAgainName,
getter_Copies(dontShowAgain));
if (!windowTitle || !message || !dontShowAgain) return NS_ERROR_FAILURE;
@ -537,7 +542,8 @@ nsNSSDialogs::ConfirmPostToInsecure(nsIInterfaceRequestor *ctx, PRBool* _result)
nsresult rv;
rv = ConfirmDialog(ctx, INSECURE_SUBMIT_PREF,
NS_LITERAL_STRING("PostToInsecureFromInsecure").get(),
NS_LITERAL_STRING("PostToInsecureFromInsecureMessage").get(),
NS_LITERAL_STRING("PostToInsecureFromInsecureShowAgain").get(),
_result);
return rv;
@ -548,56 +554,83 @@ nsNSSDialogs::ConfirmPostToInsecureFromSecure(nsIInterfaceRequestor *ctx, PRBool
{
nsresult rv;
rv = ConfirmDialog(ctx, nsnull,
NS_LITERAL_STRING("PostToInsecure").get(), _result);
rv = ConfirmDialog(ctx, nsnull, // No preference for this one - it's too important
NS_LITERAL_STRING("PostToInsecureFromSecureMessage").get(),
nsnull,
_result);
return rv;
}
nsresult
nsNSSDialogs::ConfirmDialog(nsIInterfaceRequestor *ctx, const char *prefName,
const PRUnichar *messageName, PRBool* _result)
const PRUnichar *messageName,
const PRUnichar *showAgainName,
PRBool* _result)
{
nsresult rv;
// Get user's preference for this alert
PRBool prefValue = PR_TRUE;
if (prefName) {
rv = mPref->GetBoolPref(prefName, &prefValue);
if (NS_FAILED(rv)) prefValue = PR_TRUE;
}
// prefName, showAgainName are null if there is no preference for this dialog
PRBool prefValue;
rv = mPref->GetBoolPref(prefName, &prefValue);
if (NS_FAILED(rv)) prefValue = PR_TRUE;
// Stop if confirm is not requested
if (!prefValue) {
*_result = PR_TRUE;
return NS_OK;
}
// Get Prompt to use
nsCOMPtr<nsIPrompt> prompt = do_GetInterface(ctx);
if (!prompt) return NS_ERROR_FAILURE;
// Get messages strings from localization file
nsXPIDLString windowTitle, message, dontShowAgain;
nsXPIDLString windowTitle, message, alertMe, cont;
mStringBundle->GetStringFromName(NS_LITERAL_STRING("Title").get(),
getter_Copies(windowTitle));
mStringBundle->GetStringFromName(messageName,
getter_Copies(message));
if (!windowTitle || !message) return NS_ERROR_FAILURE;
mStringBundle->GetStringFromName(showAgainName,
getter_Copies(alertMe));
mStringBundle->GetStringFromName(NS_LITERAL_STRING("Continue").get(),
getter_Copies(cont));
// alertMe is allowed to be null
if (!windowTitle || !message || !cont) return NS_ERROR_FAILURE;
// Replace # characters with newlines to lay out the dialog.
PRUnichar* msgchars = NS_CONST_CAST(PRUnichar*, message.get());
PRUint32 i = 0;
for (i = 0; msgchars[i] != '\0'; i++) {
if (msgchars[i] == '#') {
msgchars[i] = '\n';
}
}
PRInt32 buttonPressed;
rv = prompt->ConfirmEx(windowTitle,
message,
(nsIPrompt::BUTTON_TITLE_IS_STRING * nsIPrompt::BUTTON_POS_0) +
(nsIPrompt::BUTTON_TITLE_CANCEL * nsIPrompt::BUTTON_POS_1),
cont,
nsnull,
nsnull,
alertMe,
&prefValue,
&buttonPressed);
if (prefName) {
mStringBundle->GetStringFromName(NS_LITERAL_STRING("DontShowAgain").get(),
getter_Copies(dontShowAgain));
if (!dontShowAgain) return NS_ERROR_FAILURE;
rv = prompt->ConfirmCheck(windowTitle, message, dontShowAgain, &prefValue, _result);
} else {
rv = prompt->Confirm(windowTitle, message, _result);
}
if (NS_FAILED(rv)) return rv;
if (prefName && !prefValue) {
if (buttonPressed == 1) {
*_result = PR_FALSE;
}
if (!prefValue) {
mPref->SetBoolPref(prefName, PR_FALSE);
}

6
mozilla/security/manager/pki/src/nsNSSDialogs.h
View File

@ -64,9 +64,11 @@ public:
protected:
nsresult AlertDialog(nsIInterfaceRequestor *ctx, const char *prefName,
const PRUnichar *messageName);
const PRUnichar *messageName,
const PRUnichar *showAgainName);
nsresult ConfirmDialog(nsIInterfaceRequestor *ctx, const char *prefName,
const PRUnichar *messageName, PRBool* _result);
const PRUnichar *messageName,
const PRUnichar *showAgainName, PRBool* _result);
nsCOMPtr<nsIStringBundle> mStringBundle;
nsCOMPtr<nsIStringBundle> mPIPStringBundle;
nsCOMPtr<nsIPref> mPref;

27
mozilla/security/manager/ssl/resources/locale/en-US/security.properties
View File

@ -17,15 +17,22 @@
# Rights Reserved.
#
# Contributor(s):
# Sean Cotter <cotter@netscape.com>
#
# Note: Hash characters in the strings will be replaced by
# newlines. These are used to lay out the dialog.
Title=Security Warning
MixedContentMessage=You have requested a secure document that contains some unencrypted information.
LeaveSiteMessage=You have requested an unencrypted document. The document and any information you send back could be observed by a third party while in transit.
EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
WeakSiteMessage=You have requested a document from a site using low-grade encryption. The document and any information you send back could be observed by a third party while in transit.
PostToInsecure=Warning! Although this document is secure, the information you have submitted is unencrypted and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
PostToInsecureFromInsecure=Any information you submit is unencrypted and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
DontShowAgain=Show Me This Alert Next Time.
FindText=Please find the Personal Security Manager application
SecurityButtonTooltipText=Show security information for this window
Title=
MixedContentMessage=You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.
LeaveSecureMessage=You are about to leave an encrypted page. Information you send or receive from now on could easily be read by a third party.
EnterSecureMessage=You have requested an encrypted page. The web site has identified itself correctly, and information you see or enter on this page can't easily be read by a third party.
WeakSecureMessage=You have requested a page that uses low-grade encryption. The web site has identified itself correctly, but information you see or enter on this page could be read by a third party.
PostToInsecurefromSecureMessage=Although this page is encrypted, the information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##
PostToInsecureFromInsecureMessage=The information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##
MixedContentShowAgain=Alert me whenever I'm about to view an encrypted page that contains some unencrypted information.
LeaveSecureShowAgain=Alert me whenever I leave an encrypted page for one that isn't encrypted.
EnterSecureShowAgain=Alert me whenever I am about to view an encrypted page.
WeakSecureShowAgain=Alert me whenever I am about to view a page that uses low-grade encryption.
PostToInsecureFromInsecureShowAgain=Alert me whenever I submit information that's not encrypted.
SecurityButtonTooltipText=Displays security information about the current page
Continue=Continue