From cbb2fa944217616b518222d3fd35207d12a50f05 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 20 Jun 2024 15:45:48 +0200 Subject: [PATCH] [PM-8972] Migrate callouts to the new CL callout (#9710) * Migrate callouts to the new CL callout --- .../manage/verify-recover-delete-org.component.html | 6 +++--- .../components/bulk/bulk-confirm.component.html | 8 ++++---- .../components/bulk/bulk-remove.component.html | 12 ++++++------ .../organizations/members/people.component.html | 6 +++--- .../policies/disable-send.component.html | 4 ++-- .../policies/master-password.component.html | 4 ++-- .../policies/personal-ownership.component.html | 4 ++-- .../policies/require-sso.component.html | 8 ++++---- .../policies/send-options.component.html | 4 ++-- .../organizations/policies/single-org.component.html | 4 ++-- .../two-factor-authentication.component.html | 4 ++-- .../delete-organization-dialog.component.html | 6 +++--- .../account/change-avatar-dialog.component.html | 3 --- .../account/change-avatar-dialog.component.ts | 1 - .../settings/account/change-email.component.html | 6 +++--- .../account/deauthorize-sessions.component.html | 2 +- .../account/delete-account-dialog.component.html | 2 +- .../emergency-access-takeover.component.html | 2 +- .../auth/settings/security/api-key.component.html | 8 ++++---- .../settings/two-factor-authenticator.component.html | 8 ++++---- .../auth/settings/two-factor-email.component.html | 4 ++-- .../organizations/organization-plans.component.html | 4 +++- .../src/app/billing/shared/payment.component.html | 8 ++++---- apps/web/src/app/settings/preferences.component.html | 4 ++-- .../vault/individual-vault/add-edit.component.html | 4 ++-- .../app/vault/individual-vault/vault.component.html | 4 ++-- .../web/src/app/vault/org-vault/vault.component.html | 4 ++-- .../app/vault/settings/purge-vault.component.html | 2 +- .../policies/activate-autofill.component.html | 4 ++-- .../policies/maximum-vault-timeout.component.html | 4 ++-- .../bit-web/src/app/auth/sso/sso.component.html | 4 ++-- .../settings/porting/sm-export.component.html | 4 ++-- 32 files changed, 75 insertions(+), 77 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.html b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.html index a689e98985..68f943568c 100644 --- a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.html +++ b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.html @@ -3,9 +3,9 @@

{{ "deleteOrganization" | i18n }}

- {{ - "deletingOrganizationIsPermanentWarning" | i18n: name - }} + + {{ "deletingOrganizationIsPermanentWarning" | i18n: name }} +

{{ name }}

diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.html index 0f420c6903..28c3db8303 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.html @@ -1,11 +1,11 @@ - + {{ "noSelectedUsersApplicable" | i18n }} - - + + {{ error }} - +

{{ "fingerprintEnsureIntegrityVerify" | i18n }} diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.html index 3bcc749821..8b921d6981 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.html @@ -1,18 +1,18 @@ - + {{ "noSelectedUsersApplicable" | i18n }} - - + + {{ error }} - + - +

{{ removeUsersWarning }}

{{ "removeMembersWithoutMasterPasswordWarning" | i18n }}

- + diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html index c6e7bfd070..9123b39a37 100644 --- a/apps/web/src/app/admin-console/organizations/members/people.component.html +++ b/apps/web/src/app/admin-console/organizations/members/people.component.html @@ -48,14 +48,14 @@

{{ "noMembersInList" | i18n }}

- {{ "usersNeedConfirmed" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html b/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html index 0e50c5838e..5ca0e04c3f 100644 --- a/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html @@ -1,6 +1,6 @@ - + {{ "disableSendExemption" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/policies/master-password.component.html b/apps/web/src/app/admin-console/organizations/policies/master-password.component.html index 6864519fde..85670f7d19 100644 --- a/apps/web/src/app/admin-console/organizations/policies/master-password.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/master-password.component.html @@ -1,6 +1,6 @@ - + {{ "keyConnectorPolicyRestriction" | i18n }} - +
diff --git a/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html index 34cf1b5aa5..85fb04730d 100644 --- a/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html @@ -1,6 +1,6 @@ - + {{ "personalOwnershipExemption" | i18n }} - +
diff --git a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html index 0056f654d0..57aa3471c7 100644 --- a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html @@ -1,9 +1,9 @@ - + {{ "requireSsoPolicyReq" | i18n }} - - + + {{ "requireSsoExemption" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/policies/send-options.component.html b/apps/web/src/app/admin-console/organizations/policies/send-options.component.html index 7bf34ef3a6..6e7f595c82 100644 --- a/apps/web/src/app/admin-console/organizations/policies/send-options.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/send-options.component.html @@ -1,6 +1,6 @@ - + {{ "sendOptionsExemption" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/policies/single-org.component.html b/apps/web/src/app/admin-console/organizations/policies/single-org.component.html index aaf6888edd..5cf0c98f98 100644 --- a/apps/web/src/app/admin-console/organizations/policies/single-org.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/single-org.component.html @@ -1,6 +1,6 @@ - + {{ "singleOrgPolicyWarning" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html b/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html index 261740314d..08141c5a87 100644 --- a/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html +++ b/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html @@ -1,6 +1,6 @@ - + {{ "twoStepLoginPolicyWarning" | i18n }} - + diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.html b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.html index 23c5336ece..06b963193d 100644 --- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.html +++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.html @@ -2,9 +2,9 @@ {{ "deleteOrganization" | i18n }}
- {{ - "deletingOrganizationIsPermanentWarning" | i18n: organization?.name - }} + + {{ "deletingOrganizationIsPermanentWarning" | i18n: organization?.name }} +

- - {{ error }} -

{{ "pickAnAvatarColor" | i18n }}

diff --git a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts index 6946f8b94b..b555faf9a1 100644 --- a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts +++ b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts @@ -31,7 +31,6 @@ export class ChangeAvatarDialogComponent implements OnInit, OnDestroy { @ViewChild("colorPicker") colorPickerElement: ElementRef; loading = false; - error: string; defaultColorPalette: NamedAvatarColor[] = [ { name: "brightBlue", color: "#16cbfc" }, { name: "green", color: "#94cc4b" }, diff --git a/apps/web/src/app/auth/settings/account/change-email.component.html b/apps/web/src/app/auth/settings/account/change-email.component.html index 4061f56833..b097047e66 100644 --- a/apps/web/src/app/auth/settings/account/change-email.component.html +++ b/apps/web/src/app/auth/settings/account/change-email.component.html @@ -1,7 +1,7 @@
- + {{ "changeEmailTwoFactorWarning" | i18n }} - +
@@ -29,7 +29,7 @@

{{ "changeEmailDesc" | i18n: formGroup.controls.step1.value.newEmail }}

- {{ "loggedOutWarning" | i18n }} + {{ "loggedOutWarning" | i18n }}
diff --git a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html index 56e2cda578..3867e9d1ca 100644 --- a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html +++ b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html @@ -20,7 +20,7 @@

{{ "deauthorizeSessionsDesc" | i18n }}

- {{ "deauthorizeSessionsWarning" | i18n }} + {{ "deauthorizeSessionsWarning" | i18n }}
diff --git a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.html b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.html index 93fec807ba..d280f19bea 100644 --- a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.html +++ b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.html @@ -2,7 +2,7 @@

{{ "deleteAccountDesc" | i18n }}

- {{ "deleteAccountWarning" | i18n }} + {{ "deleteAccountWarning" | i18n }} {{ params.name }}
- {{ "loggedOutWarning" | i18n }} + {{ "loggedOutWarning" | i18n }}
diff --git a/apps/web/src/app/auth/settings/security/api-key.component.html b/apps/web/src/app/auth/settings/security/api-key.component.html index 118b17643c..b9416305ac 100644 --- a/apps/web/src/app/auth/settings/security/api-key.component.html +++ b/apps/web/src/app/auth/settings/security/api-key.component.html @@ -5,11 +5,11 @@

{{ data.apiKeyDescription | i18n }}

- {{ data.apiKeyWarning | i18n }} - {{ data.apiKeyWarning | i18n }} +

@@ -28,7 +28,7 @@ grant_type:
{{ data.grantType }}

- +
diff --git a/apps/web/src/app/settings/preferences.component.html b/apps/web/src/app/settings/preferences.component.html index 984ae7536a..0fe96a69ed 100644 --- a/apps/web/src/app/settings/preferences.component.html +++ b/apps/web/src/app/settings/preferences.component.html @@ -3,7 +3,7 @@

{{ "preferencesDesc" | i18n }}

- + {{ "vaultTimeoutPolicyWithActionInEffect" @@ -16,7 +16,7 @@ {{ "vaultTimeoutActionPolicyInEffect" | i18n: (policy.action | i18n) }} - +
- + {{ "personalOwnershipPolicyInEffect" | i18n }} - +
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html index f39ec3378d..780614c330 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.html +++ b/apps/web/src/app/vault/individual-vault/vault.component.html @@ -33,9 +33,9 @@
- + {{ trashCleanupWarning }} - + - + {{ trashCleanupWarning }} - + {{ (organizationId ? "purgeOrgVaultDesc" : "purgeVaultDesc") | i18n }}

- {{ "purgeVaultWarning" | i18n }} + {{ "purgeVaultWarning" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html index e61b965ce6..0b3c8bf6ba 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html @@ -1,9 +1,9 @@ - + {{ "experimentalFeature" | i18n }} {{ "learnMoreAboutAutofill" | i18n }} - + diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html index 1bfc024f3a..deb72cfb3b 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html @@ -1,6 +1,6 @@ - + {{ "requireSsoPolicyReq" | i18n }} - + diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html index 2e4d8fcc44..6095ec7279 100644 --- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html +++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html @@ -106,9 +106,9 @@ showKeyConnectorOptions " > - + {{ "keyConnectorWarning" | i18n }} - + {{ "keyConnectorUrl" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.html index 63409ca14e..9e1f2e0159 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.html @@ -2,9 +2,9 @@
- + {{ "exportingOrganizationSecretDataDescription" | i18n: orgName }} - +