PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Normalized shortcut formatting for quote expansion control (#7995)

Browse source
This commit is contained in:
Sinharitik589 2022-03-09 15:22:31 +05:30 committed by GitHub
parent 930120823f
commit 4592f9f7f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/messages/MessageActionBar.tsx
View file

@ -43,6 +43,8 @@ import ReactionPicker from "../emojipicker/ReactionPicker";
import { CardContext } from '../right_panel/BaseCard'; import { CardContext } from '../right_panel/BaseCard';
import { showThread } from "../../../dispatcher/dispatch-actions/threads"; import { showThread } from "../../../dispatcher/dispatch-actions/threads";
import { shouldDisplayReply } from '../../../utils/Reply'; import { shouldDisplayReply } from '../../../utils/Reply';
import { Key } from "../../../Keyboard";
import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
interface IOptionsButtonProps { interface IOptionsButtonProps {
mxEvent: MatrixEvent; mxEvent: MatrixEvent;
@ -382,9 +384,18 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded, 'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded,
'mx_MessageActionBar_collapseMessageButton': this.props.isQuoteExpanded, 'mx_MessageActionBar_collapseMessageButton': this.props.isQuoteExpanded,
}); });
const tooltip = <div>
<div className="mx_Tooltip_title">
{ this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes") }
</div>
<div className="mx_Tooltip_sub">
{ _t(ALTERNATE_KEY_NAME[Key.SHIFT]) + " + " + _t("Click") }
</div>
</div>;
toolbarOpts.push(<RovingAccessibleTooltipButton toolbarOpts.push(<RovingAccessibleTooltipButton
className={expandClassName} className={expandClassName}
title={this.props.isQuoteExpanded ? _t("Collapse quotes │ ⇧+click") : _t("Expand quotes │ ⇧+click")} title={this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes")}
tooltip={tooltip}
onClick={this.props.toggleThreadExpanded} onClick={this.props.toggleThreadExpanded}
key="expand" key="expand"
/>); />);

5
src/i18n/strings/en_EN.json
View file

@ -2104,8 +2104,9 @@
"Edit": "Edit", "Edit": "Edit",
"Reply in thread": "Reply in thread", "Reply in thread": "Reply in thread",
"Reply": "Reply", "Reply": "Reply",
"Collapse quotes │ ⇧+click": "Collapse quotes │ ⇧+click", "Collapse quotes": "Collapse quotes",
"Expand quotes │ ⇧+click": "Expand quotes │ ⇧+click", "Expand quotes": "Expand quotes",
"Click": "Click",
"Download %(text)s": "Download %(text)s", "Download %(text)s": "Download %(text)s",
"Error decrypting attachment": "Error decrypting attachment", "Error decrypting attachment": "Error decrypting attachment",
"Decrypt %(text)s": "Decrypt %(text)s", "Decrypt %(text)s": "Decrypt %(text)s",