Skip to content

Commit

Permalink
Fix type error in SyntaxHighlight-test.tsx/ Login.tsx/ UserProfileSet…
Browse files Browse the repository at this point in the history
…tings.tsx and en_EN.json
  • Loading branch information
Junjiequan committed Jul 7, 2024
1 parent a334444 commit 06ce30c
Show file tree
Hide file tree
Showing 5 changed files with 923 additions and 1,867 deletions.
2 changes: 1 addition & 1 deletion src/components/structures/auth/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
{
this.props.isSyncing && (
<div className="mx_AuthBody_paddedFooter_subtitle">
{_t("If you've joined lots of rooms, this might take a while")}
{_t("joined_lots_of_room_warning")}
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions src/components/views/settings/UserProfileSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ const UserProfileSettings: React.FC = () => {
disableSaveButton={displayName === initialDisplayName}
saveButtonLabel={_t("common|save")}
cancelButtonLabel={_t("common|cancel")}
savingLabel={_t("common|saving")}
savedLabel={_t("common|saved")}
onChange={onDisplayNameChanged}
onCancel={onDisplayNameCancel}
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@
"sign_out_other_devices": "Sign out of all devices"
},
"reset_password_action": "Reset password",
"reset_password_button": "Forgot password?",
"reset_password_email_field_description": "Use an email address to recover your account",
"reset_password_email_field_required_invalid": "Enter email address (required on this homeserver)",
"reset_password_email_not_associated": "Your email address does not appear to be associated with a Matrix ID on this homeserver.",
Expand Down Expand Up @@ -1327,6 +1326,7 @@
"one": "<Items/> and one other",
"other": "<Items/> and %(count)s others"
},
"joined_lots_of_room_warning": "If you joined lots of rooms, this might take a while",
"keyboard": {
"activate_button": "Activate selected button",
"alt": "Alt",
Expand Down
2 changes: 1 addition & 1 deletion test/components/views/elements/SyntaxHighlight-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ describe("<SyntaxHighlight />", () => {
await waitFor(() => expect(container.querySelector(`.language-${lang}`)).toBeTruthy());

const [_lang, opts] = mock.mock.lastCall!;
expect((opts as HighlightOptions)["language"]).toBe(lang);
expect((opts as unknown as HighlightOptions)["language"]).toBe(lang);
});
});
Loading

0 comments on commit 06ce30c

Please sign in to comment.