From 137baa3bffafaed7ca3cf14d86a0da9db7e162f7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Dec 2021 16:57:52 +0000
Subject: [PATCH 1/2] Fix broken i18n in Forgot & Change password

---
 src/components/structures/auth/ForgotPassword.tsx | 6 +++---
 src/components/views/settings/ChangePassword.tsx  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx
index f4d0f668614..bf9f8fdb709 100644
--- a/src/components/structures/auth/ForgotPassword.tsx
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -315,9 +315,9 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
                     />
                     <PassphraseConfirmField
                         name="reset_password_confirm"
-                        label={_t('Confirm')}
-                        labelRequired={_t("A new password must be entered.")}
-                        labelInvalid={_t("New passwords must match each other.")}
+                        label={_td('Confirm')}
+                        labelRequired={_td("A new password must be entered.")}
+                        labelInvalid={_td("New passwords must match each other.")}
                         value={this.state.password2}
                         password={this.state.password}
                         fieldRef={field => this[ForgotPasswordField.PasswordConfirm] = field}
diff --git a/src/components/views/settings/ChangePassword.tsx b/src/components/views/settings/ChangePassword.tsx
index f009d1121ea..b47ba5a7904 100644
--- a/src/components/views/settings/ChangePassword.tsx
+++ b/src/components/views/settings/ChangePassword.tsx
@@ -21,7 +21,7 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
 import Spinner from '../elements/Spinner';
 import withValidation, { IFieldState, IValidationResult } from '../elements/Validation';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import Modal from "../../../Modal";
 import PassphraseField from "../auth/PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
@@ -376,7 +376,7 @@ export default class ChangePassword extends React.Component<IProps, IState> {
                             <PassphraseField
                                 fieldRef={field => this[FIELD_NEW_PASSWORD] = field}
                                 type="password"
-                                label='New Password'
+                                label={_td("New Password")}
                                 minScore={PASSWORD_MIN_SCORE}
                                 value={this.state.newPassword}
                                 autoFocus={this.props.autoFocusNewPasswordInput}

From 9ef72c368e0866a6aa1440fcccdba84723c4852c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Dec 2021 17:27:42 +0000
Subject: [PATCH 2/2] i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a905bba6356..30d82dbe265 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1141,6 +1141,7 @@
     "Confirm password": "Confirm password",
     "Passwords don't match": "Passwords don't match",
     "Current password": "Current password",
+    "New Password": "New Password",
     "Change Password": "Change Password",
     "Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
     "Cross-signing is ready for use.": "Cross-signing is ready for use.",
@@ -3099,7 +3100,6 @@
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "The email address doesn't appear to be valid.": "The email address doesn't appear to be valid.",
-    "New Password": "New Password",
     "A new password must be entered.": "A new password must be entered.",
     "New passwords must match each other.": "New passwords must match each other.",
     "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",