summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorRyan Wang <R-Wang97@users.noreply.github.com>2017-03-24 05:17:01 -0400
committerGeorge Goldberg <george@gberg.me>2017-03-24 09:17:01 +0000
commit4c1eb7ff5575be07b8410e76da4cdaa964c2ef91 (patch)
treeb2e042f91901c5dc7583c992045ee6e6858c6d73 /webapp
parent3ea091fd6df6b175bda64db81589f6936589d5d2 (diff)
downloadchat-4c1eb7ff5575be07b8410e76da4cdaa964c2ef91.tar.gz
chat-4c1eb7ff5575be07b8410e76da4cdaa964c2ef91.tar.bz2
chat-4c1eb7ff5575be07b8410e76da4cdaa964c2ef91.zip
Update default town square purpose (#5810)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/channel_info_modal.jsx19
-rwxr-xr-xwebapp/i18n/en.json3
2 files changed, 18 insertions, 4 deletions
diff --git a/webapp/components/channel_info_modal.jsx b/webapp/components/channel_info_modal.jsx
index fce4b75db..4829d1dd9 100644
--- a/webapp/components/channel_info_modal.jsx
+++ b/webapp/components/channel_info_modal.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
import * as Utils from 'utils/utils.jsx';
+import Constants from 'utils/constants.jsx';
import {FormattedMessage} from 'react-intl';
import {Modal} from 'react-bootstrap';
@@ -47,9 +48,21 @@ export default class ChannelInfoModal extends React.Component {
const channelURL = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name;
- let channelPurpose = null;
+ let channelPurpose;
if (channel.purpose) {
+ channelPurpose = channel.purpose;
+ } else if (channel.name === Constants.DEFAULT_CHANNEL) {
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='info__label'>
<FormattedMessage
@@ -57,7 +70,7 @@ export default class ChannelInfoModal extends React.Component {
defaultMessage='Purpose:'
/>
</div>
- <div className='info__value'>{channel.purpose}</div>
+ <div className='info__value'>{channelPurpose}</div>
</div>
);
}
@@ -97,7 +110,7 @@ export default class ChannelInfoModal extends React.Component {
</Modal.Title>
</Modal.Header>
<Modal.Body ref='modalBody'>
- {channelPurpose}
+ {channelPurposeElement}
{channelHeader}
<div className='form-group'>
<div className='info__label'>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 68b898e7e..07cccd65c 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1227,6 +1227,7 @@
"custom_emoji.empty": "No custom emoji found",
"custom_emoji.header": "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.channel": "channel",
"delete_channel.confirm": "Confirm DELETE Channel",
@@ -1528,7 +1529,7 @@
"intro_messages.beginning": "Beginning of {name}",
"intro_messages.channel": "channel",
"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.invite": "Invite others to this {type}",
"intro_messages.inviteOthers": "Invite others to this team",