Skip to content

Commit a9424a6

Browse files
authored
Merge pull request matrix-org#2643 from matrix-org/travis/settings/credits
Add credit for cover photo usage
2 parents ae945ea + 37d1191 commit a9424a6

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

src/components/views/settings/tabs/HelpSettingsTab.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,26 @@ export default class HelpSettingsTab extends React.Component {
126126
);
127127
}
128128

129+
_renderCredits() {
130+
// Note: This is not translated because it is legal text.
131+
// Also,   is ugly but necessary.
132+
return (
133+
<div className='mx_SettingsTab_section'>
134+
<span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
135+
<ul>
136+
<li>
137+
The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noopener" target="_blank">
138+
default cover photo</a> is (C)&nbsp;
139+
<a href="https://www.flickr.com/golan" rel="noopener" target="_blank">Jesús Roncero</a>&nbsp;
140+
used under the terms of&nbsp;
141+
<a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noopener" target="_blank">
142+
CC-BY-SA 4.0</a>. No warranties are given.
143+
</li>
144+
</ul>
145+
</div>
146+
);
147+
}
148+
129149
render() {
130150
let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
131151
'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noopener' target='_blank'>{sub}</a>,
@@ -211,6 +231,7 @@ export default class HelpSettingsTab extends React.Component {
211231
</div>
212232
</div>
213233
{this._renderLegal()}
234+
{this._renderCredits()}
214235
<div className='mx_SettingsTab_section mx_HelpSettingsTab_versions'>
215236
<span className='mx_SettingsTab_subheading'>{_t("Advanced")}</span>
216237
<div className='mx_SettingsTab_subsectionText'>

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@
528528
"Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
529529
"Deactivate Account": "Deactivate Account",
530530
"Legal": "Legal",
531+
"Credits": "Credits",
531532
"For help with using Riot, click <a>here</a>.": "For help with using Riot, click <a>here</a>.",
532533
"For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.",
533534
"Chat with Riot Bot": "Chat with Riot Bot",

0 commit comments

Comments
 (0)