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-60830] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/user_list_row/user_list_row.tsx' with FormattedMessage (#28629)

Browse Source
This commit is contained in:
TheInvincible 2024-10-11 12:59:28 +01:00 committed by GitHub
parent 7983521dc0
commit 064c78e63d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/channels/src/components/user_list_row/user_list_row.tsx
View File

@ -3,6 +3,7 @@
import React from 'react'; import React from 'react';
import type {ReactNode} from 'react'; import type {ReactNode} from 'react';
import {FormattedMessage} from 'react-intl';
import type {ConnectedComponent} from 'react-redux'; import type {ConnectedComponent} from 'react-redux';
import styled from 'styled-components'; import styled from 'styled-components';
@ -13,7 +14,6 @@ import type {UserProfile as UserProfileType} 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 Nbsp from 'components/html_entities/nbsp'; import Nbsp from 'components/html_entities/nbsp';
import ProfilePicture from 'components/profile_picture'; import ProfilePicture from 'components/profile_picture';
import UserProfile from 'components/user_profile'; import UserProfile from 'components/user_profile';
@ -79,11 +79,12 @@ const UserListRow = ({user, status, extraInfo = [], actions = [], actionProps, a
let statusProp: string | undefined; let statusProp: string | undefined;
if (extraInfo && extraInfo.length > 0) { if (extraInfo && extraInfo.length > 0) {
emailProp = ( emailProp = (
<FormattedMarkdownMessage <FormattedMessage
id='admin.user_item.emailTitle' id='admin.user_item.email_title'
defaultMessage='**Email:** {email}' defaultMessage='<strong>Email:</strong> {email}'
values={{ values={{
email: user.email, email: user.email,
strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
}} }}
/> />
); );

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

@ -2765,6 +2765,7 @@
"admin.user_grid.system_admin": "System Admin", "admin.user_grid.system_admin": "System Admin",
"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.emailTitle": "**Email:** {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",