You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-04 11:51:45 +03:00 
			
		
		
		
	Fix broken i18n in Forgot & Change password (#7252)
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							11aa362eda
						
					
				
				
					commit
					5e77822bcc
				
			@@ -315,9 +315,9 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
 | 
				
			|||||||
                    />
 | 
					                    />
 | 
				
			||||||
                    <PassphraseConfirmField
 | 
					                    <PassphraseConfirmField
 | 
				
			||||||
                        name="reset_password_confirm"
 | 
					                        name="reset_password_confirm"
 | 
				
			||||||
                        label={_t('Confirm')}
 | 
					                        label={_td('Confirm')}
 | 
				
			||||||
                        labelRequired={_t("A new password must be entered.")}
 | 
					                        labelRequired={_td("A new password must be entered.")}
 | 
				
			||||||
                        labelInvalid={_t("New passwords must match each other.")}
 | 
					                        labelInvalid={_td("New passwords must match each other.")}
 | 
				
			||||||
                        value={this.state.password2}
 | 
					                        value={this.state.password2}
 | 
				
			||||||
                        password={this.state.password}
 | 
					                        password={this.state.password}
 | 
				
			||||||
                        fieldRef={field => this[ForgotPasswordField.PasswordConfirm] = field}
 | 
					                        fieldRef={field => this[ForgotPasswordField.PasswordConfirm] = field}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 | 
				
			|||||||
import AccessibleButton from '../elements/AccessibleButton';
 | 
					import AccessibleButton from '../elements/AccessibleButton';
 | 
				
			||||||
import Spinner from '../elements/Spinner';
 | 
					import Spinner from '../elements/Spinner';
 | 
				
			||||||
import withValidation, { IFieldState, IValidationResult } from '../elements/Validation';
 | 
					import withValidation, { IFieldState, IValidationResult } from '../elements/Validation';
 | 
				
			||||||
import { _t } from '../../../languageHandler';
 | 
					import { _t, _td } from '../../../languageHandler';
 | 
				
			||||||
import Modal from "../../../Modal";
 | 
					import Modal from "../../../Modal";
 | 
				
			||||||
import PassphraseField from "../auth/PassphraseField";
 | 
					import PassphraseField from "../auth/PassphraseField";
 | 
				
			||||||
import CountlyAnalytics from "../../../CountlyAnalytics";
 | 
					import CountlyAnalytics from "../../../CountlyAnalytics";
 | 
				
			||||||
@@ -376,7 +376,7 @@ export default class ChangePassword extends React.Component<IProps, IState> {
 | 
				
			|||||||
                            <PassphraseField
 | 
					                            <PassphraseField
 | 
				
			||||||
                                fieldRef={field => this[FIELD_NEW_PASSWORD] = field}
 | 
					                                fieldRef={field => this[FIELD_NEW_PASSWORD] = field}
 | 
				
			||||||
                                type="password"
 | 
					                                type="password"
 | 
				
			||||||
                                label='New Password'
 | 
					                                label={_td("New Password")}
 | 
				
			||||||
                                minScore={PASSWORD_MIN_SCORE}
 | 
					                                minScore={PASSWORD_MIN_SCORE}
 | 
				
			||||||
                                value={this.state.newPassword}
 | 
					                                value={this.state.newPassword}
 | 
				
			||||||
                                autoFocus={this.props.autoFocusNewPasswordInput}
 | 
					                                autoFocus={this.props.autoFocusNewPasswordInput}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1141,6 +1141,7 @@
 | 
				
			|||||||
    "Confirm password": "Confirm password",
 | 
					    "Confirm password": "Confirm password",
 | 
				
			||||||
    "Passwords don't match": "Passwords don't match",
 | 
					    "Passwords don't match": "Passwords don't match",
 | 
				
			||||||
    "Current password": "Current password",
 | 
					    "Current password": "Current password",
 | 
				
			||||||
 | 
					    "New Password": "New Password",
 | 
				
			||||||
    "Change Password": "Change Password",
 | 
					    "Change Password": "Change Password",
 | 
				
			||||||
    "Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
 | 
					    "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.",
 | 
					    "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.",
 | 
					    "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 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.",
 | 
					    "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.",
 | 
					    "A new password must be entered.": "A new password must be entered.",
 | 
				
			||||||
    "New passwords must match each other.": "New passwords must match each other.",
 | 
					    "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.",
 | 
					    "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.",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user