summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorRyan Wang <R-Wang97@users.noreply.github.com>2017-04-27 09:40:11 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-27 09:40:11 -0400
commit66f538783bfbcb0814bcc7dff3697e84e8554649 (patch)
treedcf2b0911893a1306cfab798bb2c2a922a742008 /webapp
parentf5d9010f9a2670e09587cd6b0e5b8c3296c8d4b4 (diff)
downloadchat-66f538783bfbcb0814bcc7dff3697e84e8554649.tar.gz
chat-66f538783bfbcb0814bcc7dff3697e84e8554649.tar.bz2
chat-66f538783bfbcb0814bcc7dff3697e84e8554649.zip
Create seperate field for current email (#6197)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/user_settings/user_settings_general/user_settings_general.jsx23
-rwxr-xr-xwebapp/i18n/en.json3
2 files changed, 22 insertions, 4 deletions
diff --git a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
index 79132d929..58f718549 100644
--- a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
@@ -365,7 +365,8 @@ class UserSettingsGeneralTab extends React.Component {
lastName: user.last_name,
nickname: user.nickname,
position: user.position,
- email: user.email,
+ originalEmail: user.email,
+ email: '',
confirmEmail: '',
picture: null,
loadingPicture: false,
@@ -424,12 +425,28 @@ class UserSettingsGeneralTab extends React.Component {
if (this.props.user.auth_service === '') {
inputs.push(
+ <div key='currentEmailSetting'>
+ <div className='form-group'>
+ <label className='col-sm-5 control-label'>
+ <FormattedMessage
+ id='user.settings.general.currentEmail'
+ defaultMessage='Current Email'
+ />
+ </label>
+ <div className='col-sm-7'>
+ <label className='control-label'>{this.state.originalEmail}</label>
+ </div>
+ </div>
+ </div>
+ );
+
+ inputs.push(
<div key='emailSetting'>
<div className='form-group'>
<label className='col-sm-5 control-label'>
<FormattedMessage
- id='user.settings.general.primaryEmail'
- defaultMessage='Primary Email'
+ id='user.settings.general.newEmail'
+ defaultMessage='New Email'
/>
</label>
<div className='col-sm-7'>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 2a9a5cf3f..44163acbe 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2166,6 +2166,7 @@
"user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
"user.settings.general.close": "Close",
"user.settings.general.confirmEmail": "Confirm Email",
+ "user.settings.general.currentEmail": "Current Email",
"user.settings.general.email": "Email",
"user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emailGoogleCantUpdate": "Login occurs through Google. Email cannot be updated. Email address used for notifications is {email}.",
@@ -2193,13 +2194,13 @@
"user.settings.general.loginOffice365": "Login done through Office 365 ({email})",
"user.settings.general.loginSaml": "Login done through SAML ({email})",
"user.settings.general.newAddress": "New Address: {email}<br />Check your email to verify the above address.",
+ "user.settings.general.newEmail": "New Email",
"user.settings.general.nickname": "Nickname",
"user.settings.general.nicknameExtra": "Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.",
"user.settings.general.notificationsExtra": "By default, you will receive mention notifications when someone types your first name. Go to {notify} settings to change this default.",
"user.settings.general.notificationsLink": "Notifications",
"user.settings.general.position": "Position",
"user.settings.general.positionExtra": "Use Position for your role or job title. This will be shown in your profile popover.",
- "user.settings.general.primaryEmail": "Primary Email",
"user.settings.general.profilePicture": "Profile Picture",
"user.settings.general.title": "General Settings",
"user.settings.general.uploadImage": "Click 'Edit' to upload an image.",