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

[PM-11503] Organization Automatic Sync verbiage is misleading #11151

Merged
merged 12 commits into from
Oct 2, 2024
Merged

[PM-11503] Organization Automatic Sync verbiage is misleading #11151

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b5c92f
[PM-11503] Organization Automatic Sync verbiage is misleading
jonashendrickx Sep 19, 2024
572c1db
[PM-11503] Remove old translations
jonashendrickx Sep 19, 2024
96eef6d
[PM-11503] Forgot translation
jonashendrickx Sep 20, 2024
393db25
[PM-11503] Forgot translation
jonashendrickx Sep 20, 2024
de60607
f
jonashendrickx Sep 23, 2024
26885c9
f
jonashendrickx Sep 23, 2024
446c610
Update messages.json
jonashendrickx Sep 23, 2024
674b705
wip
jonashendrickx Sep 25, 2024
213f9d3
Merge remote-tracking branch 'origin/PM-11503-Defect-Organization-Aut…
jonashendrickx Sep 25, 2024
b5f7e3f
wip
jonashendrickx Sep 27, 2024
47bd111
wip
jonashendrickx Sep 27, 2024
891e2a3
cloud completed
jonashendrickx Sep 30, 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 apps/web/src/app/billing/organizations/billing-sync-key.component.html
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
View file
Open in desktop
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 }}
djsmith85 marked this conversation as resolved.
Show resolved Hide resolved
</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 }}
djsmith85 marked this conversation as resolved.
Show resolved Hide resolved
</bit-hint>
</bit-radio-button>
<ng-container *ngIf="updateMethod === licenseOptions.UPLOAD">
Expand Down
13 changes: 5 additions & 8 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 @@ -5981,8 +5981,8 @@
"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 @@ -6041,15 +6041,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"
},
"billingTokenSyncDesc": {
"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."
},
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ This has no changes to the removed billingSyncDesc

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Also still an issue

Copy link
Contributor

Choose a reason for hiding this comment

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

This message key is defined, but not used anywhere.

❓ Is it possible that billingSyncDescwas supposed to be replaced with billingTokenSyncDesc, but you then introduced automaticBillingSyncDescas the final replacement? If my assumption is correct, then please remove billingTokenSyncDescfrom en/messages.json

"active": {
"message": "Active"
},
Expand Down Expand Up @@ -7438,9 +7438,6 @@
"manualUpload": {
"message": "Manual upload"
},
"manualUploadDesc": {
"message": "If you do not want to opt into billing sync, manually upload your license here."
},
"syncLicense": {
"message": "Sync license"
},
Expand Down
Loading