diff --git a/app/icons/bell-filled.svg b/app/icons/bell-filled.svg new file mode 100644 index 0000000000..5f040218e0 --- /dev/null +++ b/app/icons/bell-filled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/soapbox/components/link.tsx b/app/soapbox/components/link.tsx new file mode 100644 index 0000000000..7455547e6b --- /dev/null +++ b/app/soapbox/components/link.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { Link as Comp, LinkProps } from 'react-router-dom'; + +const Link = (props: LinkProps) => ( + +); + +export default Link; \ No newline at end of file diff --git a/app/soapbox/features/chats/components/chat-list-item.tsx b/app/soapbox/features/chats/components/chat-list-item.tsx index bbe7c469da..1864cef8b4 100644 --- a/app/soapbox/features/chats/components/chat-list-item.tsx +++ b/app/soapbox/features/chats/components/chat-list-item.tsx @@ -121,7 +121,7 @@ const ChatListItem: React.FC = ({ chat, chatSilence, onC {chatSilence ? ( - + ) : null} {chat.last_message && ( diff --git a/app/soapbox/features/chats/components/chat-message-list-intro.tsx b/app/soapbox/features/chats/components/chat-message-list-intro.tsx index 790bd51887..d977a24dc5 100644 --- a/app/soapbox/features/chats/components/chat-message-list-intro.tsx +++ b/app/soapbox/features/chats/components/chat-message-list-intro.tsx @@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { initReport } from 'soapbox/actions/reports'; +import Link from 'soapbox/components/link'; import { Avatar, Button, HStack, Icon, Stack, Text } from 'soapbox/components/ui'; import { useChatContext } from 'soapbox/contexts/chat-context'; import { useAppDispatch } from 'soapbox/hooks'; @@ -60,7 +61,10 @@ const ChatMessageListIntro = () => { } > - + + + + {needsAcceptance ? ( <> @@ -69,7 +73,9 @@ const ChatMessageListIntro = () => { {intl.formatMessage(messages.intro)} > ) : ( - @{chat.account.acct} + + @{chat.account.acct} + )} diff --git a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx index 87d37e6bd0..064ffe61e0 100644 --- a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx @@ -3,7 +3,6 @@ import { defineMessages, useIntl } from 'react-intl'; import { blockAccount } from 'soapbox/actions/accounts'; import { openModal } from 'soapbox/actions/modals'; -import { initReport } from 'soapbox/actions/reports'; import List, { ListItem } from 'soapbox/components/list'; import { Avatar, Divider, HStack, Icon, IconButton, Menu, MenuButton, MenuItem, MenuList, Stack, Text, Toggle } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification_badge'; @@ -56,8 +55,6 @@ const ChatPageMain = () => { })); }; - const handleReportChat = () => dispatch(initReport(chat?.account as any)); - useEffect(() => { if (chat?.id) { fetchChatSilence(); @@ -147,17 +144,6 @@ const ChatPageMain = () => { - - - - {intl.formatMessage(messages.reportUser, { acct: chat.account.acct })} - - - { })); }; - const handleReportChat = () => dispatch(initReport(chat?.account as any)); - useEffect(() => { if (chat?.id) { fetchChatSilence(); @@ -120,11 +116,6 @@ const ChatSettings = () => { {intl.formatMessage(messages.blockUser, { acct: chat.account.acct })} - - - {intl.formatMessage(messages.reportUser, { acct: chat.account.acct })} - - {intl.formatMessage(messages.leaveChat)} diff --git a/app/soapbox/features/chats/components/chat-window.tsx b/app/soapbox/features/chats/components/chat-window.tsx index 0b51016d0b..63124c0496 100644 --- a/app/soapbox/features/chats/components/chat-window.tsx +++ b/app/soapbox/features/chats/components/chat-window.tsx @@ -1,4 +1,5 @@ import React, { useRef } from 'react'; +import { Link } from 'react-router-dom'; import { Avatar, HStack, Icon, Stack, Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification_badge'; @@ -8,6 +9,18 @@ import Chat from './chat'; import ChatPaneHeader from './chat-pane-header'; import ChatSettings from './chat-settings'; +const LinkWrapper = ({ enabled, to, children }: { enabled: boolean, to: string, children: React.ReactNode }): JSX.Element => { + if (!enabled) { + return <>{children}>; + } + + return ( + + {children} + + ); +}; + /** Floating desktop chat window. */ const ChatWindow = () => { const { chat, setChat, isOpen, isEditing, needsAcceptance, setEditing, setSearching, toggleChatPane } = useChatContext(); @@ -54,16 +67,20 @@ const ChatWindow = () => { {isOpen && ( - + + + )} - - - {chat.account.display_name} - {chat.account.verified && } - - @{chat.account.acct} - + + + + {chat.account.display_name} + {chat.account.verified && } + + @{chat.account.acct} + + } diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index e889484a22..fdd4443ae6 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx @@ -5,8 +5,9 @@ import { blockAccount } from 'soapbox/actions/accounts'; import { submitReport, submitReportSuccess, submitReportFail } from 'soapbox/actions/reports'; import { expandAccountTimeline } from 'soapbox/actions/timelines'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; +import List, { ListItem } from 'soapbox/components/list'; import StatusContent from 'soapbox/components/status_content'; -import { Avatar, HStack, Modal, ProgressBar, Stack, Text } from 'soapbox/components/ui'; +import { Avatar, HStack, Icon, Modal, ProgressBar, Stack, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAccount, useAppDispatch, useAppSelector } from 'soapbox/hooks'; @@ -23,6 +24,8 @@ const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' }, submit: { id: 'report.submit', defaultMessage: 'Submit' }, + reportContext: { id: 'report.chatMessage.context', defaultMessage: 'When reporting a user’s message, the ten messages before and after the one selected will be passed along to our moderation team for context.' }, + reportMessage: { id: 'report.chatMessage.title', defaultMessage: 'Report message' }, }); enum Steps { @@ -154,15 +157,25 @@ const ReportModal = ({ onClose }: IReportModal) => { const renderSelectedChatMessage = () => { if (account) { return ( - - - - + + + + + - - - - + + + + + + + } + > + {intl.formatMessage(messages.reportContext)} + + + ); } }; @@ -176,6 +189,15 @@ const ReportModal = ({ onClose }: IReportModal) => { } }; + const renderTitle = () => { + switch (reportedEntity) { + case ReportedEntities.ChatMessage: + return intl.formatMessage(messages.reportMessage); + default: + return @{account?.acct} }} />; + } + }; + const confirmationText = useMemo(() => { switch (currentStep) { case Steps.TWO: @@ -222,7 +244,7 @@ const ReportModal = ({ onClose }: IReportModal) => { return ( @{account.acct} }} />} + title={renderTitle()} onClose={onClose} cancelAction={currentStep === Steps.THREE ? undefined : onClose} confirmationAction={handleNextStep} diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index 72c2f2602e..f89f283fb7 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index 39ae33fad4..41ad6ad427 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 16f2104298..ba252431b5 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index dac5a302ef..fd63084929 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 58df0359d4..f35a5152a3 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index d6b0798cce..c855a0dce9 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index 4cd7a9d3f6..4b4ca9e5d0 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index 1f694d2c43..850f88de41 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index 934d80ec70..c69988b43a 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 2658306258..adfa2b8cf4 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -172,7 +172,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 0c2aa91f9d..3f06dbe635 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index 1c25879936..d6bf81ffec 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index 444f44db68..adad01e5e1 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 51366e59a1..d657c6d59f 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index 1924cc9463..33599faf67 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index 9d7d986bfd..f41d1a47fd 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index ed3c94a0c7..17b1736a66 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 2c3a10b5a2..1bc5e9602d 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index 878c9ed4de..e8a09c345d 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index d58f3e67f5..296344585c 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index cc2b172237..2342272fa8 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index e37b56cc5a..8c5448eef7 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index be9a93a202..ae117fc348 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index 038f1f73f0..cd7b80eea5 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index ee9934b0a6..65c652595e 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 008aac6b30..141120e964 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 2cccff88a1..07533d25a6 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index 2783fd6332..d6c509a327 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index b1214239a1..75d5676e60 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index 5f81467beb..d543bf31f2 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index 9a19d98fe4..39bc9552c5 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index afef192f93..4e529a51c1 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index c9b2646dc8..ce094521da 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index 1c6a5b3656..f91e74bc96 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index d471b072eb..a7a7868605 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index cc89ec7283..46b242e86d 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index 04a15623dd..d198ded0df 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index 0fd9a41c54..02b8edda64 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 62f814bfa9..d3bdbcb698 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index 66995e7258..2300a8bc55 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index 47f1ee8d91..9e17a7e983 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index a1f9977e11..5d07cea5bd 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index 181f419f7c..a084de40a0 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index a3b4aef838..aab95c7b80 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index 5a2b9cc766..cdbc6ec601 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index 5d5f52c5ef..f651182f54 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index 413bd40065..f57c250ad0 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index 07e8ab609b..85c3eaa6b9 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index fd5f3d65c3..46e9544c2d 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index db4f5d543f..faa07d8ae0 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Чат", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index 8f40ae1941..d81607b611 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index da21ab8ecf..488a3259c5 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -170,7 +170,7 @@ "chat_panels.main_window.title": "Chats", "chats.actions.delete": "Delete for both", "chats.actions.more": "More", - "chats.actions.report": "Report user", + "chats.actions.report": "Report", "chats.attachment": "Attachment", "chats.attachment_image": "Image", "chats.audio_toggle_off": "Audio notification off",