summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-01-12 11:39:14 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-01-12 11:39:14 -0500
commitcc746dda6acbcba3645bafcb368104f78ce1aeae (patch)
tree39b2fbb84a7b5dce9a7a561ad9854db1e6fa62fb
parent944aa682f01c0f3f4200bcb3c3f19e35e8b95fa3 (diff)
parentd9fcf4d8dbe4a5dc6b48ec769ef048d466b6aaea (diff)
downloadchat-cc746dda6acbcba3645bafcb368104f78ce1aeae.tar.gz
chat-cc746dda6acbcba3645bafcb368104f78ce1aeae.tar.bz2
chat-cc746dda6acbcba3645bafcb368104f78ce1aeae.zip
Merge pull request #1830 from rgarmsen2295/plt-1599
PLT-1599 Help text in invite member modal now reflects the default channel name
-rw-r--r--web/react/components/invite_member_modal.jsx10
1 files changed, 8 insertions, 2 deletions
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index 56bc00a7e..7e1627555 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -8,6 +8,7 @@ import * as Client from '../utils/client.jsx';
import * as EventHelpers from '../dispatcher/event_helpers.jsx';
import ModalStore from '../stores/modal_store.jsx';
import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
import TeamStore from '../stores/team_store.jsx';
import ConfirmModal from './confirm_modal.jsx';
@@ -304,6 +305,11 @@ export default class InviteMemberModal extends React.Component {
var content = null;
var sendButton = null;
+ var defaultChannelName = '';
+ if (ChannelStore.getByName(Constants.DEFAULT_CHANNEL)) {
+ defaultChannelName = ChannelStore.getByName(Constants.DEFAULT_CHANNEL).display_name;
+ }
+
if (this.state.emailEnabled && this.state.userCreationEnabled) {
content = (
<div>
@@ -312,10 +318,10 @@ export default class InviteMemberModal extends React.Component {
type='button'
className='btn btn-default'
onClick={this.addInviteFields}
- >Add another</button>
+ >{'Add another'}</button>
<br/>
<br/>
- <span>People invited automatically join Town Square channel.</span>
+ <span>{'People invited automatically join the '}<strong>{defaultChannelName}</strong>{' channel.'}</span>
</div>
);