Merge pull request #2136 from matrix-org/dbkr/tnclinks

Render terms & conditions in settings
This commit is contained in:
David Baker 2018-08-24 14:44:30 +01:00 committed by GitHub
commit 30114e3b5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View file

@ -921,6 +921,25 @@ module.exports = React.createClass({
</div>; </div>;
}, },
_renderTermsAndConditionsLinks: function() {
if (SdkConfig.get().terms_and_conditions_links) {
const tncLinks = [];
for (const tncEntry of SdkConfig.get().terms_and_conditions_links) {
tncLinks.push(<div key={tncEntry.url}>
<a href={tncEntry.url} rel="noopener" target="_blank">{tncEntry.text}</a>
</div>);
}
return <div>
<h3>{ _t("Legal") }</h3>
<div className="mx_UserSettings_section">
{tncLinks}
</div>
</div>;
} else {
return null;
}
},
_renderClearCache: function() { _renderClearCache: function() {
return <div> return <div>
<h3>{ _t("Clear Cache") }</h3> <h3>{ _t("Clear Cache") }</h3>
@ -1407,6 +1426,8 @@ module.exports = React.createClass({
{ this._renderDeactivateAccount() } { this._renderDeactivateAccount() }
{ this._renderTermsAndConditionsLinks() }
</GeminiScrollbarWrapper> </GeminiScrollbarWrapper>
</div> </div>
); );

View file

@ -1117,6 +1117,7 @@
"Lazy loading members not supported": "Lazy loading members not supported", "Lazy loading members not supported": "Lazy loading members not supported",
"Lazy loading is not supported by your current homeserver.": "Lazy loading is not supported by your current homeserver.", "Lazy loading is not supported by your current homeserver.": "Lazy loading is not supported by your current homeserver.",
"Deactivate my account": "Deactivate my account", "Deactivate my account": "Deactivate my account",
"Legal": "Legal",
"Clear Cache": "Clear Cache", "Clear Cache": "Clear Cache",
"Clear Cache and Reload": "Clear Cache and Reload", "Clear Cache and Reload": "Clear Cache and Reload",
"Updates": "Updates", "Updates": "Updates",