Skip to content

Commit

Permalink
[PM-11503] Organization Automatic Sync verbiage is misleading (#11151)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonashendrickx authored Oct 2, 2024
1 parent 363acf5 commit 1367765
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form [formGroup]="formGroup" [bitSubmit]="submit">
<bit-dialog>
<h1 bitDialogTitle>
{{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | i18n }}
{{ (hasBillingToken ? "viewBillingToken" : "generateBillingToken") | i18n }}
</h1>
<div bitDialogContent>
<app-user-verification formControlName="verification" *ngIf="!clientSecret">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form [formGroup]="formGroup" [bitSubmit]="submit">
<bit-dialog>
<h1 bitDialogTitle>
{{ "manageBillingSync" | i18n }}
{{ "manageBillingTokenSync" | i18n }}
</h1>
<div bitDialogContent>
<p>{{ "billingSyncKeyDesc" | i18n }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ <h2 bitTypography="h2" *ngIf="shownSelfHost()" class="tw-mt-7">
(click)="manageBillingSync()"
*ngIf="canManageBillingSync"
>
{{ (hasBillingSyncToken ? "manageBillingSync" : "setUpBillingSync") | i18n }}
{{ (hasBillingSyncToken ? "viewBillingToken" : "setUpBillingSync") | i18n }}
</button>
</div>
<ng-container *ngIf="userOrg.canEditSubscription">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h2 class="mt-5">
</a>
</bit-label>
<bit-hint>
{{ "billingSyncDesc" | i18n }}
{{ "automaticBillingSyncDesc" | i18n }}
</bit-hint>
</bit-radio-button>
<ng-container *ngIf="updateMethod === licenseOptions.SYNC">
Expand All @@ -100,7 +100,7 @@ <h2 class="mt-5">
type="button"
(click)="manageBillingSyncSelfHosted()"
>
{{ "manageBillingSync" | i18n }}
{{ "manageBillingTokenSync" | i18n }}
</button>
<button
bitButton
Expand All @@ -121,7 +121,7 @@ <h2 class="mt-5">
>
<bit-label>{{ "manualUpload" | i18n }}</bit-label>
<bit-hint>
{{ "manualUploadDesc" | i18n }}
{{ "manualBillingTokenUploadDesc" | i18n }}
</bit-hint>
</bit-radio-button>
<ng-container *ngIf="updateMethod === licenseOptions.UPLOAD">
Expand Down
23 changes: 13 additions & 10 deletions apps/web/src/locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2567,6 +2567,9 @@
"downloadLicense": {
"message": "Download license"
},
"viewBillingToken": {
"message": "View Billing Token"
},
"updateLicense": {
"message": "Update license"
},
Expand Down Expand Up @@ -6001,17 +6004,17 @@
"viewBillingSyncToken": {
"message": "View billing sync token"
},
"generateBillingSyncToken": {
"message": "Generate billing sync token"
"generateBillingToken": {
"message": "Generate billing token"
},
"copyPasteBillingSync": {
"message": "Copy and paste this token into the billing sync settings of your self-hosted organization."
},
"billingSyncCanAccess": {
"message": "Your billing sync token can access and edit this organization's subscription settings."
},
"manageBillingSync": {
"message": "Manage billing sync"
"manageBillingTokenSync": {
"message": "Manage Billing Token"
},
"setUpBillingSync": {
"message": "Set up billing sync"
Expand Down Expand Up @@ -6070,15 +6073,15 @@
"billingSyncApiKeyRotated": {
"message": "Token rotated"
},
"billingSyncDesc": {
"message": "Billing sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
},
"billingSyncKeyDesc": {
"message": "A billing sync token from your cloud organization's subscription settings is required to complete this form."
},
"billingSyncKey": {
"message": "Billing sync token"
},
"automaticBillingSyncDesc": {
"message": "Automatic sync unlocks Families sponsorships and allows you to sync your license without uploading a file. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
},
"active": {
"message": "Active"
},
Expand Down Expand Up @@ -7488,11 +7491,11 @@
"manualUpload": {
"message": "Manual upload"
},
"manualUploadDesc": {
"message": "If you do not want to opt into billing sync, manually upload your license here."
"manualBillingTokenUploadDesc": {
"message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
},
"syncLicense": {
"message": "Sync license"
"message": "Sync License"
},
"licenseSyncSuccess": {
"message": "Successfully synced license"
Expand Down

0 comments on commit 1367765

Please sign in to comment.