author | Matthew Noorenberghe <mozilla@noorenberghe.ca> |
Fri, 15 Nov 2019 01:10:51 +0000 | |
changeset 502098 | e04f7fc87005084851805cc6f78a2b277cb77a46 |
parent 502097 | cab5d681291405a636d403d0cb9bf5359f58afbb |
child 502099 | a16c535b92e66101c5db5aa4e6a63c42476b018b |
push id | 36805 |
push user | aiakab@mozilla.com |
push date | Fri, 15 Nov 2019 09:53:19 +0000 |
treeherder | mozilla-central@1e1617c67238 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | sfoster, fluent-reviewers, flod |
bugs | 1595922 |
milestone | 72.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/aboutlogins/content/aboutLogins.html +++ b/browser/components/aboutlogins/content/aboutLogins.html @@ -169,17 +169,17 @@ <div class="login-item-favicon-wrapper"> <img class="login-item-favicon" src=""/> </div> <h2 class="title"> <span class="login-item-title"></span> <span class="new-login-title" data-l10n-id="login-item-new-login-title"></span> </h2> <button class="edit-button ghost-button" data-l10n-id="login-item-edit-button"></button> - <button class="delete-button ghost-button" data-l10n-id="login-item-delete-button"></button> + <button class="delete-button ghost-button" data-l10n-id="about-logins-login-item-remove-button"></button> </div> <form> <div class="detail-row"> <label class="detail-cell"> <span class="origin-label field-label" data-l10n-id="login-item-origin-label"></span> <!-- Default text inputs to readonly to reduce jumping of the field size on page load since it always starts readonly. --> <input type="url"
--- a/browser/components/aboutlogins/content/components/login-item.js +++ b/browser/components/aboutlogins/content/components/login-item.js @@ -473,19 +473,20 @@ export default class LoginItem extends H * @param {boolean} onConfirm Optional, the function to execute when the confirm button is clicked. */ showConfirmationDialog(type, onConfirm = () => {}) { const dialog = document.querySelector("confirmation-dialog"); let options; switch (type) { case "delete": { options = { - title: "confirm-delete-dialog-title", + title: "about-logins-confirm-remove-dialog-title", message: "confirm-delete-dialog-message", - confirmButtonLabel: "confirm-delete-dialog-confirm-button", + confirmButtonLabel: + "about-logins-confirm-remove-dialog-confirm-button", }; break; } case "discard-changes": { options = { title: "confirm-discard-changes-dialog-title", message: "confirm-discard-changes-dialog-message", confirmButtonLabel: "confirm-discard-changes-dialog-confirm-button",
--- a/browser/components/aboutlogins/tests/browser/browser_confirmDeleteDialog.js +++ b/browser/components/aboutlogins/tests/browser/browser_confirmDeleteDialog.js @@ -34,33 +34,33 @@ add_task(async function test() { title, message, cancelButton, confirmDeleteButton, ]); is( title.textContent, - "Delete this login?", + "Remove this login?", "Title contents should match l10n attribute set on outer element" ); is( message.textContent, "This action cannot be undone.", "Message contents should match l10n attribute set on outer element" ); is( cancelButton.textContent, "Cancel", "Cancel button contents should match l10n attribute set on outer element" ); is( confirmDeleteButton.textContent, - "Delete", - "Delete button contents should match l10n attribute set on outer element" + "Remove", + "Remove button contents should match l10n attribute set on outer element" ); cancelButton.click(); try { await showPromise; ok( false, "Promise returned by show() should not resolve after clicking cancel button"
--- a/browser/locales/en-US/browser/aboutLogins.ftl +++ b/browser/locales/en-US/browser/aboutLogins.ftl @@ -71,17 +71,17 @@ login-intro-instruction-fxa = Create or login-intro-instruction-fxa-settings = Make sure you’ve selected the Logins checkbox in { -sync-brand-short-name } Settings about-logins-intro-instruction-help = Visit <a data-l10n-name="help-link">{ -lockwise-brand-short-name } Support</a> for more help about-logins-intro-import = If your logins are saved in another browser, you can <a data-l10n-name="import-link">import them into { -lockwise-brand-short-name }</a> ## Login login-item-new-login-title = Create New Login login-item-edit-button = Edit -login-item-delete-button = Delete +about-logins-login-item-remove-button = Remove login-item-origin-label = Website address login-item-origin = .placeholder = https://www.example.com login-item-username-label = Username about-logins-login-item-username = .placeholder = (no username) login-item-copy-username-button-text = Copy login-item-copied-username-button-text = Copied! @@ -125,19 +125,19 @@ about-logins-enable-password-sync-dont-a .accesskey = D ## Dialogs confirmation-dialog-cancel-button = Cancel confirmation-dialog-dismiss-button = .title = Cancel -confirm-delete-dialog-title = Delete this login? +about-logins-confirm-remove-dialog-title = Remove this login? confirm-delete-dialog-message = This action cannot be undone. -confirm-delete-dialog-confirm-button = Delete +about-logins-confirm-remove-dialog-confirm-button = Remove confirm-discard-changes-dialog-title = Discard unsaved changes? confirm-discard-changes-dialog-message = All unsaved changes will be lost. confirm-discard-changes-dialog-confirm-button = Discard ## Breach Alert notification breach-alert-text = Passwords were leaked or stolen from this website since you last updated your login details. Change your password to protect your account.