diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-06 10:38:22 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-06 10:38:22 -0400 |
| commit | 506798f5476a8f1d43ae80b3a9f58ee487f4c339 (patch) | |
| tree | f11114376af620920340d883d72c73bdcca07d1a /web | |
| parent | b48b5e7e472289938dd07b05b01c5c5d4a5d20ac (diff) | |
| parent | 371b1e04eb892109cd44f18230e0247dc5aabe43 (diff) | |
| download | chat-506798f5476a8f1d43ae80b3a9f58ee487f4c339.tar.gz chat-506798f5476a8f1d43ae80b3a9f58ee487f4c339.tar.bz2 chat-506798f5476a8f1d43ae80b3a9f58ee487f4c339.zip | |
Merge pull request #344 from nickago/MM-1646
MM-1646 Changes the word channel to group for priavte groups
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/channel_header.jsx | 13 | ||||
| -rw-r--r-- | web/react/components/new_channel.jsx | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index a79d3547f..90a776791 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -175,6 +175,11 @@ module.exports = React.createClass({ } } + var channelTerm = 'Channel'; + if (channel.type === 'P') { + channelTerm = 'Group'; + } + return ( <table className='channel-header alt'> <tr> @@ -196,18 +201,18 @@ module.exports = React.createClass({ <li role='presentation'><a role='menuitem' data-toggle='modal' data-target='#channel_members' href='#'>Manage Members</a></li> : null } - <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set Channel Description...</a></li> + <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set {channelTerm} Description...</a></li> <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#channel_notifications' data-title={channel.display_name} data-channelid={channel.id}>Notification Preferences</a></li> {isAdmin && !ChannelStore.isDefault(channel) ? - <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#rename_channel' data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename Channel...</a></li> + <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#rename_channel' data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename {channelTerm}...</a></li> : null } {isAdmin && !ChannelStore.isDefault(channel) ? - <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#delete_channel' data-title={channel.display_name} data-channelid={channel.id}>Delete Channel...</a></li> + <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#delete_channel' data-title={channel.display_name} data-channelid={channel.id}>Delete {channelTerm}...</a></li> : null } {!ChannelStore.isDefault(channel) ? - <li role='presentation'><a role='menuitem' href='#' onClick={this.handleLeave}>Leave Channel</a></li> + <li role='presentation'><a role='menuitem' href='#' onClick={this.handleLeave}>Leave {channelTerm}</a></li> : null } </ul> diff --git a/web/react/components/new_channel.jsx b/web/react/components/new_channel.jsx index 93884f6eb..ffcbfd32d 100644 --- a/web/react/components/new_channel.jsx +++ b/web/react/components/new_channel.jsx @@ -107,6 +107,11 @@ module.exports = React.createClass({ serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>; } + var channelTerm = 'Channel'; + if (this.state.channelType === 'P') { + channelTerm = 'Group'; + } + return ( <div className='modal fade' id='new_channel' ref='modal' tabIndex='-1' role='dialog' aria-hidden='true'> <div className='modal-dialog'> @@ -116,7 +121,7 @@ module.exports = React.createClass({ <span aria-hidden='true'>×</span> <span className='sr-only'>Cancel</span> </button> - <h4 className='modal-title'>New Channel</h4> + <h4 className='modal-title'>New {channelTerm}</h4> </div> <form role='form'> <div className='modal-body'> |