diff options
| -rw-r--r-- | webapp/components/user_profile.jsx | 20 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 4 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 |
4 files changed, 25 insertions, 7 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx index c7020fed9..bc542165a 100644 --- a/webapp/components/user_profile.jsx +++ b/webapp/components/user_profile.jsx @@ -79,6 +79,24 @@ export default class UserProfile extends React.Component { /> ); + let fullname = Utils.getFullName(this.props.user); + if (fullname) { + dataContent.push( + <div + data-toggle='tooltip' + title={fullname} + key='user-popover-fullname' + > + + <p + className='text-nowrap' + > + {fullname} + </p> + </div> + ); + } + if (global.window.mm_config.ShowEmailAddress === 'true' || UserStore.isSystemAdminForCurrentUser() || this.props.user === UserStore.getCurrentUser()) { dataContent.push( <div @@ -103,7 +121,7 @@ export default class UserProfile extends React.Component { rootClose={true} overlay={ <Popover - title={name} + title={'@' + this.props.user.username} id='user-profile-popover' > {dataContent} diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index d1c195c7e..e725060ab 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -27,7 +27,7 @@ const holders = defineMessages({ }, validEmail: { id: 'user.settings.general.validEmail', - defaultMessage: 'Please enter a valid email address' + defaultMessage: 'Please enter a valid email address.' }, emailMatch: { id: 'user.settings.general.emailMatch', diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 428c88e25..769959432 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -22,7 +22,7 @@ import {Link} from 'react-router/es6'; const holders = defineMessages({ currentPasswordError: { id: 'user.settings.security.currentPasswordError', - defaultMessage: 'Please enter your current password' + defaultMessage: 'Please enter your current password.' }, passwordLengthError: { id: 'user.settings.security.passwordLengthError', @@ -30,7 +30,7 @@ const holders = defineMessages({ }, passwordMatchError: { id: 'user.settings.security.passwordMatchError', - defaultMessage: 'The new passwords you entered do not match' + defaultMessage: 'The new passwords you entered do not match.' }, method: { id: 'user.settings.security.method', diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index b37b7a5d5..952b90543 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1097,7 +1097,7 @@ "edit_post.save": "Save", "email_signup.address": "Email Address", "email_signup.createTeam": "Create Team", - "email_signup.emailError": "Please enter a valid email address", + "email_signup.emailError": "Please enter a valid email address.", "email_signup.find": "Find my teams", "email_verify.almost": "{siteName}: You are almost done", "email_verify.failed": " Failed to send verification email.", @@ -1771,7 +1771,7 @@ "user.settings.push_notification.onlyMentions": "For mentions and direct messages", "user.settings.security.close": "Close", "user.settings.security.currentPassword": "Current Password", - "user.settings.security.currentPasswordError": "Please enter your current password", + "user.settings.security.currentPasswordError": "Please enter your current password.", "user.settings.security.emailPwd": "Email and Password", "user.settings.security.gitlab": "GitLab", "user.settings.security.google": "Google", @@ -1803,7 +1803,7 @@ "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").", "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.", "user.settings.security.passwordLdapCantUpdate": "Login occurs through LDAP. Password cannot be updated.", - "user.settings.security.passwordMatchError": "The new passwords you entered do not match", + "user.settings.security.passwordMatchError": "The new passwords you entered do not match.", "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.", "user.settings.security.retypePassword": "Retype New Password", "user.settings.security.saml": "SAML", |