From 24aeda2e05eed18d836df8d809abb75ff994edcc Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 24 May 2018 16:52:04 +0100
Subject: [PATCH 1/2] Fix bug where usage data link not visible when no cookie
 policy url

---
 src/components/views/globals/CookieBar.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index ad00884dd2..82ac598532 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -76,7 +76,20 @@ export default class CookieBar extends React.Component {
                                 </a>
                             ,
                         },
-                    ) : _t("Help improve Riot by sending usage data? This will use a cookie.") }
+                    ) : _t(
+                        "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? " +
+                        "This will use a cookie.",
+                        {},
+                        {
+                            'UsageDataLink': (sub) => <a
+                                className="mx_MatrixToolbar_link"
+                                href="javascript:;"
+                                onClick={this.onUsageDataClicked}
+                            >
+                                { sub }
+                            </a>,
+                        },
+                    ) }
                 </div>
                 <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
                     { _t("Yes please") }

From fd8d50173207696fda5e2f01726ec48f048ed91a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 24 May 2018 16:58:14 +0100
Subject: [PATCH 2/2] Update cookie bar wording

---
 src/components/views/globals/CookieBar.js | 10 +++++-----
 src/i18n/strings/en_EN.json               |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index 82ac598532..a63a163dd1 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -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" />
                 <div className="mx_MatrixToolbar_content">
                     { this.props.policyUrl ? _t(
-                        "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>).",
                         {},
                         {
                             'UsageDataLink': (sub) => <a
@@ -77,7 +77,7 @@ export default class CookieBar extends React.Component {
                             ,
                         },
                     ) : _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.",
                         {},
                         {
@@ -92,7 +92,7 @@ export default class CookieBar extends React.Component {
                     ) }
                 </div>
                 <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
-                    { _t("Yes please") }
+                    { _t("Yes, I want to help!") }
                 </AccessibleButton>
                 <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
                     <img src="img/cancel.svg" width="18" height="18" />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f1780425..e20b277ef2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -636,9 +636,9 @@
     "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.",
     "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>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Help improve Riot by sending usage data? This will use a cookie.",
-    "Yes please": "Yes please",
+    "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>).",
+    "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, I want to help!": "Yes, I want to help!",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",
     "Enable them now": "Enable them now",
     "What's New": "What's New",