summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorjoannekoong <joannekoong@college.harvard.edu>2017-02-20 11:28:31 -0500
committerenahum <nahumhbl@gmail.com>2017-02-20 13:28:31 -0300
commitbf10b27b26034490b303d01e89929dae8fe005eb (patch)
tree9920fcfc39503260a068f729fad62ef0875d5aa2 /webapp
parent623560481b4bce2b87f19765455a461c7a504e31 (diff)
downloadchat-bf10b27b26034490b303d01e89929dae8fe005eb.tar.gz
chat-bf10b27b26034490b303d01e89929dae8fe005eb.tar.bz2
chat-bf10b27b26034490b303d01e89929dae8fe005eb.zip
Update System Console > Privacy help texts (#5470)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/privacy_settings.jsx4
-rw-r--r--webapp/i18n/en.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/privacy_settings.jsx b/webapp/components/admin_console/privacy_settings.jsx
index ef88a5fa1..6da9e6c4f 100644
--- a/webapp/components/admin_console/privacy_settings.jsx
+++ b/webapp/components/admin_console/privacy_settings.jsx
@@ -56,7 +56,7 @@ export default class PrivacySettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.privacy.showEmailDescription'
- defaultMessage='When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.'
+ defaultMessage='When false, hides the email address of members from everyone except System Administrators.'
/>
}
value={this.state.showEmailAddress}
@@ -73,7 +73,7 @@ export default class PrivacySettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.privacy.showFullNameDescription'
- defaultMessage='When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.'
+ defaultMessage='When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.'
/>
}
value={this.state.showFullName}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 894865bf7..f68763cc7 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -565,9 +565,9 @@
"admin.password.requirementsDescription": "Character types required in a valid password.",
"admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
"admin.password.uppercase": "At least one uppercase letter",
- "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
+ "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
"admin.privacy.showEmailTitle": "Show Email Address: ",
- "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.",
+ "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
"admin.privacy.showFullNameTitle": "Show Full Name: ",
"admin.purge.button": "Purge All Caches",
"admin.purge.loading": " Loading...",