diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-04-20 15:58:22 +0200 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-20 09:58:22 -0400 |
| commit | 8723f61f4540c74d5c755d7f9532f8fe199ccb6f (patch) | |
| tree | e9f4e4967f10e02583ee2cedbfa3ded1b5db8976 /webapp | |
| parent | b0e5713680b36c93ed2e63f327cb0ac69fb64553 (diff) | |
| download | chat-8723f61f4540c74d5c755d7f9532f8fe199ccb6f.tar.gz chat-8723f61f4540c74d5c755d7f9532f8fe199ccb6f.tar.bz2 chat-8723f61f4540c74d5c755d7f9532f8fe199ccb6f.zip | |
implement [PLT-4118] Help text on "Private Channel --> Set Channel Purpose" is incorrect (#6144)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/edit_channel_purpose_modal.jsx | 20 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 1 |
2 files changed, 17 insertions, 4 deletions
diff --git a/webapp/components/edit_channel_purpose_modal.jsx b/webapp/components/edit_channel_purpose_modal.jsx index 431182f43..a9f4d6c3d 100644 --- a/webapp/components/edit_channel_purpose_modal.jsx +++ b/webapp/components/edit_channel_purpose_modal.jsx @@ -110,6 +110,21 @@ export default class EditChannelPurposeModal extends React.Component { ); } + let channelPurposeModal = ( + <FormattedMessage + id='edit_channel_purpose_modal.body' + defaultMessage='Describe how this channel should be used. This text appears in the channel list in the "More..." menu and helps others decide whether to join.' + /> + ); + if (this.props.channel.type === 'P') { + channelPurposeModal = ( + <FormattedMessage + id='edit_channel_private_purpose_modal.body' + defaultMessage='This text appears in the \"View Info\" modal of the private channel.' + /> + ); + } + return ( <Modal className='modal-edit-channel-purpose' @@ -125,10 +140,7 @@ export default class EditChannelPurposeModal extends React.Component { </Modal.Header> <Modal.Body> <p> - <FormattedMessage - id='edit_channel_purpose_modal.body' - defaultMessage='Describe how this channel should be used. This text appears in the channel list in the "More..." menu and helps others decide whether to join.' - /> + {channelPurposeModal} </p> <textarea ref='purpose' diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index cf800fc80..791e994f6 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1249,6 +1249,7 @@ "edit_channel_header_modal.title": "Edit Header for {channel}", "edit_channel_header_modal.title_dm": "Edit Header", "edit_channel_purpose_modal.body": "Describe how this channel should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.", + "edit_channel_private_purpose_modal.body": "This text appears in the \"View Info\" modal of the private channel.", "edit_channel_purpose_modal.cancel": "Cancel", "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one", "edit_channel_purpose_modal.save": "Save", |