* Fix Terms and Privacy links

github issue https://github.com/mattermost/platform/issues/4156

* fix eslint

* revert per request

* add missing end blank line
Этот коммит содержится в:
Carlos Tadeu Panato Junior
2016-11-14 13:32:55 +01:00
коммит произвёл Christopher Speller
родитель a6d6880d99
Коммит ef080a0a10
3 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@@ -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>

Просмотреть файл

@@ -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>