[EC-280] Update policies page content (#3059)

* Changed policies dialog “enabled” checkboxes title to “Turn on” * Changed policies “Enabled” badge text to “On” * Moved master password reset policy up to 3rd row * Changed the wording on the Single-Sign-On page * Updated policies page content * Master-password component now uses new title text * Two-factor-auth component now uses new title text * Updated personal-ownership model checkbox text * Updated texts for send options policy * Updated the single-sign-on policy description
2024-12-27 10:23:48 +01:00 · 2022-07-11 11:24:02 +01:00 · 2022-07-11 11:24:02 +01:00 · ab8af657c6
commit ab8af657c6
parent 9347b13a76
16 changed files with 56 additions and 46 deletions
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@ -197,13 +197,13 @@ export class AppComponent implements OnDestroy, OnInit {
    this.policyListService.addPolicies([
      new TwoFactorAuthenticationPolicy(),
      new MasterPasswordPolicy(),
+      new ResetPasswordPolicy(),
      new PasswordGeneratorPolicy(),
      new SingleOrgPolicy(),
      new RequireSsoPolicy(),
      new PersonalOwnershipPolicy(),
      new DisableSendPolicy(),
      new SendOptionsPolicy(),
-      new ResetPasswordPolicy(),
    ]);

    this.setFullWidth();
--- a/apps/web/src/app/organizations/manage/policies.component.html
+++ b/apps/web/src/app/organizations/manage/policies.component.html
@ -15,7 +15,7 @@
      <td *ngIf="p.display(organization)">
        <a href="#" appStopClick (click)="edit(p)">{{ p.name | i18n }}</a>
        <span bitBadge badgeType="success" *ngIf="policiesEnabledMap.get(p.type)">{{
-          "enabled" | i18n
+          "on" | i18n
        }}</span>
        <small class="text-muted d-block">{{ p.description | i18n }}</small>
      </td>
--- a/apps/web/src/app/organizations/policies/disable-send.component.html
+++ b/apps/web/src/app/organizations/policies/disable-send.component.html
@ -11,6 +11,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/apps/web/src/app/organizations/policies/master-password.component.html
+++ b/apps/web/src/app/organizations/policies/master-password.component.html
@ -12,7 +12,7 @@
        [formControl]="enabled"
        name="Enabled"
      />
-      <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+      <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
    </div>
  </div>

--- a/apps/web/src/app/organizations/policies/master-password.component.ts
+++ b/apps/web/src/app/organizations/policies/master-password.component.ts
@ -8,7 +8,7 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";

 export class MasterPasswordPolicy extends BasePolicy {
-  name = "masterPass";
+  name = "masterPassPolicyTitle";
  description = "masterPassPolicyDesc";
  type = PolicyType.MasterPassword;
  component = MasterPasswordPolicyComponent;
--- a/apps/web/src/app/organizations/policies/password-generator.component.html
+++ b/apps/web/src/app/organizations/policies/password-generator.component.html
@ -8,7 +8,7 @@
        [formControl]="enabled"
        name="Enabled"
      />
-      <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+      <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
    </div>
  </div>

--- a/apps/web/src/app/organizations/policies/personal-ownership.component.html
+++ b/apps/web/src/app/organizations/policies/personal-ownership.component.html
@ -11,8 +11,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{
-      "personalOwnershipCheckboxDesc" | i18n
-    }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/apps/web/src/app/organizations/policies/require-sso.component.html
+++ b/apps/web/src/app/organizations/policies/require-sso.component.html
@ -14,6 +14,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/apps/web/src/app/organizations/policies/reset-password.component.html
+++ b/apps/web/src/app/organizations/policies/reset-password.component.html
@ -15,7 +15,7 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>

--- a/apps/web/src/app/organizations/policies/send-options.component.html
+++ b/apps/web/src/app/organizations/policies/send-options.component.html
@ -11,7 +11,7 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>

--- a/apps/web/src/app/organizations/policies/single-org.component.html
+++ b/apps/web/src/app/organizations/policies/single-org.component.html
@ -11,6 +11,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/apps/web/src/app/organizations/policies/two-factor-authentication.component.html
+++ b/apps/web/src/app/organizations/policies/two-factor-authentication.component.html
@ -11,6 +11,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts
+++ b/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts
@ -5,7 +5,7 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";

 export class TwoFactorAuthenticationPolicy extends BasePolicy {
-  name = "twoStepLogin";
+  name = "twoStepLoginPolicyTitle";
  description = "twoStepLoginPolicyDesc";
  type = PolicyType.TwoFactorAuthentication;
  component = TwoFactorAuthenticationPolicyComponent;
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@ -891,7 +891,7 @@
    "message": "Your vault data has been exported."
  },
  "passwordGenerator": {
-    "message": "Password Generator"
+    "message": "Password generator"
  },
  "minComplexityScore": {
    "message": "Minimum Complexity Score"
@ -1223,7 +1223,7 @@
    "message": "Domains updated"
  },
  "twoStepLogin": {
-    "message": "Two-step Login"
+    "message": "Two-step login"
  },
  "twoStepLoginDesc": {
    "message": "Secure your account by requiring an additional step when logging in."
@ -3342,20 +3342,26 @@
  "clone": {
    "message": "Clone"
  },
+  "masterPassPolicyTitle": {
+    "message": "Master password requirements"
+  },
  "masterPassPolicyDesc": {
-    "message": "Set minimum requirements for master password strength."
+    "message": "Set requirements for master password strength."
+  },
+  "twoStepLoginPolicyTitle": {
+    "message": "Require two-step login"
  },
  "twoStepLoginPolicyDesc": {
-    "message": "Require users to set up two-step login on their personal accounts."
+    "message": "Require members to set up two-step login."
  },
  "twoStepLoginPolicyWarning": {
-    "message": "Organization members who are not Owners or Administrators and do not have two-step login enabled for their personal account will be removed from the organization and will receive an email notifying them about the change."
+    "message": "Organization members who are not Owners or Administrators and do not have two-step login turned on for their account will be removed from the organization and will receive an email notifying them about the change."
  },
  "twoStepLoginPolicyUserWarning": {
    "message": "You are a member of an organization that requires two-step login to be enabled on your user account. If you disable all two-step login providers you will be automatically removed from these organizations."
  },
  "passwordGeneratorPolicyDesc": {
-    "message": "Set minimum requirements for password generator configuration."
+    "message": "Set requirements for password generator."
  },
  "passwordGeneratorPolicyInEffect": {
    "message": "One or more organization policies are affecting your generator settings."
@ -3573,10 +3579,10 @@
    "message": "Link SSO"
  },
  "singleOrg": {
-    "message": "Single Organization"
+    "message": "Single organization"
  },
  "singleOrgDesc": {
-    "message": "Restrict users from being able to join any other organizations."
+    "message": "Restrict members from joining other organizations."
  },
  "singleOrgBlockCreateMessage": {
    "message": "Your current organization has a policy that does not allow you to join more than one organization. Please contact your organization admins or sign up from a different Bitwarden account."
@ -3585,16 +3591,16 @@
    "message": "Organization members who are not Owners or Administrators and are already a member of another organization will be removed from your organization."
  },
  "requireSso": {
-    "message": "Single Sign-On Authentication"
+    "message": "Require single sign-on authentication"
  },
  "requireSsoPolicyDesc": {
-    "message": "Require users to log in with the Enterprise Single Sign-On method."
+    "message": "Require members to log in with the Enterprise Single Sign-On method."
  },
  "prerequisite": {
    "message": "Prerequisite"
  },
  "requireSsoPolicyReq": {
-    "message": "The Single Organization enterprise policy must be enabled before activating this policy."
+    "message": "The Single Organization enterprise policy must be turned on before activating this policy."
  },
  "requireSsoPolicyReqError": {
    "message": "Single Organization policy not enabled."
@ -3889,10 +3895,10 @@
    }
  },
  "personalOwnership": {
-    "message": "Personal Ownership"
+    "message": "Remove individual vault"
  },
  "personalOwnershipPolicyDesc": {
-    "message": "Require users to save vault items to an organization by removing the personal ownership option."
+    "message": "Require members to save items to an organization by removing the individual vault option."
  },
  "personalOwnershipExemption": {
    "message": "Organization Owners and Administrators are exempt from this policy's enforcement."
@ -3901,10 +3907,10 @@
    "message": "Due to an enterprise policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections."
  },
  "disableSend": {
-    "message": "Disable Send"
+    "message": "Remove Send"
  },
  "disableSendPolicyDesc": {
-    "message": "Do not allow users to create or edit a Bitwarden Send. Deleting an existing Send is still allowed.",
+    "message": "Do not allow members to create or edit sends.",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "disableSendExemption": {
@ -3919,7 +3925,7 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendOptions": {
-    "message": "Send Options",
+    "message": "Send options",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendOptionsPolicyDesc": {
@ -3930,7 +3936,7 @@
    "message": "Organization users that can manage the organization's policies are exempt from this policy's enforcement."
  },
  "disableHideEmail": {
-    "message": "Do not allow users to hide their email address from recipients when creating or editing a Send.",
+    "message": "Always show member’s email address with recipients when creating or editing a send.",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendOptionsPolicyInEffect": {
@ -4226,10 +4232,10 @@
    "message": "Enrollment will allow organization administrators to change your master password"
  },
  "resetPasswordPolicy": {
-    "message": "Master Password Reset"
+    "message": "Master password reset"
  },
  "resetPasswordPolicyDescription": {
-    "message": "Allow administrators in the organization to reset organization users' master password."
+    "message": "Allow admins to reset master passwords for members."
  },
  "resetPasswordPolicyWarning": {
    "message": "Users in the organization will need to self-enroll or be auto-enrolled before administrators can reset their master password."
@ -4473,10 +4479,10 @@
    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
  },
  "maximumVaultTimeout": {
-    "message": "Vault Timeout"
+    "message": "Vault timeout"
  },
  "maximumVaultTimeoutDesc": {
-    "message": "Configure a maximum vault timeout for all users."
+    "message": "Set a maximum vault timeout for members."
  },
  "maximumVaultTimeoutLabel": {
    "message": "Maximum Vault Timeout"
@ -4516,10 +4522,10 @@
    "message": "Vault Timeout is not within allowed range."
  },
  "disablePersonalVaultExport": {
-    "message": "Disable Personal Vault Export"
+    "message": "Remove individual vault export"
  },
  "disablePersonalVaultExportDesc": {
-    "message": "Prohibits users from exporting their private vault data."
+    "message": "Do not allow members to export their individual vault data."
  },
  "vaultExportDisabled": {
    "message": "Vault Export Disabled"
@ -4810,19 +4816,19 @@
    "message": "Once set up, your configuration will be saved and members will be able to authenticate using their Identity Provider credentials."
  },
  "ssoPolicyHelpStart": {
-    "message": "Enable the",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
+    "message": "Use the",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
  },
  "ssoPolicyHelpLink": {
-    "message": "SSO Authentication policy",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
+    "message": "require single-sign-on authentication policy",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
  },
  "ssoPolicyHelpEnd": {
    "message": "to require all members to log in with SSO.",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
  },
  "ssoPolicyHelpKeyConnector": {
-    "message": "SSO Authentication and Single Organization policies are required to set up Key Connector decryption."
+    "message": "The require SSO authentication and single organization policies are required to set up Key Connector decryption."
  },
  "memberDecryptionOption": {
    "message": "Member Decryption Options"
@ -5198,5 +5204,11 @@
        "example": "4"
      }
    }
+  },
+  "turnOn": {
+    "message": "Turn on"
+  },
+  "on": {
+    "message": "On"
  }
 }
--- a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.html
+++ b/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.html
@ -7,6 +7,6 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>
--- a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.html
+++ b/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.html
@ -11,7 +11,7 @@
      [formControl]="enabled"
      name="Enabled"
    />
-    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+    <label class="form-check-label" for="enabled">{{ "turnOn" | i18n }}</label>
  </div>
 </div>