diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-25 21:55:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-25 21:55:21 +0800 |
commit | 6418e912df647d38e22b75adc668824c7375073a (patch) | |
tree | 60b739f063bb7a74b5ea5dae8c0ff7046e9657c7 /webapp/components/admin_console/users_and_teams_settings.jsx | |
parent | 345dd400bbe2f41c45b08dc06e3199c900361fff (diff) | |
download | chat-6418e912df647d38e22b75adc668824c7375073a.tar.gz chat-6418e912df647d38e22b75adc668824c7375073a.tar.bz2 chat-6418e912df647d38e22b75adc668824c7375073a.zip |
[PLT-7219] Fix username as default for Teammate Name Display setting (#7023)
* fix username as default for Teammate Name Display setting
* update localizeMessage at UsersAndTeamsSettings
Diffstat (limited to 'webapp/components/admin_console/users_and_teams_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/users_and_teams_settings.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx index 9d33f0648..bfd67b638 100644 --- a/webapp/components/admin_console/users_and_teams_settings.jsx +++ b/webapp/components/admin_console/users_and_teams_settings.jsx @@ -193,9 +193,9 @@ export default class UsersAndTeamsSettings extends AdminSettings { <DropdownSetting id='teammateNameDisplay' values={[ - {value: Constants.TEAMMATE_NAME_DISPLAY.SHOW_USERNAME, text: Utils.localizeMessage('admin.team.showUsername', 'Show username')}, + {value: Constants.TEAMMATE_NAME_DISPLAY.SHOW_USERNAME, text: Utils.localizeMessage('admin.team.showUsername', 'Show username (default)')}, {value: Constants.TEAMMATE_NAME_DISPLAY.SHOW_NICKNAME_FULLNAME, text: Utils.localizeMessage('admin.team.showNickname', 'Show nickname if one exists, otherwise show first and last name')}, - {value: Constants.TEAMMATE_NAME_DISPLAY.SHOW_FULLNAME, text: Utils.localizeMessage('admin.team.showFullname', 'Show first and last name (default)')} + {value: Constants.TEAMMATE_NAME_DISPLAY.SHOW_FULLNAME, text: Utils.localizeMessage('admin.team.showFullname', 'Show first and last name')} ]} label={ <FormattedMessage |