[MM-60816] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/channel_view/channel_view.tsx' with FormattedMessage (#28728)

Этот коммит содержится в:
Michael
2024-10-17 02:07:01 +01:00
коммит произвёл GitHub
родитель f3e7c2bf7a
Коммит c0df35b93e
3 изменённых файлов: 30 добавлений и 15 удалений

Просмотреть файл

@@ -41,9 +41,14 @@ exports[`components/channel_view Should match snapshot if channel is archived 1`
className="channel-archived__message"
id="channelArchivedMessage"
>
<FormattedMarkdownMessage
defaultMessage="You are viewing an **archived channel**. New messages cannot be posted."
id="archivedChannelMessage"
<MemoizedFormattedMessage
defaultMessage="You are viewing an <b>archived channel</b>. New messages cannot be posted."
id="channelView.archivedChannel"
values={
Object {
"b": [Function],
}
}
/>
<button
className="btn btn-primary channel-archived__close-btn"
@@ -99,9 +104,14 @@ exports[`components/channel_view Should match snapshot if channel is deactivated
<div
className="channel-archived__message"
>
<FormattedMarkdownMessage
defaultMessage="You are viewing an archived channel with a **deactivated user**. New messages cannot be posted."
id="create_post.deactivated"
<MemoizedFormattedMessage
defaultMessage="You are viewing an archived channel with a <b>deactivated user</b>. New messages cannot be posted."
id="channelView.archivedChannelWithDeactivatedUser"
values={
Object {
"b": [Function],
}
}
/>
<button
className="btn btn-primary channel-archived__close-btn"

Просмотреть файл

@@ -7,7 +7,6 @@ import type {RouteComponentProps} from 'react-router-dom';
import {makeAsyncComponent} from 'components/async_load';
import deferComponentRender from 'components/deferComponentRender';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import PostView from 'components/post_view';
import WebSocketClient from 'client/web_websocket_client';
@@ -117,9 +116,12 @@ export default class ChannelView extends React.PureComponent<Props, State> {
<div
className='channel-archived__message'
>
<FormattedMarkdownMessage
id='create_post.deactivated'
defaultMessage='You are viewing an archived channel with a **deactivated user**. New messages cannot be posted.'
<FormattedMessage
id='channelView.archivedChannelWithDeactivatedUser'
defaultMessage='You are viewing an archived channel with a <b>deactivated user</b>. New messages cannot be posted.'
values={{
b: (chunks: string) => <b>{chunks}</b>,
}}
/>
<button
className='btn btn-primary channel-archived__close-btn'
@@ -143,9 +145,12 @@ export default class ChannelView extends React.PureComponent<Props, State> {
id='channelArchivedMessage'
className='channel-archived__message'
>
<FormattedMarkdownMessage
id='archivedChannelMessage'
defaultMessage='You are viewing an **archived channel**. New messages cannot be posted.'
<FormattedMessage
id='channelView.archivedChannel'
defaultMessage='You are viewing an <b>archived channel</b>. New messages cannot be posted.'
values={{
b: (chunks: string) => <b>{chunks}</b>,
}}
/>
<button
className='btn btn-primary channel-archived__close-btn'

Просмотреть файл

@@ -2973,7 +2973,6 @@
"apps.suggestion.no_dynamic": "No data was returned for dynamic suggestions",
"apps.suggestion.no_static": "No matching options.",
"apps.suggestion.no_suggestion": "No matching suggestions.",
"archivedChannelMessage": "You are viewing an **archived channel**. New messages cannot be posted.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Account activated",
"audit_table.accountInactive": "Account deactivated",
@@ -3309,6 +3308,8 @@
"channelNotifications.mobileNotification.newMessages": "All new messages {optionalDefault}",
"channelNotifications.mobileNotification.nothing": "Nothing {optionalDefault}",
"channelSelectorModal.title": "Add Channels to <b>Channel Selection</b> List",
"channelView.archivedChannel": "You are viewing an <b>archived channel</b>. New messages cannot be posted.",
"channelView.archivedChannelWithDeactivatedUser": "You are viewing an archived channel with a <b>deactivated user</b>. New messages cannot be posted.",
"channelView.login.successfull": "Login Successful",
"claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your AD/LDAP account",
"claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",
@@ -3429,7 +3430,6 @@
"create_group_memberships_modal.create": "Yes",
"create_group_memberships_modal.desc": "You're about to add or re-add {username} to teams and channels based on their LDAP group membership. You can revert this change at any time.",
"create_group_memberships_modal.title": "Re-add {username} to teams and channels",
"create_post.deactivated": "You are viewing an archived channel with a **deactivated user**. New messages cannot be posted.",
"create_post.error_message": "Your message is too long. Character count: {length}/{limit}",
"create_post.file_limit_sticky_banner.admin_message": "New uploads will automatically archive older files. To view them again, you can delete older files or <a>upgrade to a paid plan.</a>",
"create_post.file_limit_sticky_banner.messageTitle": "Your free plan is limited to {storageGB} of files.",