Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1929 from matrix-org/luke/cookie-bar-update

Browse Source 
Cookie bar update
This commit is contained in:
Luke Barnard 2018-05-24 17:19:05 +01:00 committed by GitHub
commit 033b110f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/views/globals/CookieBar.js
View File

@ -54,9 +54,9 @@ export default class CookieBar extends React.Component {
<img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning" /> <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning" />
<div className="mx_MatrixToolbar_content"> <div className="mx_MatrixToolbar_content">
{ this.props.policyUrl ? _t( { this.props.policyUrl ? _t(
"Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? " + "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
"This will use a cookie. " + "This will use a cookie " +
"(See our <PolicyLink>cookie and privacy policies</PolicyLink>).", "(please see our <PolicyLink>Cookie Policy</PolicyLink>).",
{}, {},
{ {
'UsageDataLink': (sub) => <a 'UsageDataLink': (sub) => <a
@ -76,10 +76,23 @@ export default class CookieBar extends React.Component {
</a> </a>
, ,
}, },
) : _t("Help improve Riot by sending usage data? This will use a cookie.") } ) : _t(
"Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
"This will use a cookie.",
{},
{
'UsageDataLink': (sub) => <a
className="mx_MatrixToolbar_link"
href="javascript:;"
onClick={this.onUsageDataClicked}
>
{ sub }
</a>,
},
) }
</div> </div>
<AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}> <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
{ _t("Yes please") } { _t("Yes, I want to help!") }
</AccessibleButton> </AccessibleButton>
<AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}> <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
<img src="img/cancel.svg" width="18" height="18" /> <img src="img/cancel.svg" width="18" height="18" />

6
src/i18n/strings/en_EN.json
View File

@ -636,9 +636,9 @@
"Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.", "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
"Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.", "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
"You're not currently a member of any communities.": "You're not currently a member of any communities.", "You're not currently a member of any communities.": "You're not currently a member of any communities.",
"Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).", "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
"Help improve Riot by sending usage data? This will use a cookie.": "Help improve Riot by sending usage data? This will use a cookie.", "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
"Yes please": "Yes please", "Yes, I want to help!": "Yes, I want to help!",
"You are not receiving desktop notifications": "You are not receiving desktop notifications", "You are not receiving desktop notifications": "You are not receiving desktop notifications",
"Enable them now": "Enable them now", "Enable them now": "Enable them now",
"What's New": "What's New", "What's New": "What's New",