summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorparanbaram <paranbaram@gmail.com>2016-08-23 03:16:38 +0900
committerHarrison Healey <harrisonmhealey@gmail.com>2016-08-22 14:16:38 -0400
commitffff24e6254494aa1b35354034047b4cf98ef504 (patch)
treebe67fbd6ac2935140e21079ab98b099fc0c632ab /webapp/components/user_settings
parentec5f9d78892a53d7ae01430261e86ddfd8d4aa00 (diff)
downloadchat-ffff24e6254494aa1b35354034047b4cf98ef504.tar.gz
chat-ffff24e6254494aa1b35354034047b4cf98ef504.tar.bz2
chat-ffff24e6254494aa1b35354034047b4cf98ef504.zip
Change en.json : PLT-3371 (#3825)
* Change en.json : PLT-3371 * Change jsx files for UI text * Change jsx files for UI text
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx2
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 814773344..cc63e4fbf 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -330,7 +330,7 @@ class UserSettingsGeneralTab extends React.Component {
<div className='setting-list__hint text-danger'>
<FormattedMessage
id='user.settings.general.emailHelp2'
- defaultMessage='Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.'
+ defaultMessage='Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.'
/>
</div>
);
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 17abfa555..e393bea03 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -365,7 +365,7 @@ export default class NotificationsTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.push_notification.disabled'
- defaultMessage='Disabled by system administrator'
+ defaultMessage='Disabled by System Administrator'
/>
);
} else {