From af6d31572cd7f9247e0bd5feb1dcd58f6718661a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <audrey@audreyality.com>
Date: Tue, 28 Jan 2025 11:00:42 -0500
Subject: [PATCH 1/3] fix translation keys

---
 apps/browser/src/_locales/en/messages.json    | 20 ++-----------------
 apps/desktop/src/locales/en/messages.json     |  4 ++--
 .../password-generator.component.html         |  2 +-
 apps/web/src/locales/en/messages.json         |  6 +++---
 .../src/password-settings.component.html      |  2 +-
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 666dea3f5b8..71864541cf2 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -466,22 +466,6 @@
   "length": {
     "message": "Length"
   },
-  "uppercase": {
-    "message": "Uppercase (A-Z)",
-    "description": "deprecated. Use uppercaseLabel instead."
-  },
-  "lowercase": {
-    "message": "Lowercase (a-z)",
-    "description": "deprecated. Use lowercaseLabel instead."
-  },
-  "numbers": {
-    "message": "Numbers (0-9)",
-    "description": "deprecated. Use numbersLabel instead."
-  },
-  "specialCharacters": {
-    "message": "Special characters (!@#$%^&*)",
-    "description": "deprecated. Use specialCharactersLabel instead."
-  },
   "include": {
     "message": "Include",
     "description": "Card header for password generator include block"
@@ -514,8 +498,8 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabel": {
-    "message": "!@#$%^&*",
+  "specialCharactersLabelV2": {
+    "message": "!@#$$%^&*",
     "description": "Label for the password generator special characters checkbox"
   },
   "numWords": {
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 4f18a88d994..d2b728b0e88 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -543,8 +543,8 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabel": {
-    "message": "!@#$%^&*",
+  "specialCharactersLabelV2": {
+    "message": "!@#$$%^&*",
     "description": "Label for the password generator special characters checkbox"
   },
   "numWords": {
diff --git a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
index fcf03d27acc..87d186f9d98 100644
--- a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
@@ -68,7 +68,7 @@ <h3 bitTypography="h3" class="tw-mt-4">{{ "password" | i18n }}</h3>
     </bit-form-control>
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="useSpecial" id="useSpecial" />
-      <bit-label>{{ "specialCharactersLabel" | i18n }}</bit-label>
+      <bit-label>{{ "specialCharactersLabelV2" | i18n }}</bit-label>
     </bit-form-control>
   </div>
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 9e5b25a4abf..5e2043a6639 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -1792,7 +1792,7 @@
   },
   "requestPending": {
     "message": "Request pending"
-  },  
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -9973,8 +9973,8 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabel": {
-    "message": "!@#$%^&*",
+  "specialCharactersLabelV2": {
+    "message": "!@#$$%^&*",
     "description": "Label for the password generator special characters checkbox"
   },
   "addAttachment": {
diff --git a/libs/tools/generator/components/src/password-settings.component.html b/libs/tools/generator/components/src/password-settings.component.html
index 5e4d1079725..8960c418bf5 100644
--- a/libs/tools/generator/components/src/password-settings.component.html
+++ b/libs/tools/generator/components/src/password-settings.component.html
@@ -61,7 +61,7 @@ <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
               formControlName="special"
               (change)="save('special')"
             />
-            <bit-label>{{ "specialCharactersLabel" | i18n }}</bit-label>
+            <bit-label>{{ "specialCharactersLabelV2" | i18n }}</bit-label>
           </bit-form-control>
         </div>
         <div class="tw-flex">

From 9362cc915387fa183567dbc941c5c2f75be6928a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <audrey@audreyality.com>
Date: Tue, 28 Jan 2025 11:14:33 -0500
Subject: [PATCH 2/3] replace translation with hard-coded text for web
 compatibility

---
 apps/browser/src/_locales/en/messages.json                    | 4 ----
 apps/desktop/src/locales/en/messages.json                     | 4 ----
 .../organizations/policies/password-generator.component.html  | 2 +-
 apps/web/src/locales/en/messages.json                         | 4 ----
 .../generator/components/src/password-settings.component.html | 2 +-
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 71864541cf2..75ff53ebc03 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -498,10 +498,6 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabelV2": {
-    "message": "!@#$$%^&*",
-    "description": "Label for the password generator special characters checkbox"
-  },
   "numWords": {
     "message": "Number of words"
   },
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index d2b728b0e88..6a3c8f75d61 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -543,10 +543,6 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabelV2": {
-    "message": "!@#$$%^&*",
-    "description": "Label for the password generator special characters checkbox"
-  },
   "numWords": {
     "message": "Number of words"
   },
diff --git a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
index 87d186f9d98..bc0248e0db4 100644
--- a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
@@ -68,7 +68,7 @@ <h3 bitTypography="h3" class="tw-mt-4">{{ "password" | i18n }}</h3>
     </bit-form-control>
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="useSpecial" id="useSpecial" />
-      <bit-label>{{ "specialCharactersLabelV2" | i18n }}</bit-label>
+      <bit-label>{{ "!@#$%^&*" }}</bit-label>
     </bit-form-control>
   </div>
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 5e2043a6639..86e05d34385 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9973,10 +9973,6 @@
     "message": "Include special characters",
     "description": "Full description for the password generator special characters checkbox"
   },
