Update default town square purpose (#5810)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
3ea091fd6d
Коммит
4c1eb7ff55
@@ -2,6 +2,7 @@
|
|||||||
// See License.txt for license information.
|
// See License.txt for license information.
|
||||||
|
|
||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
|
import Constants from 'utils/constants.jsx';
|
||||||
|
|
||||||
import {FormattedMessage} from 'react-intl';
|
import {FormattedMessage} from 'react-intl';
|
||||||
import {Modal} from 'react-bootstrap';
|
import {Modal} from 'react-bootstrap';
|
||||||
@@ -47,9 +48,21 @@ export default class ChannelInfoModal extends React.Component {
|
|||||||
|
|
||||||
const channelURL = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name;
|
const channelURL = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name;
|
||||||
|
|
||||||
let channelPurpose = null;
|
let channelPurpose;
|
||||||
if (channel.purpose) {
|
if (channel.purpose) {
|
||||||
|
channelPurpose = channel.purpose;
|
||||||
|
} else if (channel.name === Constants.DEFAULT_CHANNEL) {
|
||||||
channelPurpose = (
|
channelPurpose = (
|
||||||
|
<FormattedMessage
|
||||||
|
id='default_channel.purpose'
|
||||||
|
defaultMessage='Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.'
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let channelPurposeElement;
|
||||||
|
if (channelPurpose) {
|
||||||
|
channelPurposeElement = (
|
||||||
<div className='form-group'>
|
<div className='form-group'>
|
||||||
<div className='info__label'>
|
<div className='info__label'>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -57,7 +70,7 @@ export default class ChannelInfoModal extends React.Component {
|
|||||||
defaultMessage='Purpose:'
|
defaultMessage='Purpose:'
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='info__value'>{channel.purpose}</div>
|
<div className='info__value'>{channelPurpose}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -97,7 +110,7 @@ export default class ChannelInfoModal extends React.Component {
|
|||||||
</Modal.Title>
|
</Modal.Title>
|
||||||
</Modal.Header>
|
</Modal.Header>
|
||||||
<Modal.Body ref='modalBody'>
|
<Modal.Body ref='modalBody'>
|
||||||
{channelPurpose}
|
{channelPurposeElement}
|
||||||
{channelHeader}
|
{channelHeader}
|
||||||
<div className='form-group'>
|
<div className='form-group'>
|
||||||
<div className='info__label'>
|
<div className='info__label'>
|
||||||
|
|||||||
@@ -1227,6 +1227,7 @@
|
|||||||
"custom_emoji.empty": "No custom emoji found",
|
"custom_emoji.empty": "No custom emoji found",
|
||||||
"custom_emoji.header": "Custom Emoji",
|
"custom_emoji.header": "Custom Emoji",
|
||||||
"custom_emoji.search": "Search Custom Emoji",
|
"custom_emoji.search": "Search Custom Emoji",
|
||||||
|
"default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
|
||||||
"delete_channel.cancel": "Cancel",
|
"delete_channel.cancel": "Cancel",
|
||||||
"delete_channel.channel": "channel",
|
"delete_channel.channel": "channel",
|
||||||
"delete_channel.confirm": "Confirm DELETE Channel",
|
"delete_channel.confirm": "Confirm DELETE Channel",
|
||||||
@@ -1528,7 +1529,7 @@
|
|||||||
"intro_messages.beginning": "Beginning of {name}",
|
"intro_messages.beginning": "Beginning of {name}",
|
||||||
"intro_messages.channel": "channel",
|
"intro_messages.channel": "channel",
|
||||||
"intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
|
"intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
|
||||||
"intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>",
|
"intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
|
||||||
"intro_messages.group": "private group",
|
"intro_messages.group": "private group",
|
||||||
"intro_messages.invite": "Invite others to this {type}",
|
"intro_messages.invite": "Invite others to this {type}",
|
||||||
"intro_messages.inviteOthers": "Invite others to this team",
|
"intro_messages.inviteOthers": "Invite others to this team",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user