diff --git a/external/lang b/external/lang index 2054052c791ff2396dcbde68ae257fa13a93ab6c..3931bf87e94264d92556a2f3ee96c6051be75b02 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 2054052c791ff2396dcbde68ae257fa13a93ab6c +Subproject commit 3931bf87e94264d92556a2f3ee96c6051be75b02 diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx index 50f605df8740e7cae4085ae5828cc5180fc3c536..6c5a2486d4c2fe8f57780308f01e32b9108251c0 100644 --- a/src/components/common/messaging/attachments/MessageReply.tsx +++ b/src/components/common/messaging/attachments/MessageReply.tsx @@ -6,7 +6,7 @@ import { Users } from "revolt.js/dist/api/objects"; import styled, { css } from "styled-components"; import { Text } from "preact-i18n"; -import { useEffect, useLayoutEffect, useState } from "preact/hooks"; +import { useLayoutEffect, useState } from "preact/hooks"; import { useRenderState } from "../../../../lib/renderer/Singleton"; @@ -157,7 +157,9 @@ export function MessageReply({ index, channel, id }: Props) { <ReplyBase head={index === 0}> <Reply size={16} /> {user?.relationship === Users.Relationship.Blocked ? ( - <>Blocked User</> + <> + <Text id="app.main.channel.misc.blocked_user" /> + </> ) : ( <> {message.author === SYSTEM_USER_ID ? ( diff --git a/src/pages/channels/messaging/MessageRenderer.tsx b/src/pages/channels/messaging/MessageRenderer.tsx index 483d0d8f643f248a594fb35423a6c0e6e8844dad..a84998772d99a73361f61219f35ece46d5c2c923 100644 --- a/src/pages/channels/messaging/MessageRenderer.tsx +++ b/src/pages/channels/messaging/MessageRenderer.tsx @@ -3,6 +3,7 @@ import { Users } from "revolt.js/dist/api/objects"; import styled from "styled-components"; import { decodeTime } from "ulid"; +import { Text } from "preact-i18n"; import { memo } from "preact/compat"; import { useContext, useEffect, useState } from "preact/hooks"; @@ -116,7 +117,11 @@ function MessageRenderer({ id, state, queue, highlight }: Props) { function pushBlocked() { render.push( <BlockedMessage> - <X size={16} /> {blocked} blocked messages + <X size={16} />{" "} + <Text + id="app.main.channel.misc.blocked_messages" + fields={{ count: blocked }} + /> </BlockedMessage>, ); blocked = 0; diff --git a/src/pages/settings/panes/Panes.module.scss b/src/pages/settings/panes/Panes.module.scss index 42957ac72a50be2ab5fd2da482d7bada795af1ee..0f1464c35c5a592852d8701980954ee4385f7260 100644 --- a/src/pages/settings/panes/Panes.module.scss +++ b/src/pages/settings/panes/Panes.module.scss @@ -354,9 +354,11 @@ display: flex; gap: 12px; flex-grow: 1; + + svg { + vertical-align: auto; + } } - - } .entry {