From 4003d30b46adafa4d1aa49884fab73c093a07ebb Mon Sep 17 00:00:00 2001 From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:43:13 -0800 Subject: [PATCH] [PM-15180] - update copy for free trial banner (#12151) * update copy for free trial banner * add v2 translation keys * remove old keys. don't use V2 in new key name * re-add removed keys * fix copy and examples * fix i18n key --- ...organization-payment-method.component.html | 2 +- .../billing/services/trial-flow.service.ts | 6 +-- .../shared/payment-method.component.html | 2 +- .../vault-banners.component.html | 2 +- .../vault-banners/vault-banners.component.ts | 6 +-- .../app/vault/org-vault/vault.component.html | 2 +- apps/web/src/locales/en/messages.json | 50 +++++++++---------- .../overview/overview.component.html | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html index e7bc9cac01e..78f9955d31a 100644 --- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html +++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html @@ -14,7 +14,7 @@ class="tw-cursor-pointer" rel="noreferrer noopener" > - {{ "routeToPaymentMethodTrigger" | i18n }} + {{ "clickHereToAddPaymentMethod" | i18n }} diff --git a/apps/web/src/app/billing/services/trial-flow.service.ts b/apps/web/src/app/billing/services/trial-flow.service.ts index 4480c3fa94a..558851ad64c 100644 --- a/apps/web/src/app/billing/services/trial-flow.service.ts +++ b/apps/web/src/app/billing/services/trial-flow.service.ts @@ -54,11 +54,11 @@ export class TrialFlowService { getFreeTrialMessage(trialRemainingDays: number): string { if (trialRemainingDays >= 2) { - return this.i18nService.t("freeTrialEndPrompt", trialRemainingDays); + return this.i18nService.t("freeTrialEndPromptCount", trialRemainingDays); } else if (trialRemainingDays === 1) { - return this.i18nService.t("freeTrialEndPromptForOneDayNoOrgName"); + return this.i18nService.t("freeTrialEndPromptTomorrowNoOrgName"); } else { - return this.i18nService.t("freeTrialEndingSoonWithoutOrgName"); + return this.i18nService.t("freeTrialEndingTodayWithoutOrgName"); } } diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html index e6537786d10..920af5fed51 100644 --- a/apps/web/src/app/billing/shared/payment-method.component.html +++ b/apps/web/src/app/billing/shared/payment-method.component.html @@ -14,7 +14,7 @@ class="tw-cursor-pointer" rel="noreferrer noopener" > - {{ "routeToPaymentMethodTrigger" | i18n }} + {{ "clickHereToAddPaymentMethod" | i18n }} diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html index abb4d19c9d3..29909e26716 100644 --- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html +++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html @@ -14,7 +14,7 @@ rel="noreferrer noopener" class="tw-cursor-pointer" > - {{ "routeToPaymentMethodTrigger" | i18n }} + {{ "clickHereToAddPaymentMethod" | i18n }} diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts index 175f72f885e..933b4899c94 100644 --- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts @@ -71,14 +71,14 @@ export class VaultBannersComponent implements OnInit { freeTrialMessage(organization: FreeTrial) { if (organization.remainingDays >= 2) { return this.i18nService.t( - "freeTrialEndPromptAboveTwoDays", + "freeTrialEndPromptMultipleDays", organization.organizationName, organization.remainingDays.toString(), ); } else if (organization.remainingDays === 1) { - return this.i18nService.t("freeTrialEndPromptForOneDay", organization.organizationName); + return this.i18nService.t("freeTrialEndPromptTomorrow", organization.organizationName); } else { - return this.i18nService.t("freeTrialEndPromptForLessThanADay", organization.organizationName); + return this.i18nService.t("freeTrialEndPromptToday", organization.organizationName); } } diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html index 400775a9c28..52f3ea026ff 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.html +++ b/apps/web/src/app/vault/org-vault/vault.component.html @@ -15,7 +15,7 @@ class="tw-cursor-pointer" rel="noreferrer noopener" > - {{ "routeToPaymentMethodTrigger" | i18n }} + {{ "clickHereToAddPaymentMethod" | i18n }} diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 163c63a6d24..06728929912 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -3903,30 +3903,30 @@ "updateBrowserDesc": { "message": "You are using an unsupported web browser. The web vault may not function properly." }, - "freeTrialEndPrompt": { - "message": "Your free trial ends in $COUNT$ days. To maintain your subscription,", + "freeTrialEndPromptCount": { + "message": "Your free trial ends in $COUNT$ days.", "placeholders": { "count": { - "content": "$1", - "example": "You must set up 2FA on your user account before you can join this organization." - } - } - }, - "freeTrialEndPromptAboveTwoDays": { - "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days. To maintain your subscription,", - "placeholders": { - "count": { - "content": "$2", - "example": "organization name" - }, - "organization": { "content": "$1", "example": "remaining days" } } }, - "freeTrialEndPromptForOneDay": { - "message": "$ORGANIZATION$, your free trial ends tomorrow. To maintain your subscription,", + "freeTrialEndPromptMultipleDays": { + "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.", + "placeholders": { + "count": { + "content": "$2", + "example": "remaining days" + }, + "organization": { + "content": "$1", + "example": "organization name" + } + } + }, + "freeTrialEndPromptTomorrow": { + "message": "$ORGANIZATION$, your free trial ends tomorrow.", "placeholders": { "organization": { "content": "$1", @@ -3934,11 +3934,11 @@ } } }, - "freeTrialEndPromptForOneDayNoOrgName": { - "message": "Your free trial ends tomorrow. To maintain your subscription," + "freeTrialEndPromptTomorrowNoOrgName": { + "message": "Your free trial ends tomorrow." }, - "freeTrialEndPromptForLessThanADay": { - "message": "$ORGANIZATION$, your free trial ends today. To maintain your subscription,", + "freeTrialEndPromptToday": { + "message": "$ORGANIZATION$, your free trial ends today.", "placeholders": { "organization": { "content": "$1", @@ -3946,11 +3946,11 @@ } } }, - "freeTrialEndingSoonWithoutOrgName": { - "message": "Your free trial ends today. To maintain your subscription," + "freeTrialEndingTodayWithoutOrgName": { + "message": "Your free trial ends today." }, - "routeToPaymentMethodTrigger": { - "message": "add a payment method." + "clickHereToAddPaymentMethod": { + "message": "Click here to add a payment method." }, "joinOrganization": { "message": "Join organization" diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html index 482ccaf0454..2de9a4c4f30 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html @@ -15,7 +15,7 @@ (click)="navigateToPaymentMethod()" rel="noreferrer noopener" > - {{ "routeToPaymentMethodTrigger" | i18n }} + {{ "clickHereToAddPaymentMethod" | i18n }}