IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix regression for LDAP users not showing email address (#6568)

Browse Source
This commit is contained in:
Saturnino Abril
2017-06-06 01:22:37 +08:00
committed by Joram Wilander
parent abd0466a42
commit db1b202e42
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webapp/components/user_settings/user_settings_general/user_settings_general.jsx
View File

@@ -487,7 +487,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailGitlabCantUpdate'
defaultMessage='Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
</div>
@@ -505,7 +505,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailGoogleCantUpdate'
defaultMessage='Login occurs through Google Apps. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
</div>
@@ -523,7 +523,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailOffice365CantUpdate'
defaultMessage='Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
</div>
@@ -541,7 +541,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailLdapCantUpdate'
defaultMessage='Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
</div>
@@ -558,7 +558,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailSamlCantUpdate'
defaultMessage='Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
</div>
@@ -617,7 +617,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginGitlab'
defaultMessage='Login done through GitLab ({email})'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
);
@@ -627,7 +627,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginGoogle'
defaultMessage='Login done through Google Apps ({email})'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
);
@@ -637,7 +637,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginOffice365'
defaultMessage='Login done through Office 365 ({email})'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
);
@@ -647,7 +647,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginLdap'
defaultMessage='Login done through AD/LDAP ({email})'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
);
@@ -657,7 +657,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginSaml'
defaultMessage='Login done through SAML ({email})'
values={{
email: this.state.email
email: this.state.originalEmail
}}
/>
);