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-60819] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/integrations/bots/bots.tsx' with FormattedMessage (#28577)

Browse Source 
* Change: Replace FormattedMarkdownMessage with FormattedMessage in bots.tsx
Change: Update en.json
Change: Update BackstageList component

* Change: Replace <a> tag with react-router-dom Link component

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ivy Gesare 2024-10-11 12:21:05 +03:00 committed by GitHub
parent bd1743192d
commit e8ebbcc980
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/channels/src/components/backstage/components/backstage_list.tsx
View File

@ -95,7 +95,7 @@ const BackstageList = ({searchPlaceholder = localizeMessage({id: 'backstage_list
id='emptySearchResultsMessage'
key='emptyTextSearch'
>
{React.cloneElement(remainingProps.emptyTextSearch, {values: {searchTerm: filterLowered}})}
{React.cloneElement(remainingProps.emptyTextSearch, {values: {...remainingProps.emptyTextSearch.props.values, searchTerm: filterLowered}})}
</div>
)];
}

20
webapp/channels/src/components/integrations/bots/bots.tsx
View File

@ -3,6 +3,7 @@
import React from 'react';
import {FormattedMessage} from 'react-intl';
import {Link} from 'react-router-dom';
import type {Bot as BotType} from '@mattermost/types/bots';
import type {Team} from '@mattermost/types/teams';
@ -13,10 +14,8 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
import BackstageList from 'components/backstage/components/backstage_list';
import ExternalLink from 'components/external_link';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import Constants from 'utils/constants';
import {getSiteURL} from 'utils/url';
import * as Utils from 'utils/utils';
import Bot, {matchesFilter} from './bot';
@ -236,9 +235,12 @@ export default class Bots extends React.PureComponent<Props, State> {
/>
}
emptyTextSearch={
<FormattedMarkdownMessage
id='bots.manage.emptySearch'
defaultMessage='No bot accounts match **{searchTerm}**'
<FormattedMessage
id='bots.emptySearch'
defaultMessage='No bot accounts match <b>{searchTerm}</b>'
values={{
b: (chunks: string) => <b>{chunks}</b>,
}}
/>
}
helpText={
@ -260,11 +262,11 @@ export default class Bots extends React.PureComponent<Props, State> {
),
}}
/>
<FormattedMarkdownMessage
id='bots.manage.help2'
defaultMessage={'Enable bot account creation in the [System Console]({siteURL}/admin_console/integrations/bot_accounts).'}
<FormattedMessage
id='bots.help2'
defaultMessage={'Enable bot account creation in the <a>System Console</a>.'}
values={{
siteURL: getSiteURL(),
a: (chunks: string) => <Link to='/admin_console/integrations/bot_accounts'>{chunks}</Link>,
}}
/>
</React.Fragment>

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

@ -3080,6 +3080,8 @@
"bots.add.icon": "Bot Icon",
"bots.add.username": "Username",
"bots.disabled": "Disabled",
"bots.emptySearch": "No bot accounts match <b>{searchTerm}</b>",
"bots.help2": "Enable bot account creation in the <a>System Console</a>.",
"bots.image.upload": "Upload Image",
"bots.manage.add": "Add Bot Account",
"bots.manage.add.add": "Add",
@ -3095,10 +3097,8 @@
"bots.manage.edit.editing": "Updating...",
"bots.manage.edit.title": "Update",
"bots.manage.empty": "No bot accounts found",
"bots.manage.emptySearch": "No bot accounts match **{searchTerm}**",
"bots.manage.header": "Bot Accounts",
"bots.manage.help1": "Use {botAccounts} to integrate with Mattermost through plugins or the API. Bot accounts are available to everyone on your server. ",
"bots.manage.help2": "Enable bot account creation in the [System Console]({siteURL}/admin_console/integrations/bot_accounts).",
"bots.manage.search": "Search Bot Accounts",
"bots.managed_by": "Managed by ",
"bots.token.confirm": "Delete",