Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PM-15180] - update copy for free trial banner #12151

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+25 −25
Open

[PM-15180] - update copy for free trial banner #12151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bda90fa
update copy for free trial banner
jaasen-livefront Nov 25, 2024
2c63143
add v2 translation keys
jaasen-livefront Nov 25, 2024
cafaa13
remove old keys. don't use V2 in new key name
jaasen-livefront Nov 25, 2024
d096ced
re-add removed keys
jaasen-livefront Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...b/src/app/billing/organizations/payment-method/organization-payment-method.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="tw-cursor-pointer"
rel="noreferrer noopener"
>
{{ "routeToPaymentMethodTrigger" | i18n }}
{{ "clickHereToAddPaymentMethod" | i18n }}
</a>
</bit-banner>
<app-header></app-header>
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/app/billing/services/trial-flow.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@

getFreeTrialMessage(trialRemainingDays: number): string {
if (trialRemainingDays >= 2) {
return this.i18nService.t("freeTrialEndPrompt", trialRemainingDays);
return this.i18nService.t("freeTrialEndPromptCount", trialRemainingDays);

Check warning on line 55 in apps/web/src/app/billing/services/trial-flow.service.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/billing/services/trial-flow.service.ts#L55 

Added line #L55 was not covered by tests
} else if (trialRemainingDays === 1) {
return this.i18nService.t("freeTrialEndPromptForOneDayNoOrgName");
return this.i18nService.t("freeTrialEndPromptTomorrowNoOrgName");

Check warning on line 57 in apps/web/src/app/billing/services/trial-flow.service.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/billing/services/trial-flow.service.ts#L57 

Added line #L57 was not covered by tests
} else {
return this.i18nService.t("freeTrialEndingSoonWithoutOrgName");
return this.i18nService.t("freeTrialEndingTodayWithoutOrgName");

Check warning on line 59 in apps/web/src/app/billing/services/trial-flow.service.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/billing/services/trial-flow.service.ts#L59 

Added line #L59 was not covered by tests
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/billing/shared/payment-method.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="tw-cursor-pointer"
rel="noreferrer noopener"
>
{{ "routeToPaymentMethodTrigger" | i18n }}
{{ "routeToPaymentMethodTriggerV2" | i18n }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could not find this in messages.json

</a>
</bit-banner>

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
rel="noreferrer noopener"
class="tw-cursor-pointer"
>
{{ "routeToPaymentMethodTrigger" | i18n }}
{{ "clickHereToAddPaymentMethod" | i18n }}
</a>
</bit-banner>

Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
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);

Check warning on line 77 in apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts#L77 

Added line #L77 was not covered by tests
} else {
return this.i18nService.t("freeTrialEndPromptForLessThanADay", organization.organizationName);
return this.i18nService.t("freeTrialEndPromptToday", organization.organizationName);

Check warning on line 79 in apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts#L79 

Added line #L79 was not covered by tests
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/vault/org-vault/vault.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class="tw-cursor-pointer"
rel="noreferrer noopener"
>
{{ "routeToPaymentMethodTrigger" | i18n }}
{{ "clickHereToAddPaymentMethod" | i18n }}
</a>
</bit-banner>
</ng-container>
Expand Down
28 changes: 14 additions & 14 deletions apps/web/src/locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3870,17 +3870,17 @@
"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."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i just noticed, this example text is wrong.

}
}
},
"freeTrialEndPromptAboveTwoDays": {
"message": "$ORGANIZATION$, your free trial ends in $COUNT$ days. To maintain your subscription,",
Copy link
Contributor

@cyprain-okeke cyprain-okeke Nov 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did business requested that To maintain your subscription, be removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cyprain-okeke Given how different languages break up sentences in different ways and the fact this translation in particular was broken between 2 keys it was decided to make both keys complete sentences in order to allow for proper translation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide a video recording

Copy link
Collaborator Author

@jaasen-livefront jaasen-livefront Nov 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cyprain-okeke Sorry I'm not sure what you mean. What would you like the recording of? I can provide a screenshot of what new copy looks like if that's what you'd like.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

run the application and test it, while testing record it and attached it to the pr.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cyprain-okeke Screen recording attached

"freeTrialEndPromptMultipleDays": {
"message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
"placeholders": {
"count": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the example text is wrong for the two placeholders.

"content": "$2",
Expand All @@ -3892,32 +3892,32 @@
}
}
},
"freeTrialEndPromptForOneDay": {
"message": "$ORGANIZATION$, your free trial ends tomorrow. To maintain your subscription,",
"freeTrialEndPromptTomorrow": {
"message": "$ORGANIZATION$, your free trial ends tomorrow.",
"placeholders": {
"organization": {
"content": "$1",
"example": "organization name"
}
}
},
"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",
"example": "organization name"
}
}
},
"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 add a payment method."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"message": "Click here add a payment method."
"message": "Click here to add a payment method."

},
"joinOrganization": {
"message": "Join organization"
Expand Down
2 changes: 1 addition & 1 deletion bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
(click)="navigateToPaymentMethod()"
rel="noreferrer noopener"
>
{{ "routeToPaymentMethodTrigger" | i18n }}
{{ "clickHereToAddPaymentMethod" | i18n }}
</a>
</bit-banner>
</ng-container>
Expand Down
Loading