From a90df15dc0d03691817d0bdfbf55f0c05259f0df Mon Sep 17 00:00:00 2001 From: Alec Rippberger <127791530+alec-livefront@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:39:52 -0500 Subject: [PATCH] [PM-8794] Update "auto-fill" to "autofill" (#10156) * Update i18n message strings from "auto-fill" to "autofill". * Update tests, warnings and stories "auto-fill" to "autofill". * Remove unnecessary new line removal. --- apps/browser/src/_locales/en/messages.json | 107 +++++++++--------- .../background/overlay.background.spec.ts | 2 +- .../overlay.background.deprecated.spec.ts | 2 +- .../services/autofill.service.spec.ts | 12 +- .../src/autofill/services/autofill.service.ts | 8 +- 5 files changed, 65 insertions(+), 66 deletions(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 194cc47cda2..d3520d5e444 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -135,13 +135,13 @@ "message": "Autofill" }, "autoFillLogin": { - "message": "Auto-fill login" + "message": "Autofill login" }, "autoFillCard": { - "message": "Auto-fill card" + "message": "Autofill card" }, "autoFillIdentity": { - "message": "Auto-fill identity" + "message": "Autofill identity" }, "generatePasswordCopied": { "message": "Generate password (copied)" @@ -174,7 +174,7 @@ "message": "Log in to your vault" }, "autoFillInfo": { - "message": "There are no logins available to auto-fill for the current browser tab." + "message": "There are no logins available to autofill for the current browser tab." }, "addLogin": { "message": "Add a login" @@ -439,7 +439,7 @@ "message": "Item added to favorites" }, "itemRemovedFromFavorites": { - "message": "Item removed from favorites" + "message": "Item removed from favorites" }, "notes": { "message": "Notes" @@ -652,7 +652,7 @@ } }, "autofillError": { - "message": "Unable to auto-fill the selected item on this page. Copy and paste the information instead." + "message": "Unable to autofill the selected item on this page. Copy and paste the information instead." }, "totpCaptureError": { "message": "Unable to scan QR code from the current webpage" @@ -820,7 +820,7 @@ "message": "Show cards on Tab page" }, "showCardsCurrentTabDesc": { - "message": "List card items on the Tab page for easy auto-fill." + "message": "List card items on the Tab page for easy autofill." }, "showIdentitiesInVaultView": { "message": "Show identifies as Autofill suggestions on Vault view" @@ -829,7 +829,7 @@ "message": "Show identities on Tab page" }, "showIdentitiesCurrentTabDesc": { - "message": "List identity items on the Tab page for easy auto-fill." + "message": "List identity items on the Tab page for easy autofill." }, "clearClipboard": { "message": "Clear clipboard", @@ -867,7 +867,7 @@ "message": "Update" }, "notificationUnlockDesc": { - "message": "Unlock your Bitwarden vault to complete the auto-fill request." + "message": "Unlock your Bitwarden vault to complete the autofill request." }, "notificationUnlock": { "message": "Unlock" @@ -886,10 +886,10 @@ }, "defaultUriMatchDetection": { "message": "Default URI match detection", - "description": "Default URI match detection for auto-fill." + "description": "Default URI match detection for autofill." }, "defaultUriMatchDetectionDesc": { - "message": "Choose the default way that URI match detection is handled for logins when performing actions such as auto-fill." + "message": "Choose the default way that URI match detection is handled for logins when performing actions such as autofill." }, "theme": { "message": "Theme" @@ -1104,7 +1104,7 @@ "message": "Copy TOTP automatically" }, "disableAutoTotpCopyDesc": { - "message": "If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login." + "message": "If a login has an authenticator key, copy the TOTP verification code to your clip-board when you autofill the login." }, "enableAutoBiometricsPrompt": { "message": "Ask for biometrics on launch" @@ -1220,10 +1220,10 @@ "selfHostedBaseUrlHint": { "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com" }, - "selfHostedCustomEnvHeader" :{ + "selfHostedCustomEnvHeader": { "message": "For advanced configuration, you can specify the base URL of each service independently." }, - "selfHostedEnvFormInvalid" :{ + "selfHostedEnvFormInvalid": { "message": "You must add either the base Server URL or at least one custom environment." }, "customEnvironment": { @@ -1254,8 +1254,8 @@ "message": "Environment URLs saved" }, "showAutoFillMenuOnFormFields": { - "message": "Show auto-fill menu on form fields", - "description": "Represents the message for allowing the user to enable the auto-fill overlay" + "message": "Show autofill menu on form fields", + "description": "Represents the message for allowing the user to enable the autofill overlay" }, "autofillSuggestionsSectionTitle": { "message": "Autofill suggestions" @@ -1284,7 +1284,7 @@ "description": "Overlay appearance select option for showing the field on focus of the input element" }, "autofillOverlayVisibilityOnButtonClick": { - "message": "When auto-fill icon is selected", + "message": "When autofill icon is selected", "description": "Overlay appearance select option for showing the field on click of the overlay icon" }, "enableAutoFillOnPageLoadSectionTitle": { @@ -1307,7 +1307,6 @@ "content": "$2", "example": "" } - } }, "experimentalFeature": { @@ -1326,7 +1325,7 @@ "message": "You can turn off autofill on page load for individual login items from the item's Edit view." }, "itemAutoFillOnPageLoad": { - "message": "Auto-fill on page load (if set up in Options)" + "message": "Autofill on page load (if set up in Options)" }, "autoFillOnPageLoadUseDefault": { "message": "Use default setting" @@ -1567,7 +1566,7 @@ "typeIdentity": { "message": "Identity" }, - "newItemHeader":{ + "newItemHeader": { "message": "New $TYPE$", "placeholders": { "type": { @@ -1576,7 +1575,7 @@ } } }, - "editItemHeader":{ + "editItemHeader": { "message": "Edit $TYPE$", "placeholders": { "type": { @@ -1680,11 +1679,11 @@ }, "matchDetection": { "message": "Match detection", - "description": "URI match detection for auto-fill." + "description": "URI match detection for autofill." }, "defaultMatchDetection": { "message": "Default match detection", - "description": "Default URI match detection for auto-fill." + "description": "Default URI match detection for autofill." }, "toggleOptions": { "message": "Toggle options" @@ -1843,16 +1842,16 @@ "message": "Timeout action confirmation" }, "autoFillAndSave": { - "message": "Auto-fill and save" + "message": "Autofill and save" }, "fillAndSave": { "message": "Fill and save" }, "autoFillSuccessAndSavedUri": { - "message": "Item auto-filled and URI saved" + "message": "Item autofilled and URI saved" }, "autoFillSuccess": { - "message": "Item auto-filled " + "message": "Item autofilled " }, "insecurePageWarning": { "message": "Warning: This is an unsecured HTTP page, and any information you submit can potentially be seen and changed by others. This Login was originally saved on a secure (HTTPS) page." @@ -1861,7 +1860,7 @@ "message": "Do you still wish to fill this login?" }, "autofillIframeWarning": { - "message": "The form is hosted by a different domain than the URI of your saved login. Choose OK to auto-fill anyway, or Cancel to stop." + "message": "The form is hosted by a different domain than the URI of your saved login. Choose OK to autofill anyway, or Cancel to stop." }, "autofillIframeWarningTip": { "message": "To prevent this warning in the future, save this URI, $HOSTNAME$, to your Bitwarden login item for this site.", @@ -1959,10 +1958,10 @@ "ok": { "message": "Ok" }, - "errorRefreshingAccessToken":{ + "errorRefreshingAccessToken": { "message": "Access Token Refresh Error" }, - "errorRefreshingAccessTokenDesc":{ + "errorRefreshingAccessTokenDesc": { "message": "No refresh token or API keys found. Please try logging out and logging back in." }, "desktopSyncVerificationTitle": { @@ -2349,7 +2348,7 @@ "message": "Your organization requires you to set a master password.", "description": "Used as a card title description on the set password page to explain why the user is there" }, - "verificationRequired" : { + "verificationRequired": { "message": "Verification required", "description": "Default title for the user verification dialog." }, @@ -2755,10 +2754,10 @@ } }, "autofillPageLoadPolicyActivated": { - "message": "Your organization policies have turned on auto-fill on page load." + "message": "Your organization policies have turned on autofill on page load." }, "howToAutofill": { - "message": "How to auto-fill" + "message": "How to autofill" }, "autofillSelectInfoWithCommand": { "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.", @@ -2776,7 +2775,7 @@ "message": "Got it" }, "autofillSettings": { - "message": "Auto-fill settings" + "message": "Autofill settings" }, "autofillKeyboardShortcutSectionTitle": { "message": "Autofill shortcut" @@ -2803,7 +2802,7 @@ } }, "autofillShortcutTextSafari": { - "message": "Default auto-fill shortcut: $COMMAND$.", + "message": "Default autofill shortcut: $COMMAND$.", "placeholders": { "command": { "content": "$1", @@ -3056,12 +3055,12 @@ "message": "Alias domain" }, "passwordRepromptDisabledAutofillOnPageLoad": { - "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.", - "description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load." + "message": "Items with master password re-prompt cannot be autofilled on page load. Autofill on page load turned off.", + "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load." }, "autofillOnPageLoadSetToDefault": { - "message": "Auto-fill on page load set to use default setting.", - "description": "Toast message for informing the user that auto-fill on page load has been set to the default setting." + "message": "Autofill on page load set to use default setting.", + "description": "Toast message for informing the user that autofill on page load has been set to the default setting." }, "turnOffMasterPasswordPromptToEditField": { "message": "Turn off master password re-prompt to edit this field", @@ -3074,15 +3073,15 @@ "message": "Skip to content" }, "bitwardenOverlayButton": { - "message": "Bitwarden auto-fill menu button", + "message": "Bitwarden autofill menu button", "description": "Page title for the iframe containing the overlay button" }, "toggleBitwardenVaultOverlay": { - "message": "Toggle Bitwarden auto-fill menu", + "message": "Toggle Bitwarden autofill menu", "description": "Screen reader and tool tip label for the overlay button" }, "bitwardenVault": { - "message": "Bitwarden auto-fill menu", + "message": "Bitwarden autofill menu", "description": "Page title in overlay" }, "unlockYourAccountToViewMatchingLogins": { @@ -3105,7 +3104,7 @@ "message": "Fill credentials for", "description": "Screen reader text for when overlay item is in focused" }, - "partialUsername" : { + "partialUsername": { "message": "Partial username", "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, @@ -3146,7 +3145,7 @@ "description": "Screen reader text (aria-label) for new identity button within inline menu" }, "bitwardenOverlayMenuAvailable": { - "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", + "message": "Bitwarden autofill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, "turnOn": { @@ -3572,10 +3571,10 @@ "message": "Passkey removed" }, "autofillSuggestions": { - "message": "Auto-fill suggestions" + "message": "Autofill suggestions" }, "autofillSuggestionsTip": { - "message": "Save a login item for this site to auto-fill" + "message": "Save a login item for this site to autofill" }, "yourVaultIsEmpty": { "message": "Your vault is empty" @@ -3637,8 +3636,8 @@ } }, "autofillTitle": { - "message": "Auto-fill - $ITEMNAME$", - "description": "Title for a button that auto-fills a login item.", + "message": "Autofill - $ITEMNAME$", + "description": "Title for a button that autofills a login item.", "placeholders": { "itemname": { "content": "$1", @@ -3752,7 +3751,7 @@ "lastEdited": { "message": "Last edited" }, - "ownerYou":{ + "ownerYou": { "message": "Owner: You" }, "linked": { @@ -3764,7 +3763,7 @@ "upload": { "message": "Upload" }, - "addAttachment":{ + "addAttachment": { "message": "Add attachment" }, "maxFileSizeSansPunctuation": { @@ -3934,11 +3933,11 @@ "hiddenHelpText": { "message": "Use hidden fields for sensitive data like a password" }, - "checkBoxHelpText":{ - "message": "Use checkboxes if you'd like to auto-fill a form's checkbox, like a remember email" + "checkBoxHelpText": { + "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email" }, "linkedHelpText": { - "message": "Use a linked field when you are experiencing auto-fill issues for a specific website." + "message": "Use a linked field when you are experiencing autofill issues for a specific website." }, "linkedLabelHelpText": { "message": "Enter the the field's html id, name, aria-label, or placeholder." @@ -3982,7 +3981,7 @@ } } }, - "reorderFieldUp":{ + "reorderFieldUp": { "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$", "placeholders": { "label": { @@ -4069,7 +4068,7 @@ } } }, - "reorderFieldDown":{ + "reorderFieldDown": { "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$", "placeholders": { "label": { diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts index b3c86992067..783010ee04d 100644 --- a/apps/browser/src/autofill/background/overlay.background.spec.ts +++ b/apps/browser/src/autofill/background/overlay.background.spec.ts @@ -2328,7 +2328,7 @@ describe("OverlayBackground", () => { expect(autofillService.doAutoFill).not.toHaveBeenCalled(); }); - it("auto-fills the selected cipher and move it to the top of the front of the ciphers map", async () => { + it("autofills the selected cipher and move it to the top of the front of the ciphers map", async () => { const cipher1 = mock({ id: "inline-menu-cipher-1" }); const cipher2 = mock({ id: "inline-menu-cipher-2" }); const cipher3 = mock({ id: "inline-menu-cipher-3" }); diff --git a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts index c3285059c7e..3adaf9e276c 100644 --- a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts +++ b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts @@ -1315,7 +1315,7 @@ describe("OverlayBackground", () => { expect(doAutoFillSpy).not.toHaveBeenCalled(); }); - it("auto-fills the selected cipher and move it to the top of the front of the ciphers map", async () => { + it("autofills the selected cipher and move it to the top of the front of the ciphers map", async () => { const cipher1 = mock({ id: "overlay-cipher-1" }); const cipher2 = mock({ id: "overlay-cipher-2" }); const cipher3 = mock({ id: "overlay-cipher-3" }); diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts index 8f4fd9e6244..1ceebe53fca 100644 --- a/apps/browser/src/autofill/services/autofill.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill.service.spec.ts @@ -580,8 +580,8 @@ describe("AutofillService", () => { describe("doAutoFill", () => { let autofillOptions: AutoFillOptions; - const nothingToAutofillError = "Nothing to auto-fill."; - const didNotAutofillError = "Did not auto-fill."; + const nothingToAutofillError = "Nothing to autofill."; + const didNotAutofillError = "Did not autofill."; beforeEach(() => { autofillOptions = { @@ -805,7 +805,7 @@ describe("AutofillService", () => { triggerTestFailure(); } catch (error) { expect(logService.info).toHaveBeenCalledWith( - "Auto-fill on page load was blocked due to an untrusted iframe.", + "Autofill on page load was blocked due to an untrusted iframe.", ); expect(error.message).toBe(didNotAutofillError); } @@ -819,7 +819,7 @@ describe("AutofillService", () => { await autofillService.doAutoFill(autofillOptions); expect(logService.info).not.toHaveBeenCalledWith( - "Auto-fill on page load was blocked due to an untrusted iframe.", + "Autofill on page load was blocked due to an untrusted iframe.", ); }); @@ -1204,7 +1204,7 @@ describe("AutofillService", () => { expect(result).toBe(totp); }); - it("auto-fills card cipher types", async () => { + it("autofills card cipher types", async () => { const cardFormPageDetails = [ { frameId: 1, @@ -1251,7 +1251,7 @@ describe("AutofillService", () => { }); }); - it("auto-fills identity cipher types", async () => { + it("autofills identity cipher types", async () => { const identityFormPageDetails = [ { frameId: 1, diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index 2ac03a92c99..f2ef9790f62 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -317,7 +317,7 @@ export default class AutofillService implements AutofillServiceInterface { async doAutoFill(options: AutoFillOptions): Promise { const tab = options.tab; if (!tab || !options.cipher || !options.pageDetails || !options.pageDetails.length) { - throw new Error("Nothing to auto-fill."); + throw new Error("Nothing to autofill."); } let totp: string | null = null; @@ -359,7 +359,7 @@ export default class AutofillService implements AutofillServiceInterface { options.allowUntrustedIframe != undefined && !options.allowUntrustedIframe ) { - this.logService.info("Auto-fill on page load was blocked due to an untrusted iframe."); + this.logService.info("Autofill on page load was blocked due to an untrusted iframe."); return; } @@ -414,7 +414,7 @@ export default class AutofillService implements AutofillServiceInterface { return null; } } else { - throw new Error("Did not auto-fill."); + throw new Error("Did not autofill."); } } @@ -1187,7 +1187,7 @@ export default class AutofillService implements AutofillServiceInterface { options: GenerateFillScriptOptions, ): Promise { // If the pageUrl (from the content script) matches the tabUrl (from the sender tab), we are not in an iframe - // This also avoids a false positive if no URI is saved and the user triggers auto-fill anyway + // This also avoids a false positive if no URI is saved and the user triggers autofill anyway if (pageUrl === options.tabUrl) { return false; }