зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1644807 - Switch to Primary Password terminology for the prompt to enter it. r=keeler
Differential Revision: https://phabricator.services.mozilla.com/D84026
This commit is contained in:
Matthew Noorenberghe
Родитель
84673bbd55
Коммит
62c8ce5865
|
|
@ -3,9 +3,9 @@
|
|||
# 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/.
|
||||
|
||||
CertPassPrompt=Please enter the master password for the %S.
|
||||
CertPasswordPrompt=Please enter the password for the PKCS#11 token %S.
|
||||
|
||||
CertPassPromptDefault=Please enter your master password.
|
||||
CertPasswordPromptDefault=Please enter your Primary Password.
|
||||
|
||||
# The following strings have special requirements: they must fit in a 32 or 64
|
||||
# bytes buffer after being encoded to UTF-8.
|
||||
|
|
|
|||
|
|
@ -569,11 +569,11 @@ void PK11PasswordPromptRunnable::RunOnTargetThread() {
|
|||
|
||||
nsAutoString promptString;
|
||||
if (PK11_IsInternal(mSlot)) {
|
||||
rv = GetPIPNSSBundleString("CertPassPromptDefault", promptString);
|
||||
rv = GetPIPNSSBundleString("CertPasswordPromptDefault", promptString);
|
||||
} else {
|
||||
AutoTArray<nsString, 1> formatStrings = {
|
||||
NS_ConvertUTF8toUTF16(PK11_GetTokenName(mSlot))};
|
||||
rv = PIPBundleFormatStringFromName("CertPassPrompt", formatStrings,
|
||||
rv = PIPBundleFormatStringFromName("CertPasswordPrompt", formatStrings,
|
||||
promptString);
|
||||
}
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ var gPrompt = {
|
|||
promptPassword(dialogTitle, text, password, checkMsg, checkValue) {
|
||||
equal(
|
||||
text,
|
||||
"Please enter your master password.",
|
||||
"Please enter your Primary Password.",
|
||||
"password prompt text should be as expected"
|
||||
);
|
||||
equal(checkMsg, null, "checkMsg should be null");
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ var gMockPrompter = {
|
|||
}
|
||||
equal(
|
||||
text,
|
||||
"Please enter your master password.",
|
||||
"Please enter your Primary Password.",
|
||||
"password prompt text should be as expected"
|
||||
);
|
||||
equal(checkMsg, null, "checkMsg should be null");
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ var gMockPrompter = {
|
|||
this.numPrompts++;
|
||||
equal(
|
||||
text,
|
||||
"Please enter your master password.",
|
||||
"Please enter your Primary Password.",
|
||||
"password prompt text should be as expected"
|
||||
);
|
||||
equal(checkMsg, null, "checkMsg should be null");
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ var gMockPrompter = {
|
|||
}
|
||||
equal(
|
||||
text,
|
||||
"Please enter your master password.",
|
||||
"Please enter your Primary Password.",
|
||||
"password prompt text should be as expected"
|
||||
);
|
||||
equal(checkMsg, null, "checkMsg should be null");
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ var gMockPrompter = {
|
|||
}
|
||||
equal(
|
||||
text,
|
||||
"Please enter your master password.",
|
||||
"Please enter your Primary Password.",
|
||||
"password prompt text should be as expected"
|
||||
);
|
||||
equal(checkMsg, null, "checkMsg should be null");
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for master password</title>
|
||||
<title>Test for primary password</title>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="pwmgr_common.js"></script>
|
||||
<script type="text/javascript" src="../../../prompts/test/prompt_common.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
Login Manager test: master password.
|
||||
Login Manager test: primary password.
|
||||
|
||||
<p id="display"></p>
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ add_task(async function test_1() {
|
|||
|
||||
// Trigger a MP prompt via the API
|
||||
var state = {
|
||||
msg: "Please enter your master password.",
|
||||
msg: "Please enter your Primary Password.",
|
||||
title: "the title",
|
||||
textValue: "",
|
||||
passValue: "",
|
||||
|
|
@ -91,7 +91,7 @@ add_task(async function test_1() {
|
|||
add_task(async function test_2() {
|
||||
// Try again but click cancel.
|
||||
var state = {
|
||||
msg: "Please enter your master password.",
|
||||
msg: "Please enter your Primary Password.",
|
||||
title: "the title",
|
||||
textValue: "",
|
||||
passValue: "",
|
||||
|
|
@ -118,7 +118,7 @@ add_task(async function test_2() {
|
|||
|
||||
add_task(async function test_3() {
|
||||
var state = {
|
||||
msg: "Please enter your master password.",
|
||||
msg: "Please enter your Primary Password.",
|
||||
title: "the title",
|
||||
textValue: "",
|
||||
passValue: "",
|
||||
|
|
@ -166,7 +166,7 @@ add_task(async function test_3() {
|
|||
|
||||
add_task(async function test_4() {
|
||||
var state = {
|
||||
msg: "Please enter your master password.",
|
||||
msg: "Please enter your Primary Password.",
|
||||
title: "the title",
|
||||
textValue: "",
|
||||
passValue: "",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче