From 6418e912df647d38e22b75adc668824c7375073a Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 25 Jul 2017 21:55:21 +0800
Subject: [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
---
 webapp/components/admin_console/users_and_teams_settings.jsx | 4 ++--
 webapp/i18n/en.json                                          | 8 ++------
 2 files changed, 4 insertions(+), 8 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
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 9f0980175..d91c40aa2 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -904,9 +904,9 @@
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
-  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showFullname": "Show first and last name",
   "admin.team.showNickname": "Show nickname if one exists, otherwise show first and last name",
-  "admin.team.showUsername": "Show username",
+  "admin.team.showUsername": "Show username (default)",
   "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
   "admin.team.siteNameExample": "E.g.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Site Name:",
@@ -2241,10 +2241,6 @@
   "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.",
   "user.settings.display.normalClock": "12-hour clock (example: 4:00 PM)",
   "user.settings.display.preferTime": "Select how you prefer time displayed.",
-  "user.settings.display.showFullname": "Show first and last name",
-  "user.settings.display.showNickname": "Show nickname if one exists, otherwise show first and last name",
-  "user.settings.display.showUsername": "Show username (default)",
-  "user.settings.display.teammateNameDisplay": "Teammate Name Display",
   "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams",
   "user.settings.display.theme.customTheme": "Custom Theme",
   "user.settings.display.theme.describe": "Open to manage your theme",
-- 
cgit v1.2.3-1-g7c22