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-17590] fix chrome translation bug by escaping $ #13103

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −31
Open

[PM-17590] fix chrome translation bug by escaping $ #13103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af6d315
fix translation keys
audreyality Jan 28, 2025
9362cc9
replace translation with hard-coded text for web compatibility
audreyality Jan 28, 2025
28ab09e
document special character rendering
audreyality Jan 28, 2025
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
20 changes: 0 additions & 20 deletions apps/browser/src/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -514,10 +498,6 @@
"message": "Include special characters",
"description": "Full description for the password generator special characters checkbox"
},
"specialCharactersLabel": {
"message": "!@#$%^&*",
"description": "Label for the password generator special characters checkbox"
},
"numWords": {
"message": "Number of words"
},
Expand Down
4 changes: 0 additions & 4 deletions apps/desktop/src/locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,6 @@
"message": "Include special characters",
"description": "Full description for the password generator special characters checkbox"
},
"specialCharactersLabel": {
"message": "!@#$%^&*",
"description": "Label for the password generator special characters checkbox"
},
"numWords": {
"message": "Number of words"
},
Expand Down
6 changes: 5 additions & 1 deletion apps/web/src/app/admin-console/organizations/policies/password-generator.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ <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>
<!-- 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>

Expand Down
6 changes: 1 addition & 5 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 @@ -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."
},
Expand Down Expand Up @@ -9973,10 +9973,6 @@
"message": "Include special characters",
"description": "Full description for the password generator special characters checkbox"
},
"specialCharactersLabel": {
"message": "!@#$%^&*",
"description": "Label for the password generator special characters checkbox"
},
"addAttachment": {
"message": "Add attachment"
},
Expand Down
6 changes: 5 additions & 1 deletion libs/tools/generator/components/src/password-settings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
formControlName="special"
(change)="save('special')"
/>
<bit-label>{{ "specialCharactersLabel" | i18n }}</bit-label>
<!-- 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>
<div class="tw-flex">
Expand Down
Loading