Update legal and support help texts (mattermost#6407)

* Update legal_and_support_settings.jsx * Update en.json * Update en.json * Update legal_and_support_settings.jsx
koox00 · May 18, 2017 · 002f002 · 002f002
1 parent d762d29
commit 002f002
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/components/admin_console/legal_and_support_settings.jsx b/components/admin_console/legal_and_support_settings.jsx
@@ -79,7 +79,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
  helpText={
  <FormattedMessage
  id='admin.support.privacyDesc'
- defaultMessage='Link to Privacy Policy available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.'
+ defaultMessage='The URL for the Privacy link on the login and sign-up pages. If this field is empty, the Privacy link is hidden from users.'
  />
  }
  value={this.state.privacyPolicyLink}
@@ -96,7 +96,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
  helpText={
  <FormattedMessage
  id='admin.support.aboutDesc'
- defaultMessage='Link to About page for more information on your Mattermost deployment, for example its purpose and audience within your organization. Defaults to Mattermost information page.'
+ defaultMessage='The URL for the About link on the Mattermost login and sign-up pages. If this field is empty, the About link is hidden from users.'
  />
  }
  value={this.state.aboutLink}
@@ -113,7 +113,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
  helpText={
  <FormattedMessage
  id='admin.support.helpDesc'
- defaultMessage='Link to help documentation from team site main menu. Typically not changed unless your organization chooses to create custom documentation.'
+ defaultMessage='The URL for the Help link on the Mattermost login page, sign-up pages, and Main Menu. If this field is empty, the Help link is hidden from users.'
  />
  }
  value={this.state.helpLink}
@@ -130,7 +130,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
  helpText={
  <FormattedMessage
  id='admin.support.problemDesc'
- defaultMessage='Link to help documentation from team site main menu. By default this points to the peer-to-peer troubleshooting forum where users can search for, find and request help with technical issues.'
+ defaultMessage='The URL for the Report a Problem link in the Main Menu. If this field is empty, the link is removed from the Main Menu.'
  />
  }
  value={this.state.reportAProblemLink}

diff --git a/i18n/en.json b/i18n/en.json
@@ -828,17 +828,17 @@
  "admin.sql.traceDescription": "(Development Mode) When true, executing SQL statements are written to the log.",
  "admin.sql.traceTitle": "Trace: ",
  "admin.sql.warning": "Warning: regenerating this salt may cause some columns in the database to return empty results.",
- "admin.support.aboutDesc": "Link to About page for more information on your Mattermost deployment, for example its purpose and audience within your organization. Defaults to Mattermost information page.",
+ "admin.support.aboutDesc": "The URL for the About link on the Mattermost login and sign-up pages. If this field is empty, the About link is hidden from users.",
  "admin.support.aboutTitle": "About link:",
  "admin.support.emailHelp": "Email address displayed on email notifications and during tutorial for end users to ask support questions.",
  "admin.support.emailTitle": "Support Email:",
- "admin.support.helpDesc": "Link to help documentation from team site main menu. Typically not changed unless your organization chooses to create custom documentation.",
+ "admin.support.helpDesc": "The URL for the Help link on the Mattermost login page, sign-up pages, and Main Menu. If this field is empty, the Help link is hidden from users.",
  "admin.support.helpTitle": "Help link:",
  "admin.support.noteDescription": "If linking to an external site, URLs should begin with https:// or https://.",
  "admin.support.noteTitle": "Note:",
- "admin.support.privacyDesc": "Link to Privacy Policy available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.",
+ "admin.support.privacyDesc": "The URL for the Privacy link on the login and sign-up pages. If this field is empty, the Privacy link is hidden from users.",
  "admin.support.privacyTitle": "Privacy Policy link:",
- "admin.support.problemDesc": "Link to help documentation from team site main menu. By default this points to the peer-to-peer troubleshooting forum where users can search for, find and request help with technical issues.",
+ "admin.support.problemDesc": "The URL for the Report a Problem link in the Main Menu. If this field is empty, the link is removed from the Main Menu.",
  "admin.support.problemTitle": "Report a Problem link:",
  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
  "admin.support.termsTitle": "Terms of Service link:",