From 9100b05133a5ae29ccedb47760c0cec523550bf0 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Thu, 22 Jun 2023 14:21:21 -0700 Subject: [PATCH] [AC-1418] Adjust labels and appearance to better match design --- ...nization-subscription-cloud.component.html | 4 +- .../sm-adjust-subscription.component.html | 12 ++--- apps/web/src/locales/en/messages.json | 46 ++++++++++--------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html index 67c785326c2..01db951ce9c 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html @@ -151,7 +151,7 @@ > {{ "removeSponsorship" | i18n }} -

{{ "storage" | i18n }}

+

{{ "storage" | i18n }}

{{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}

@@ -178,7 +178,7 @@ -

{{ "secretsManager" | i18n }}

+

{{ "secretsManager" | i18n }}

- + {{ "subscriptionSeats" | i18n }} @@ -15,7 +15,7 @@ {{ "limitSmSubscriptionDesc" | i18n }} - + {{ "maxSeatLimit" | i18n }} - {{ "total" | i18n }}: + {{ "maxSeatCost" | i18n }}: {{ formGroup.value.seatLimit || 0 }} × {{ options.seatPrice | currency }} = {{ maxSeatTotal | currency }} / {{ options.interval | i18n }} - + {{ "additionalServiceAccounts" | i18n }} - + {{ "serviceAccountLimit" | i18n }} - {{ "total" | i18n }}: + {{ "maxServiceAccountCost" | i18n }}: {{ formGroup.value.serviceAccountLimit || 0 }} × {{ options.additionalServiceAccountPrice | currency }} = {{ maxServiceAccountTotal | currency }} / {{ options.interval | i18n }} diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 2b0b9b5b2f9..edc1d37ce28 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -404,8 +404,7 @@ "viewItem": { "message": "View item" }, - "new": - { + "new": { "message": "New", "description": "for adding new items" }, @@ -5843,10 +5842,10 @@ "message": "Delete secrets", "description": "The action to delete multiple secrets from the system." }, - "hardDeleteSecret":{ + "hardDeleteSecret": { "message": "Permanently delete secret" }, - "hardDeleteSecrets":{ + "hardDeleteSecrets": { "message": "Permanently delete secrets" }, "secretProjectAssociationDescription": { @@ -5925,14 +5924,14 @@ "message": "To get started, add a new secret or import secrets.", "description": "Message to encourage the user to start adding secrets." }, - "secretsTrashNoItemsMessage":{ + "secretsTrashNoItemsMessage": { "message": "There are no secrets in the trash." }, "serviceAccountsNoItemsMessage": { "message": "Create a new service account to get started automating secret access.", "description": "Message to encourage the user to start creating service accounts." }, - "serviceAccountsNoItemsTitle": { + "serviceAccountsNoItemsTitle": { "message": "Nothing to show yet", "description": "Title to indicate that there are no service accounts to display." }, @@ -5953,7 +5952,7 @@ "description": "Action to view the details of a service account." }, "deleteServiceAccountDialogMessage": { - "message": "Deleting service account $SERVICE_ACCOUNT$ is permanent and irreversible.", + "message": "Deleting service account $SERVICE_ACCOUNT$ is permanent and irreversible.", "placeholders": { "service_account": { "content": "$1", @@ -5961,11 +5960,11 @@ } } }, - "deleteServiceAccountsDialogMessage":{ + "deleteServiceAccountsDialogMessage": { "message": "Deleting service accounts is permanent and irreversible." }, - "deleteServiceAccountsConfirmMessage":{ - "message": "Delete $COUNT$ service accounts", + "deleteServiceAccountsConfirmMessage": { + "message": "Delete $COUNT$ service accounts", "placeholders": { "count": { "content": "$1", @@ -5973,19 +5972,19 @@ } } }, - "deleteServiceAccountToast":{ + "deleteServiceAccountToast": { "message": "Service account deleted" }, - "deleteServiceAccountsToast":{ + "deleteServiceAccountsToast": { "message": "Service accounts deleted" }, "searchServiceAccounts": { "message": "Search service accounts", "description": "Placeholder text for searching service accounts." }, - "editServiceAccount":{ - "message":"Edit service account", - "description" : "Title for editing a service account." + "editServiceAccount": { + "message": "Edit service account", + "description": "Title for editing a service account." }, "addProject": { "message": "Add project", @@ -6025,8 +6024,8 @@ "hardDeleteSecretsConfirmation": { "message": "Are you sure you want to permanently delete these secrets?" }, - "hardDeletesSuccessToast":{ - "message":"Secrets permanently deleted" + "hardDeletesSuccessToast": { + "message": "Secrets permanently deleted" }, "smAccess": { "message": "Access", @@ -6040,7 +6039,7 @@ "message": "Service account name", "description": "Label for the name of a service account" }, - "serviceAccountCreated": { + "serviceAccountCreated": { "message": "Service account created", "description": "Notifies that a new service account has been created" }, @@ -6128,8 +6127,8 @@ "message": "Secret sent to trash", "description": "Notification to be displayed when a secret is successfully sent to the trash." }, - "hardDeleteSuccessToast":{ - "message":"Secret permanently deleted" + "hardDeleteSuccessToast": { + "message": "Secret permanently deleted" }, "accessTokens": { "message": "Access tokens", @@ -6836,8 +6835,8 @@ "message": "with automatic enrollment will turn on when this option is used.", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'" }, - "notFound":{ - "message": "$RESOURCE$ not found", + "notFound": { + "message": "$RESOURCE$ not found", "placeholders": { "resource": { "content": "$1", @@ -6927,6 +6926,9 @@ "serviceAccountLimit": { "message": "Service account limit (optional)" }, + "maxServiceAccountCost": { + "message": "Max potential service account cost" + }, "additionalServiceAccountsDesc": { "message": "Your plan comes with $COUNT$ service accounts. You can add additional service accounts for $COST$ per month.", "placeholders": {