mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
[MM-60812] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_profile.tsx' with FormattedMessage (#28608)
* Fix: Replace FormattedMarkdownMessage in file * fix: update snapshot * fix: resolve conflicts in en.json file --------- Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Rita Anene
GitHub
parent
3f59f05f3f
commit
4f496eedb5
@ -55,24 +55,20 @@ exports[`admin_console/team_channel_settings/team/TeamProfile should match snaps
|
||||
<div
|
||||
class="row row-bottom-padding"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Name
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Name
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
name
|
||||
</div>
|
||||
<div
|
||||
class="row"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Description
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Description
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
<span
|
||||
class="greyed-out"
|
||||
@ -156,24 +152,20 @@ exports[`admin_console/team_channel_settings/team/TeamProfile should match snaps
|
||||
<div
|
||||
class="row row-bottom-padding"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Name
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Name
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
name
|
||||
</div>
|
||||
<div
|
||||
class="row"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Description
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Description
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
<span
|
||||
class="greyed-out"
|
||||
@ -257,24 +249,20 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
|
||||
<div
|
||||
class="row row-bottom-padding"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Name
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Name
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
name
|
||||
</div>
|
||||
<div
|
||||
class="row"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Description
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Description
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
<span
|
||||
class="greyed-out"
|
||||
@ -358,24 +346,20 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
|
||||
<div
|
||||
class="row row-bottom-padding"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Name
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Name
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
name
|
||||
</div>
|
||||
<div
|
||||
class="row"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Description
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Description
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
<span
|
||||
class="greyed-out"
|
||||
@ -471,24 +455,20 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
|
||||
<div
|
||||
class="row row-bottom-padding"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Name
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Name
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
name
|
||||
</div>
|
||||
<div
|
||||
class="row"
|
||||
>
|
||||
<span>
|
||||
<strong>
|
||||
Team Description
|
||||
</strong>
|
||||
:
|
||||
</span>
|
||||
<b>
|
||||
Team Description
|
||||
</b>
|
||||
:
|
||||
<br />
|
||||
<span
|
||||
class="greyed-out"
|
||||
|
||||
@ -15,7 +15,6 @@ import {openModal} from 'actions/views/modals';
|
||||
|
||||
import useGetUsage from 'components/common/hooks/useGetUsage';
|
||||
import useGetUsageDeltas from 'components/common/hooks/useGetUsageDeltas';
|
||||
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
|
||||
import PricingModal from 'components/pricing_modal';
|
||||
import AdminPanel from 'components/widgets/admin_console/admin_panel';
|
||||
import TeamIcon from 'components/widgets/team_icon/team_icon';
|
||||
@ -148,17 +147,23 @@ export function TeamProfile({team, isArchived, onToggleArchive, isDisabled, save
|
||||
</div>
|
||||
<div className='team-desc-col'>
|
||||
<div className='row row-bottom-padding'>
|
||||
<FormattedMarkdownMessage
|
||||
id='admin.team_settings.team_detail.teamName'
|
||||
defaultMessage='**Team Name**:'
|
||||
<FormattedMessage
|
||||
id='admin.teamSettings.teamDetail.teamName'
|
||||
defaultMessage='<b>Team Name</b>:'
|
||||
values={{
|
||||
b: (chunks: string) => <b>{chunks}</b>,
|
||||
}}
|
||||
/>
|
||||
<br/>
|
||||
{team.display_name}
|
||||
</div>
|
||||
<div className='row'>
|
||||
<FormattedMarkdownMessage
|
||||
id='admin.team_settings.team_detail.teamDescription'
|
||||
defaultMessage='**Team Description**:'
|
||||
<FormattedMessage
|
||||
id='admin.teamSettings.teamDetail.teamDescription'
|
||||
defaultMessage='<b>Team Description</b>:'
|
||||
values={{
|
||||
b: (chunks: string) => <b>{chunks}</b>,
|
||||
}}
|
||||
/>
|
||||
<br/>
|
||||
{team.description || <span className='greyed-out'>{intl.formatMessage({id: 'admin.team_settings.team_detail.profileNoDescription', defaultMessage: 'No team description added.'})}</span>}
|
||||
|
||||
@ -2672,8 +2672,6 @@
|
||||
"admin.team_settings.team_detail.profileTitle": "Team Profile",
|
||||
"admin.team_settings.team_detail.syncedGroupsDescription": "Add and remove team members based on their group membership.",
|
||||
"admin.team_settings.team_detail.syncedGroupsTitle": "Synced Groups",
|
||||
"admin.team_settings.team_detail.teamDescription": "**Team Description**:",
|
||||
"admin.team_settings.team_detail.teamName": "**Team Name**:",
|
||||
"admin.team_settings.team_details.add_group": "Add Group",
|
||||
"admin.team_settings.team_details.add_members": "Add Members",
|
||||
"admin.team_settings.team_details.anyoneCanJoin": "Anyone can join this team",
|
||||
@ -2755,6 +2753,8 @@
|
||||
"admin.team.userCreationDescription": "When false, the ability to create accounts is disabled, and selecting Create Account displays an error. Applies to Email, OpenID Connect, and OAuth 2.0 user account authentication.",
|
||||
"admin.team.userCreationTitle": "Enable Account Creation: ",
|
||||
"admin.teamChannelSettings.usersToBeRemovedModal.title": "<b>{total, number} {total, plural, one {User} other {Users}}</b> To Be Removed",
|
||||
"admin.teamSettings.teamDetail.teamDescription": "<b>Team Description</b>:",
|
||||
"admin.teamSettings.teamDetail.teamName": "<b>Team Name</b>:",
|
||||
"admin.trial_banner.trial-request.error": "Trial license could not be retrieved. Visit <link>{trialInfoLink}</link> to request a license.",
|
||||
"admin.true": "True",
|
||||
"admin.user_grid.channel_admin": "Channel Admin",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user