chore: Rename share to forward message (#30208)

Co-authored-by: Douglas Fabris <devfabris@gmail.com>
pull/29721/head^2
Guilherme Jun Grillo 2 years ago committed by GitHub
parent d107acfc5c
commit b4cbbfc859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
  2. 0
      apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx
  3. 0
      apps/meteor/client/components/UserAndRoomAutoCompleteMultiple/index.ts
  4. 16
      apps/meteor/client/views/room/modals/ForwardMessageModal/ForwardMessageModal.tsx
  5. 1
      apps/meteor/client/views/room/modals/ForwardMessageModal/index.ts
  6. 1
      apps/meteor/client/views/room/modals/ShareMessageModal/index.ts
  7. 6
      apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json

@ -9,9 +9,9 @@ import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
import { dispatchToastMessage } from '../../../../client/lib/toast';
import { messageArgs } from '../../../../client/lib/utils/messageArgs';
import { router } from '../../../../client/providers/RouterProvider';
import ForwardMessageModal from '../../../../client/views/room/modals/ForwardMessageModal/ForwardMessageModal';
import ReactionList from '../../../../client/views/room/modals/ReactionListModal';
import ReportMessageModal from '../../../../client/views/room/modals/ReportMessageModal';
import ShareMessageModal from '../../../../client/views/room/modals/ShareMessageModal';
import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/client';
import { ChatRoom, Subscriptions } from '../../../models/client';
import { t } from '../../../utils/lib/i18n';
@ -66,16 +66,16 @@ Meteor.startup(async () => {
});
MessageAction.addButton({
id: 'share-message',
id: 'forward-message',
icon: 'arrow-forward',
label: 'Share_Message',
label: 'Forward_message',
context: ['message', 'message-mobile', 'threads'],
type: 'communication',
async action(_, props) {
const { message = messageArgs(this).msg } = props;
const permalink = await getPermaLink(message._id);
imperativeModal.open({
component: ShareMessageModal,
component: ForwardMessageModal,
props: {
message,
permalink,

@ -7,18 +7,18 @@ import type { ReactElement } from 'react';
import React, { memo } from 'react';
import { useForm, Controller } from 'react-hook-form';
import UserAndRoomAutoCompleteMultiple from '../../../../components/UserAndRoomAutoCompleteMultiple.tsx';
import UserAndRoomAutoCompleteMultiple from '../../../../components/UserAndRoomAutoCompleteMultiple';
import { QuoteAttachment } from '../../../../components/message/content/attachments/QuoteAttachment';
import { useUserDisplayName } from '../../../../hooks/useUserDisplayName';
import { prependReplies } from '../../../../lib/utils/prependReplies';
type ShareMessageProps = {
type ForwardMessageProps = {
onClose: () => void;
permalink: string;
message: IMessage;
};
const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps): ReactElement => {
const ForwardMessageModal = ({ onClose, permalink, message }: ForwardMessageProps): ReactElement => {
const t = useTranslation();
const getUserAvatarPath = useUserAvatarPath();
const dispatchToastMessage = useToastMessageDispatch();
@ -50,7 +50,7 @@ const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps):
);
},
onSuccess: () => {
dispatchToastMessage({ type: 'success', message: t('Message_has_been_shared') });
dispatchToastMessage({ type: 'success', message: t('Message_has_been_forwarded') });
},
onError: (error: any) => {
dispatchToastMessage({ type: 'error', message: error });
@ -83,7 +83,7 @@ const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps):
return (
<Modal>
<Modal.Header>
<Modal.Title>{t('Share_Message')}</Modal.Title>
<Modal.Title>{t('Forward_message')}</Modal.Title>
<Modal.Close onClick={onClose} title={t('Close')} />
</Modal.Header>
<Modal.Content>
@ -99,7 +99,7 @@ const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps):
)}
/>
</Field.Row>
{!rooms.length && <Field.Hint>{t('Select_atleast_one_channel_to_share_the_messsage')}</Field.Hint>}
{!rooms.length && <Field.Hint>{t('Select_atleast_one_channel_to_forward_the_messsage_to')}</Field.Hint>}
</Field>
<Field>
<QuoteAttachment attachment={attachment} />
@ -112,7 +112,7 @@ const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps):
{hasCopied ? t('Copied') : t('Copy_Link')}
</Button>
<Button disabled={!rooms.length || sendMessageMutation.isLoading} onClick={() => sendMessageMutation.mutate()} primary>
{t('Share')}
{t('Forward')}
</Button>
</ButtonGroup>
</Modal.Footer>
@ -120,4 +120,4 @@ const ShareMessageModal = ({ onClose, permalink, message }: ShareMessageProps):
);
};
export default memo(ShareMessageModal);
export default memo(ForwardMessageModal);

@ -0,0 +1 @@
export { default } from './ForwardMessageModal';

@ -1 +0,0 @@
export { default } from './ShareMessageModal';

@ -2352,6 +2352,7 @@
"Format": "Format",
"Forward": "Forward",
"Forward_chat": "Forward chat",
"Forward_message": "Forward message",
"Forward_to_department": "Forward to department",
"Forward_to_user": "Forward to user",
"Forwarding": "Forwarding",
@ -3384,8 +3385,8 @@
"Message_has_been_edited_at": "Message has been edited at {{date}}",
"Message_has_been_edited_by": "Message has been edited by {{username}}",
"Message_has_been_edited_by_at": "Message has been edited by {{username}} at {{date}}",
"Message_has_been_forwarded": "Message has been forwarded",
"Message_has_been_pinned": "Message has been pinned",
"Message_has_been_shared": "Message has been shared",
"Message_has_been_starred": "Message has been starred",
"Message_has_been_unpinned": "Message has been unpinned",
"Message_has_been_unstarred": "Message has been unstarred",
@ -4551,7 +4552,6 @@
"Select_an_option": "Select an option",
"Select_at_least_one_user": "Select at least one user",
"Select_at_least_two_users": "Select at least two users",
"Share_Message": "Share message",
"Select_department": "Select a department",
"Select_file": "Select file",
"Select_role": "Select a Role",
@ -4559,7 +4559,7 @@
"Select_tag": "Select a tag",
"Select_the_channels_you_want_the_user_to_be_removed_from": "Select the channels you want the user to be removed from",
"Select_the_teams_channels_you_would_like_to_delete": "Select the Team’s Channels you would like to delete, the ones you do not select will be moved to the Workspace.",
"Select_atleast_one_channel_to_share_the_messsage": "Select at least one channel to share the message",
"Select_atleast_one_channel_to_forward_the_messsage_to": "Select at least one channel to forward the message to",
"Select_user": "Select user",
"Select_users": "Select users",
"Selected_agents": "Selected agents",

Loading…
Cancel
Save