diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2016-11-14 13:32:55 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:32:55 -0500 |
| commit | ef080a0a10e58e46a1f65e3dd352234e7ccd5aa9 (patch) | |
| tree | 298210bae00ff3cafb4634c6d8062d21fcd51a5b /webapp/components/signup | |
| parent | a6d6880d998724028ff644754a1ccce91c77ed2c (diff) | |
| download | chat-ef080a0a10e58e46a1f65e3dd352234e7ccd5aa9.tar.gz chat-ef080a0a10e58e46a1f65e3dd352234e7ccd5aa9.tar.bz2 chat-ef080a0a10e58e46a1f65e3dd352234e7ccd5aa9.zip | |
Fix Terms and Privacy links (#4506)
* Fix Terms and Privacy links
github issue https://github.com/mattermost/platform/issues/4156
* fix eslint
* revert per request
* add missing end blank line
Diffstat (limited to 'webapp/components/signup')
| -rw-r--r-- | webapp/components/signup/components/signup_email.jsx | 6 | ||||
| -rw-r--r-- | webapp/components/signup/components/signup_ldap.jsx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx index 2d4b3f277..b67179604 100644 --- a/webapp/components/signup/components/signup_email.jsx +++ b/webapp/components/signup/components/signup_email.jsx @@ -429,9 +429,11 @@ export default class SignupEmail extends React.Component { <p> <FormattedHTMLMessage id='create_team.agreement' - defaultMessage="By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}." + defaultMessage="By proceeding to create your account and use {siteName}, you agree to our <a href='{TermsOfServiceLink}'>Terms of Service</a> and <a href='{PrivacyPolicyLink}'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}." values={{ - siteName: global.window.mm_config.SiteName + siteName: global.window.mm_config.SiteName, + TermsOfServiceLink: global.window.mm_config.TermsOfServiceLink, + PrivacyPolicyLink: global.window.mm_config.PrivacyPolicyLink }} /> </p> diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx index 8c1b1bafb..bc8c073ad 100644 --- a/webapp/components/signup/components/signup_ldap.jsx +++ b/webapp/components/signup/components/signup_ldap.jsx @@ -179,9 +179,11 @@ export default class SignupLdap extends React.Component { <p> <FormattedHTMLMessage id='create_team.agreement' - defaultMessage="By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}." + defaultMessage="By proceeding to create your account and use {siteName}, you agree to our <a href='{TermsOfServiceLink}'>Terms of Service</a> and <a href='{PrivacyPolicyLink}'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}." values={{ - siteName: global.window.mm_config.SiteName + siteName: global.window.mm_config.SiteName, + TermsOfServiceLink: global.window.mm_config.TermsOfServiceLink, + PrivacyPolicyLink: global.window.mm_config.PrivacyPolicyLink }} /> </p> |