[MM-60811] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx' with FormattedMessage (#28610)
* Fix: Replace FormattedMarkdownMessage in file * fix: update snapshot * Fix: wrap Formated message in b tag * Fix: wrap Formated message in b tag * Fix: Fix Linting in file * Fix: update snapshot --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
@@ -25,20 +25,24 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
|
|||||||
<div
|
<div
|
||||||
className="channel-name"
|
className="channel-name"
|
||||||
>
|
>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
defaultMessage="**Name**"
|
<MemoizedFormattedMessage
|
||||||
id="admin.channel_settings.channel_detail.channelName"
|
defaultMessage="Name"
|
||||||
/>
|
id="admin.channelSettings.channelDetail.channelName"
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br />
|
<br />
|
||||||
test
|
test
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="channel-team"
|
className="channel-team"
|
||||||
>
|
>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
defaultMessage="**Team**"
|
<MemoizedFormattedMessage
|
||||||
id="admin.channel_settings.channel_detail.channelTeam"
|
defaultMessage="Team"
|
||||||
/>
|
id="admin.channelSettings.channelDetail.channelTeam"
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br />
|
<br />
|
||||||
test
|
test
|
||||||
</div>
|
</div>
|
||||||
@@ -88,30 +92,36 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
|
|||||||
<div
|
<div
|
||||||
className="channel-name"
|
className="channel-name"
|
||||||
>
|
>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
defaultMessage="**Name**"
|
<MemoizedFormattedMessage
|
||||||
id="admin.channel_settings.channel_detail.channelName"
|
defaultMessage="Name"
|
||||||
/>
|
id="admin.channelSettings.channelDetail.channelName"
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br />
|
<br />
|
||||||
test
|
test
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="channel-team"
|
className="channel-team"
|
||||||
>
|
>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
defaultMessage="**Team**"
|
<MemoizedFormattedMessage
|
||||||
id="admin.channel_settings.channel_detail.channelTeam"
|
defaultMessage="Team"
|
||||||
/>
|
id="admin.channelSettings.channelDetail.channelTeam"
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br />
|
<br />
|
||||||
test
|
test
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="channel-organizations"
|
className="channel-organizations"
|
||||||
>
|
>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
defaultMessage="**Organizations**"
|
<MemoizedFormattedMessage
|
||||||
id="admin.channel_settings.channel_detail.channelOrganizations"
|
defaultMessage="Organizations"
|
||||||
/>
|
id="admin.channelSettings.channelDetail.channel_organizations"
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br />
|
<br />
|
||||||
<SharedChannelIndicator
|
<SharedChannelIndicator
|
||||||
className="shared-channel-icon"
|
className="shared-channel-icon"
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {FormattedMessage, defineMessage} from 'react-intl';
|
|||||||
import type {Channel} from '@mattermost/types/channels';
|
import type {Channel} from '@mattermost/types/channels';
|
||||||
import type {Team} from '@mattermost/types/teams';
|
import type {Team} from '@mattermost/types/teams';
|
||||||
|
|
||||||
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
|
|
||||||
import SharedChannelIndicator from 'components/shared_channel_indicator';
|
import SharedChannelIndicator from 'components/shared_channel_indicator';
|
||||||
import AdminPanel from 'components/widgets/admin_console/admin_panel';
|
import AdminPanel from 'components/widgets/admin_console/admin_panel';
|
||||||
|
|
||||||
@@ -32,10 +31,12 @@ export const ChannelProfile = (props: ChannelProfileProps): JSX.Element => {
|
|||||||
if (channel.shared && channel.type) {
|
if (channel.shared && channel.type) {
|
||||||
sharedBlock = (
|
sharedBlock = (
|
||||||
<div className='channel-organizations'>
|
<div className='channel-organizations'>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
id='admin.channel_settings.channel_detail.channelOrganizations'
|
<FormattedMessage
|
||||||
defaultMessage='**Organizations**'
|
id='admin.channelSettings.channelDetail.channel_organizations'
|
||||||
/>
|
defaultMessage='Organizations'
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br/>
|
<br/>
|
||||||
<SharedChannelIndicator
|
<SharedChannelIndicator
|
||||||
className='shared-channel-icon'
|
className='shared-channel-icon'
|
||||||
@@ -57,18 +58,22 @@ export const ChannelProfile = (props: ChannelProfileProps): JSX.Element => {
|
|||||||
<div className='group-teams-and-channels AdminChannelDetails'>
|
<div className='group-teams-and-channels AdminChannelDetails'>
|
||||||
<div className='group-teams-and-channels--body channel-desc-col'>
|
<div className='group-teams-and-channels--body channel-desc-col'>
|
||||||
<div className='channel-name'>
|
<div className='channel-name'>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
id='admin.channel_settings.channel_detail.channelName'
|
<FormattedMessage
|
||||||
defaultMessage='**Name**'
|
id='admin.channelSettings.channelDetail.channelName'
|
||||||
/>
|
defaultMessage='Name'
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br/>
|
<br/>
|
||||||
{channel.display_name}
|
{channel.display_name}
|
||||||
</div>
|
</div>
|
||||||
<div className='channel-team'>
|
<div className='channel-team'>
|
||||||
<FormattedMarkdownMessage
|
<b>
|
||||||
id='admin.channel_settings.channel_detail.channelTeam'
|
<FormattedMessage
|
||||||
defaultMessage='**Team**'
|
id='admin.channelSettings.channelDetail.channelTeam'
|
||||||
/>
|
defaultMessage='Team'
|
||||||
|
/>
|
||||||
|
</b>
|
||||||
<br/>
|
<br/>
|
||||||
{team?.display_name}
|
{team?.display_name}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -440,10 +440,7 @@
|
|||||||
"admin.channel_settings.channel_detail.archive_confirm.message": "Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?",
|
"admin.channel_settings.channel_detail.archive_confirm.message": "Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?",
|
||||||
"admin.channel_settings.channel_detail.archive_confirm.title": "Save and Archive Channel",
|
"admin.channel_settings.channel_detail.archive_confirm.title": "Save and Archive Channel",
|
||||||
"admin.channel_settings.channel_detail.channel_configuration": "Channel Configuration",
|
"admin.channel_settings.channel_detail.channel_configuration": "Channel Configuration",
|
||||||
"admin.channel_settings.channel_detail.channelName": "**Name**",
|
|
||||||
"admin.channel_settings.channel_detail.channelOrganizations": "**Organizations**",
|
|
||||||
"admin.channel_settings.channel_detail.channelOrganizationsMessage": "Shared with trusted organizations",
|
"admin.channel_settings.channel_detail.channelOrganizationsMessage": "Shared with trusted organizations",
|
||||||
"admin.channel_settings.channel_detail.channelTeam": "**Team**",
|
|
||||||
"admin.channel_settings.channel_detail.groupsDescription": "Select groups to be added to this channel.",
|
"admin.channel_settings.channel_detail.groupsDescription": "Select groups to be added to this channel.",
|
||||||
"admin.channel_settings.channel_detail.groupsTitle": "Groups",
|
"admin.channel_settings.channel_detail.groupsTitle": "Groups",
|
||||||
"admin.channel_settings.channel_detail.manageDescription": "Choose between inviting members manually or syncing members automatically from groups.",
|
"admin.channel_settings.channel_detail.manageDescription": "Choose between inviting members manually or syncing members automatically from groups.",
|
||||||
@@ -514,6 +511,9 @@
|
|||||||
"admin.channels.filterBy.team.loading": "Loading teams",
|
"admin.channels.filterBy.team.loading": "Loading teams",
|
||||||
"admin.channels.filterBy.team.noTeams": "No teams found",
|
"admin.channels.filterBy.team.noTeams": "No teams found",
|
||||||
"admin.channels.filterBy.team.placeholder": "Search and select teams",
|
"admin.channels.filterBy.team.placeholder": "Search and select teams",
|
||||||
|
"admin.channelSettings.channelDetail.channel_organizations": "Organizations",
|
||||||
|
"admin.channelSettings.channelDetail.channelName": "Name",
|
||||||
|
"admin.channelSettings.channelDetail.channelTeam": "Team",
|
||||||
"admin.cluster.ClusterName": "Cluster Name:",
|
"admin.cluster.ClusterName": "Cluster Name:",
|
||||||
"admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together. This is to support Blue-Green deployments or staging pointing to the same database.",
|
"admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together. This is to support Blue-Green deployments or staging pointing to the same database.",
|
||||||
"admin.cluster.ClusterNameEx": "E.g.: \"Production\" or \"Staging\"",
|
"admin.cluster.ClusterNameEx": "E.g.: \"Production\" or \"Staging\"",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user