diff options
author | Corey Hulen <corey@hulen.com> | 2015-11-05 10:24:03 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-11-05 10:24:03 -0800 |
commit | 6418b78f1c8d7b9bba240ef5638e9e2a1613c3e5 (patch) | |
tree | 14e323ed0a2f5949fb411462f76e7362a1b83f32 /web/react/components/user_settings/user_settings_display.jsx | |
parent | 1578f6ca91f65254b174e366990ce28a98a13b26 (diff) | |
parent | dc677bc88b3aa08b4da9064907263dca608fb3e1 (diff) | |
download | chat-6418b78f1c8d7b9bba240ef5638e9e2a1613c3e5.tar.gz chat-6418b78f1c8d7b9bba240ef5638e9e2a1613c3e5.tar.bz2 chat-6418b78f1c8d7b9bba240ef5638e9e2a1613c3e5.zip |
Merge pull request #1319 from asaadmahmoodspin/ui-improvements
UI Improvements for Slack and post dropdown
Diffstat (limited to 'web/react/components/user_settings/user_settings_display.jsx')
-rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx index 3c12ead23..43c8d33d1 100644 --- a/web/react/components/user_settings/user_settings_display.jsx +++ b/web/react/components/user_settings/user_settings_display.jsx @@ -172,13 +172,13 @@ export default class UserSettingsDisplay extends React.Component { </label> <br/> </div> - <div><br/>{'How should other users be shown in Direct Messages list?'}</div> + <div><br/>{'Set what name to display in the Direct Messages list.'}</div> </div> ]; nameFormatSection = ( <SettingItemMax - title='Show real names, nick names or usernames?' + title='Teammate Name Display' inputs={inputs} submit={this.handleSubmit} server_error={serverError} @@ -200,7 +200,7 @@ export default class UserSettingsDisplay extends React.Component { nameFormatSection = ( <SettingItemMin - title='Show real names, nick names or usernames?' + title='Teammate Name Display' describe={describe} updateSection={() => { this.props.updateSection('name_format'); |