summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings_general.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-10 08:23:31 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-10 08:23:31 -0400
commit74155b3dfaaa65e6468f912c2ce5f62b81f4b8e6 (patch)
tree21c96ea7f07d1868e6a388ae99d8066b8f29dc67 /web/react/components/user_settings_general.jsx
parentd0c8b3d656618f6efeea11d680c532381fcb81f0 (diff)
parent1f5e43b38817b8c6a3b121d6bd4447411e135f5d (diff)
downloadchat-74155b3dfaaa65e6468f912c2ce5f62b81f4b8e6.tar.gz
chat-74155b3dfaaa65e6468f912c2ce5f62b81f4b8e6.tar.bz2
chat-74155b3dfaaa65e6468f912c2ce5f62b81f4b8e6.zip
Merge pull request #631 from asaadmahmoodspin/mm-1866
MM-1866 - Adding download icon and adding download links
Diffstat (limited to 'web/react/components/user_settings_general.jsx')
-rw-r--r--web/react/components/user_settings_general.jsx26
1 files changed, 13 insertions, 13 deletions
diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx
index f2127ce0c..184534a9a 100644
--- a/web/react/components/user_settings_general.jsx
+++ b/web/react/components/user_settings_general.jsx
@@ -238,7 +238,7 @@ export default class UserSettingsGeneralTab extends React.Component {
key='firstNameSetting'
className='form-group'
>
- <label className='col-sm-5 control-label'>First Name</label>
+ <label className='col-sm-5 control-label'>{'First Name'}</label>
<div className='col-sm-7'>
<input
className='form-control'
@@ -255,7 +255,7 @@ export default class UserSettingsGeneralTab extends React.Component {
key='lastNameSetting'
className='form-group'
>
- <label className='col-sm-5 control-label'>Last Name</label>
+ <label className='col-sm-5 control-label'>{'Last Name'}</label>
<div className='col-sm-7'>
<input
className='form-control'
@@ -278,14 +278,14 @@ export default class UserSettingsGeneralTab extends React.Component {
href='#'
onClick={notifClick.bind(this)}
>
- Notifications
+ {'Notifications'}
</a>
);
const extraInfo = (
<span>
- By default, you will receive mention notifications when someone types your first name.
- Go to {notifLink} settings to change this default.
+ {'By default, you will receive mention notifications when someone types your first name. '}
+ {'Go to '} {notifLink} {'settings to change this default.'}
</span>
);
@@ -351,8 +351,8 @@ export default class UserSettingsGeneralTab extends React.Component {
const extraInfo = (
<span>
- Use Nickname for a name you might be called that is different from your first name and user name.
- This is most often used when two or more people have similar sounding names and usernames.
+ {'Use Nickname for a name you might be called that is different from your first name and user name.'}
+ {'This is most often used when two or more people have similar sounding names and usernames.'}
</span>
);
@@ -406,7 +406,7 @@ export default class UserSettingsGeneralTab extends React.Component {
</div>
);
- const extraInfo = (<span>Pick something easy for teammates to recognize and recall.</span>);
+ const extraInfo = (<span>{'Pick something easy for teammates to recognize and recall.'}</span>);
usernameSection = (
<SettingItemMax
@@ -438,13 +438,13 @@ export default class UserSettingsGeneralTab extends React.Component {
let helpText = <div>Email is used for notifications, and requires verification if changed.</div>;
if (!this.state.emailEnabled) {
- helpText = <div className='text-danger'><br />Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.</div>;
+ helpText = <div className='setting-list__hint text-danger'>{'Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.'}</div>;
}
inputs.push(
<div key='emailSetting'>
<div className='form-group'>
- <label className='col-sm-5 control-label'>Primary Email</label>
+ <label className='col-sm-5 control-label'>{'Primary Email'}</label>
<div className='col-sm-7'>
<input
className='form-control'
@@ -526,18 +526,18 @@ export default class UserSettingsGeneralTab extends React.Component {
data-dismiss='modal'
aria-label='Close'
>
- <span aria-hidden='true'>&times;</span>
+ <span aria-hidden='true'>{'×'}</span>
</button>
<h4
className='modal-title'
ref='title'
>
<i className='modal-back'></i>
- General Settings
+ {'General Settings'}
</h4>
</div>
<div className='user-settings'>
- <h3 className='tab-header'>General Settings</h3>
+ <h3 className='tab-header'>{'General Settings'}</h3>
<div className='divider-dark first'/>
{nameSection}
<div className='divider-light'/>