[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

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 }}
   </a>
 </bit-banner>
 <app-header></app-header>

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");
     }
   }
 

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 }}
   </a>
 </bit-banner>
 

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 }}
   </a>
 </bit-banner>
 

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);
     }
   }
 

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 }}
     </a>
   </bit-banner>
 </ng-container>

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": {
+  "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days. To maintain your subscription,",
+    "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": {
+  "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow. To maintain your subscription,",
+    "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": {
+  "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow. To maintain your subscription,"
+    "message": "Your free trial ends tomorrow."
   },
-  "freeTrialEndPromptForLessThanADay": {
+  "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today. To maintain your subscription,",
+    "message": "$ORGANIZATION$, your free trial ends today.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -3946,11 +3946,11 @@
       }
     }
   },
-  "freeTrialEndingSoonWithoutOrgName": {
+  "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today. To maintain your subscription,"
+    "message": "Your free trial ends today."
   },
-  "routeToPaymentMethodTrigger": {
+  "clickHereToAddPaymentMethod": {
-    "message": "add a payment method."
+    "message": "Click here to add a payment method."
   },
   "joinOrganization": {
     "message": "Join organization"

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 }}
     </a>
   </bit-banner>
 </ng-container>