IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-60835] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/actions_menu/actions_menu.tsx' with FormattedMessage (#28622)

Browse Source
This commit is contained in:
Zubair Imtiaz 2024-10-11 16:57:46 +05:00 committed by GitHub
parent 80855cfc02
commit 7983521dc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webapp/channels/src/components/actions_menu/__snapshots__/actions_menu.test.tsx.snap
View File

@ -169,10 +169,18 @@ exports[`components/actions_menu/ActionsMenu no actions - sysadmin - menu should
<div <div
className="visit-marketplace-text" className="visit-marketplace-text"
> >
<FormattedMarkdownMessage <p>
defaultMessage="No Actions currently\\\\nconfigured for this server" <MemoizedFormattedMessage
id="post_info.actions.noActions" defaultMessage="No Actions currently"
/> id="post_info.actions.noActions.first_line"
/>
</p>
<p>
<MemoizedFormattedMessage
defaultMessage="configured for this server"
id="post_info.actions.noActions.second_line"
/>
</p>
</div> </div>
<div <div
className="visit-marketplace" className="visit-marketplace"
@ -188,7 +196,7 @@ exports[`components/actions_menu/ActionsMenu no actions - sysadmin - menu should
<span <span
className="visit-marketplace-button-text" className="visit-marketplace-button-text"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Visit the Marketplace" defaultMessage="Visit the Marketplace"
id="post_info.actions.visitMarketplace" id="post_info.actions.visitMarketplace"
/> />

19
webapp/channels/src/components/actions_menu/actions_menu.tsx
View File

@ -13,7 +13,6 @@ import {AppCallResponseTypes} from 'mattermost-redux/constants/apps';
import Permissions from 'mattermost-redux/constants/permissions'; import Permissions from 'mattermost-redux/constants/permissions';
import type {ActionResult} from 'mattermost-redux/types/actions'; import type {ActionResult} from 'mattermost-redux/types/actions';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import SystemPermissionGate from 'components/permissions_gates/system_permission_gate'; import SystemPermissionGate from 'components/permissions_gates/system_permission_gate';
import type {OpenedFromType} from 'components/plugin_marketplace/marketplace_modal'; import type {OpenedFromType} from 'components/plugin_marketplace/marketplace_modal';
import MarketplaceModal from 'components/plugin_marketplace/marketplace_modal'; import MarketplaceModal from 'components/plugin_marketplace/marketplace_modal';
@ -200,10 +199,18 @@ export class ActionMenuClass extends React.PureComponent<Props, State> {
key='visit-marketplace-permissions' key='visit-marketplace-permissions'
> >
<div className='visit-marketplace-text' > <div className='visit-marketplace-text' >
<FormattedMarkdownMessage <p>
id='post_info.actions.noActions' <FormattedMessage
defaultMessage='No Actions currently\nconfigured for this server' id='post_info.actions.noActions.first_line'
/> defaultMessage='No Actions currently'
/>
</p>
<p>
<FormattedMessage
id='post_info.actions.noActions.second_line'
defaultMessage='configured for this server'
/>
</p>
</div> </div>
<div className='visit-marketplace' > <div className='visit-marketplace' >
<button <button
@ -213,7 +220,7 @@ export class ActionMenuClass extends React.PureComponent<Props, State> {
> >
<ActionsMenuIcon name='icon-view-grid-plus-outline visit-marketplace-button-icon'/> <ActionsMenuIcon name='icon-view-grid-plus-outline visit-marketplace-button-icon'/>
<span className='visit-marketplace-button-text'> <span className='visit-marketplace-button-text'>
<FormattedMarkdownMessage <FormattedMessage
id='post_info.actions.visitMarketplace' id='post_info.actions.visitMarketplace'
defaultMessage='Visit the Marketplace' defaultMessage='Visit the Marketplace'
/> />

3
webapp/channels/src/i18n/en.json
View File

@ -4561,7 +4561,8 @@
"post_delete.okay": "Okay", "post_delete.okay": "Okay",
"post_delete.someone": "Someone deleted the message on which you tried to post a comment.", "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
"post_header.update_status": "Update your status", "post_header.update_status": "Update your status",
"post_info.actions.noActions": "No Actions currently\nconfigured for this server", "post_info.actions.noActions.first_line": "No Actions currently",
"post_info.actions.noActions.second_line": "configured for this server",
"post_info.actions.tooltip.actions": "Actions", "post_info.actions.tooltip.actions": "Actions",
"post_info.actions.tutorialTip": "Message actions that are provided\nthrough apps, integrations or plugins\n have moved to this menu item.", "post_info.actions.tutorialTip": "Message actions that are provided\nthrough apps, integrations or plugins\n have moved to this menu item.",
"post_info.actions.tutorialTip.title": "Actions for messages", "post_info.actions.tutorialTip.title": "Actions for messages",