-  "specialCharactersLabelV2": {
-    "message": "!@#$$%^&*",
-    "description": "Label for the password generator special characters checkbox"
-  },
   "addAttachment": {
     "message": "Add attachment"
   },
diff --git a/libs/tools/generator/components/src/password-settings.component.html b/libs/tools/generator/components/src/password-settings.component.html
index 8960c418bf5..8f6650d8770 100644
--- a/libs/tools/generator/components/src/password-settings.component.html
+++ b/libs/tools/generator/components/src/password-settings.component.html
@@ -61,7 +61,7 @@ <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
               formControlName="special"
               (change)="save('special')"
             />
-            <bit-label>{{ "specialCharactersLabelV2" | i18n }}</bit-label>
+            <bit-label>{{ "!@#$%^&*" }}</bit-label>
           </bit-form-control>
         </div>
         <div class="tw-flex">

From 28ab09ee168237c9464b38143d3277619ebe0827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <audrey@audreyality.com>
Date: Tue, 28 Jan 2025 11:22:26 -0500
Subject: [PATCH 3/3] document special character rendering

---
 .../organizations/policies/password-generator.component.html  | 4 ++++
 .../generator/components/src/password-settings.component.html | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
index bc0248e0db4..1300acee471 100644
--- a/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
@@ -68,6 +68,10 @@ <h3 bitTypography="h3" class="tw-mt-4">{{ "password" | i18n }}</h3>
     </bit-form-control>
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="useSpecial" id="useSpecial" />
+      <!-- hard-coded the special characters string because `$` indicates an i18n interpolation,
+           and is handled inconsistently across browsers. Angular template syntax is used to
+           ensure special characters are entity-encoded.
+        -->
       <bit-label>{{ "!@#$%^&*" }}</bit-label>
     </bit-form-control>
   </div>
diff --git a/libs/tools/generator/components/src/password-settings.component.html b/libs/tools/generator/components/src/password-settings.component.html
index 8f6650d8770..2145782df57 100644
--- a/libs/tools/generator/components/src/password-settings.component.html
+++ b/libs/tools/generator/components/src/password-settings.component.html
@@ -61,6 +61,10 @@ <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
               formControlName="special"
               (change)="save('special')"
             />
+            <!-- hard-coded the special characters string because `$` indicates an i18n interpolation,
+                and is handled inconsistently across browsers. Angular template syntax is used to
+                ensure special characters are entity-encoded.
+              -->
             <bit-label>{{ "!@#$%^&*" }}</bit-label>
           </bit-form-control>
         </div>