[MM-60831] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/user_list_row_with_error/user_list_row_with_error.tsx' with FormattedMessage (#28726)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
ad65b6b391
Коммит
f3e7c2bf7a
@@ -13,7 +13,6 @@ import type {UserProfile} from '@mattermost/types/users';
|
|||||||
import {Client4} from 'mattermost-redux/client';
|
import {Client4} from 'mattermost-redux/client';
|
||||||
|
|
||||||
import CustomStatusEmoji from 'components/custom_status/custom_status_emoji';
|
import CustomStatusEmoji from 'components/custom_status/custom_status_emoji';
|
||||||
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
|
|
||||||
import ProfilePicture from 'components/profile_picture';
|
import ProfilePicture from 'components/profile_picture';
|
||||||
import BotTag from 'components/widgets/tag/bot_tag';
|
import BotTag from 'components/widgets/tag/bot_tag';
|
||||||
import Tag from 'components/widgets/tag/tag';
|
import Tag from 'components/widgets/tag/tag';
|
||||||
@@ -57,7 +56,6 @@ export default class UserListRowWithError extends React.PureComponent<Props, Sta
|
|||||||
super(props);
|
super(props);
|
||||||
this.state = {};
|
this.state = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
onError = (errorObj: ServerError) => {
|
onError = (errorObj: ServerError) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
error: errorObj,
|
error: errorObj,
|
||||||
@@ -90,10 +88,11 @@ export default class UserListRowWithError extends React.PureComponent<Props, Sta
|
|||||||
email = null;
|
email = null;
|
||||||
} else if (this.props.extraInfo && this.props.extraInfo.length > 0) {
|
} else if (this.props.extraInfo && this.props.extraInfo.length > 0) {
|
||||||
email = (
|
email = (
|
||||||
<FormattedMarkdownMessage
|
<FormattedMessage
|
||||||
id='admin.user_item.emailTitle'
|
id='admin.user_item.email_title'
|
||||||
defaultMessage='**Email:** {email}'
|
defaultMessage='<b>Email:</b> {email}'
|
||||||
values={{
|
values={{
|
||||||
|
b: (values: React.ReactNode) => <b>{values}</b>,
|
||||||
email: this.props.user.email,
|
email: this.props.user.email,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -2770,7 +2770,6 @@
|
|||||||
"admin.user_grid.team_admin": "Team Admin",
|
"admin.user_grid.team_admin": "Team Admin",
|
||||||
"admin.user_item.deactivate": "Deactivate",
|
"admin.user_item.deactivate": "Deactivate",
|
||||||
"admin.user_item.email_title": "<strong>Email:</strong> {email}",
|
"admin.user_item.email_title": "<strong>Email:</strong> {email}",
|
||||||
"admin.user_item.emailTitle": "**Email:** {email}",
|
|
||||||
"admin.user_item.guest": "Guest",
|
"admin.user_item.guest": "Guest",
|
||||||
"admin.user_item.invalidEmail": "Invalid email address",
|
"admin.user_item.invalidEmail": "Invalid email address",
|
||||||
"admin.user_item.makeActive": "Activate",
|
"admin.user_item.makeActive": "Activate",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user