Skip to content

Commit

Permalink
MM-15747 Add missing Terms of Service link from System console (matte…
Browse files Browse the repository at this point in the history
…rmost#2844)

* MM-15747 Add missing Terms of Service link fro System console customization section

* Feedback review
  • Loading branch information
enahum committed May 24, 2019
1 parent e7bbd06 commit 4f517dd
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
16 changes: 12 additions & 4 deletions components/admin_console/admin_definition.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ export default {
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'SupportSettings.HelpLink',
label: t('admin.support.helpTitle'),
label_default: 'Help link:',
label_default: 'Help Link:',
help_text: t('admin.support.helpDesc'),
help_text_default: '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.',
},
Expand All @@ -1411,27 +1411,35 @@ export default {
help_text: t('admin.support.emailHelp'),
help_text_default: 'Email address displayed on email notifications and during tutorial for end users to ask support questions.',
},
{
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'SupportSettings.TermsOfServiceLink',
label: t('admin.support.termsTitle'),
label_default: 'Terms of Service Link:',
help_text: t('admin.support.termsDesc'),
help_text_default: '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.',
},
{
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'SupportSettings.PrivacyPolicyLink',
label: t('admin.support.privacyTitle'),
label_default: 'Privacy Policy link:',
label_default: 'Privacy Policy Link:',
help_text: t('admin.support.privacyDesc'),
help_text_default: '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.',
},
{
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'SupportSettings.AboutLink',
label: t('admin.support.aboutTitle'),
label_default: 'About link:',
label_default: 'About Link:',
help_text: t('admin.support.aboutDesc'),
help_text_default: '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.',
},
{
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'SupportSettings.ReportAProblemLink',
label: t('admin.support.problemTitle'),
label_default: 'Report a Problem link:',
label_default: 'Report a Problem Link:',
help_text: t('admin.support.problemDesc'),
help_text_default: '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.',
},
Expand Down
10 changes: 6 additions & 4 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1358,22 +1358,24 @@
"admin.sql.traceDescription": "(Development Mode) When true, executing SQL statements are written to the log.",
"admin.sql.traceTitle": "SQL Statement Logging: ",
"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.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.enableTermsOfServiceHelp": "When true, new users must accept the terms of service before accessing any Mattermost teams on desktop, web or mobile. Existing users must accept them after login or a page refresh.\n \nTo update terms of service link displayed in account creation and login pages, go to [Site Configuration > Customization](../site_config/customization).",
"admin.support.enableTermsOfServiceTitle": "Enable Custom Terms of Service:",
"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.helpTitle": "Help Link:",
"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.privacyTitle": "Privacy Policy Link:",
"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.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.termsOfServiceReAcceptanceHelp": "The number of days before Terms of Service acceptance expires, and the terms must be re-accepted.",
"admin.support.termsOfServiceReAcceptanceTitle": "Re-Acceptance Period:",
"admin.support.termsOfServiceTextHelp": "Text that will appear in your custom Terms of Service. Supports Markdown-formatted text.",
"admin.support.termsOfServiceTextTitle": "Custom Terms of Service Text:",
"admin.support.termsOfServiceTitle": "Custom Terms of Service (Beta)",
"admin.support.termsTitle": "Terms of Service Link:",
"admin.system_users.allUsers": "All Users",
"admin.system_users.inactive": "Inactive",
"admin.system_users.noTeams": "No Teams",
Expand Down

0 comments on commit 4f517dd

Please sign in to comment.