Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
pr fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Germain Souquet committed Jun 1, 2022
1 parent d305b97 commit 17e1f4a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
3 changes: 2 additions & 1 deletion res/css/views/rooms/_MessageComposer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ limitations under the License.
grid-area: controls;
display: flex;
align-items: flex-end;
margin-bottom: 2px;
}

>[role=button] {
Expand Down Expand Up @@ -238,7 +239,7 @@ limitations under the License.
padding-left: var(--size);
border-radius: 50%;
margin-right: 6px;
margin-bottom: 5px;
margin-bottom: 7px;

&:last-child {
margin-right: auto;
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/elements/AccessibleButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type AccessibleButtonKind = | 'primary'
* onClick: (required) Event handler for button activation. Should be
* implemented exactly like a normal onClick handler.
*/
export interface IProps extends React.InputHTMLAttributes<Element> {
interface IProps extends React.InputHTMLAttributes<Element> {
inputRef?: React.Ref<Element>;
element?: keyof ReactHTML;
// The kind of button, similar to how Bootstrap works.
Expand Down
10 changes: 5 additions & 5 deletions src/components/views/messages/DisambiguatedProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ export default class DisambiguatedProfile extends React.Component<IProps> {
return React.createElement(this.props.as, {
className: "mx_DisambiguatedProfile",
onClick,
}, [
<span className={displayNameClasses} dir="auto" key="displayNameClasses">
}, <>
<span className={displayNameClasses} dir="auto">
{ rawDisplayName }
</span>,
mxidElement,
]);
</span>
{ mxidElement }
</>);
}
}
6 changes: 4 additions & 2 deletions src/components/views/rooms/ReplyPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ export default class ReplyPreview extends React.Component<IProps> {
return <div className="mx_ReplyPreview">
<div className="mx_ReplyPreview_header">
<ReplyIcon />
{ _t('Reply to') } &nbsp;
<SenderProfile mxEvent={this.props.replyToEvent} as="span" />
{ _t('Reply to <tag/>', {}, {

This comment has been minimized.

Copy link
@t3chguy

t3chguy Jun 1, 2022

Member

Could this be more descriptive to help translators, e.g Reply to <User/>

'tag': () => <SenderProfile mxEvent={this.props.replyToEvent} as="span" />,
}) } &nbsp;

<CancelButton onClick={() => cancelQuoting(this.context.timelineRenderingType)} />
</div>
<ReplyTile
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 @@ -1770,7 +1770,7 @@
"Seen by %(count)s people|one": "Seen by %(count)s person",
"Read receipts": "Read receipts",
"Recently viewed": "Recently viewed",
"Reply to": "Reply to",
"Reply to <tag/>": "Reply to <tag/>",
"Room %(name)s": "Room %(name)s",
"Recently visited rooms": "Recently visited rooms",
"No recently visited rooms": "No recently visited rooms",
Expand Down

0 comments on commit 17e1f4a

Please sign in to comment.