From d7ffc21f69c5d8bf5d30a0652c826e54aedc7399 Mon Sep 17 00:00:00 2001
From: Stephanie Hobson Benefits for real life
set us apart from other companies in our industry.
{{ ftl('compare-brave-the-brave-browser-like-so', opera='href="%s" data-cta-type="link" data-cta-name="Opera"'|safe|format(url('firefox.browsers.compare.opera')), - edge='href="%s" data-cta-type="link" data-cta-name="Edge"'|safe|format(url('firefox.browsers.compare.edge'))) }}
+{{ ftl('compare-brave-the-brave-browser-like-so', opera='href="%s" data-cta-type="link"'|safe|format(url('firefox.browsers.compare.opera')), + edge='href="%s" data-cta-type="link"'|safe|format(url('firefox.browsers.compare.edge'))) }}
{{ ftl('compare-brave-brave-differentiates-itself') }}
@@ -102,9 +102,9 @@{{ ftl('compare-brave-on-the-other-side-of-the-coin', attrs='href="https://addons.mozilla.org/firefox/addon/ublock-origin/" rel="external noopener" data-cta-text="uBlock Origin" data-cta-type="link"'|safe) }}
-{{ ftl('compare-brave-there-are-a-few-of-braves', lockwise='href="%s" data-cta-type="link" data-cta-name="password manager"'|safe|format(url('firefox.features.password-manager')), +
{{ ftl('compare-brave-there-are-a-few-of-braves', lockwise='href="%s" data-cta-type="link"'|safe|format(url('firefox.features.password-manager')), extension='href="https://addons.mozilla.org/addon/https-everywhere/" rel="external noopener" data-cta-text="HTTPS Everywhere" data-cta-type="link"'|safe, - privacy='href="%s" data-cta-type="link" data-cta-name="Privacy Report"'|safe|format(url('firefox.privacy.products'))) }}
+ privacy='href="%s" data-cta-type="link"'|safe|format(url('firefox.privacy.products'))) }}{{ ftl('compare-brave-the-bottom-line-is-that-even') }}
@@ -241,7 +241,7 @@{{ ftl('compare-brave-the-firefox-browser-also-gives-v3', fallback='compare-brave-the-firefox-browser-also-gives', - accounts='href="%s" data-cta-type="link" data-cta-name="Firefox Account"'|safe|format(url('firefox.accounts')), + accounts='href="%s" data-cta-type="link"'|safe|format(url('firefox.accounts')), monitor='href="https://monitor.firefox.com/" rel="external noopener" data-cta-text="Monitor" data-cta-type="link"'|safe, breaches='href="https://monitor.firefox.com/breaches" rel="external noopener" data-cta-text="Data breaches" data-cta-type="link"'|safe ) }} @@ -250,7 +250,7 @@
{{ ftl('compare-brave-the-firefox-browser-also-gives-v2', fallback='compare-brave-the-firefox-browser-also-gives', - accounts='href="%s" data-cta-type="link" data-cta-name="Firefox Account"'|safe|format(url('firefox.accounts')), + accounts='href="%s" data-cta-type="link"'|safe|format(url('firefox.accounts')), monitor='href="https://monitor.firefox.com/" rel="external noopener" data-cta-text="Monitor" data-cta-type="link"'|safe, breaches='href="https://monitor.firefox.com/breaches" rel="external noopener" data-cta-text="Data breaches" data-cta-type="link"'|safe ) }} diff --git a/bedrock/firefox/templates/firefox/browsers/compare/chrome.html b/bedrock/firefox/templates/firefox/browsers/compare/chrome.html index bf56f4ebb69..37e8191103a 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/chrome.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/chrome.html @@ -108,7 +108,7 @@
{{ ftl('compare-chrome-weve-also-recently-restated-v2', attrs='href="%s" data-cta-type="link" data-cta-name="Privacy Notice"'|safe|format(url('privacy.notices.firefox'))) }}
+{{ ftl('compare-chrome-weve-also-recently-restated-v2', attrs='href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.firefox'))) }}
{{ ftl('compare-chrome-google-chrome-is-by-all-accounts') }}
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/edge.html b/bedrock/firefox/templates/firefox/browsers/compare/edge.html index 9edafa90542..dc32f8f3028 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/edge.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/edge.html @@ -93,7 +93,7 @@{{ ftl('compare-edge-edge-is-integrated-into-the') }}
-{{ ftl('compare-edge-at-firefox-we-pride-ourselves', fallback='compare-edge-at-firefox-our-privacy-fallback', attrs='href="%s" data-cta-type="link" data-cta-name="privacy policy"'|safe|format(url('privacy.notices.firefox'))) }}
+{{ ftl('compare-edge-at-firefox-we-pride-ourselves', fallback='compare-edge-at-firefox-our-privacy-fallback', attrs='href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.firefox'))) }}
@@ -180,7 +180,7 @@{{ ftl('compare-edge-edge-has-some-nice-ui-features') }}
-{{ ftl('compare-edge-firefox-features-a-scrolling', attrs='href="%s" data-cta-type="link" data-cta-name="Pocket feature"'|safe|format(url('firefox.pocket'))) }}
+{{ ftl('compare-edge-firefox-features-a-scrolling', attrs='href="%s" data-cta-type="link"'|safe|format(url('firefox.pocket'))) }}
{{ ftl('compare-edge-firefox-and-edge-both-offer', fallback='compare-edge-firefox-and-edge-both-offer-fallback') }}
@@ -236,7 +236,7 @@{{ ftl('compare-edge-with-internet-explorer-microsoft', fallback='compare-edge-with-internet-explorer-fallback') }}
-{{ ftl('compare-edge-firefox-has-been-available', attrs='href="%s" data-cta-type="link" data-cta-name="free account"'|safe|format(url('firefox.accounts'))) }}
+{{ ftl('compare-edge-firefox-has-been-available', attrs='href="%s" data-cta-type="link"'|safe|format(url('firefox.accounts'))) }}
{{ ftl('compare-edge-edge-also-allows-you-to-connect', fallback='compare-edge-edge-also-allows-you-to-fallback') }}
@@ -249,7 +249,7 @@{{ ftl('compare-edge-aside-from-sucking-up-a-lot', attrs='href="%s" data-cta-type="link" data-cta-name="Mozilla"'|safe|format(url('mozorg.home'))) }}
+{{ ftl('compare-edge-aside-from-sucking-up-a-lot', attrs='href="%s" data-cta-type="link"'|safe|format(url('mozorg.home'))) }}
{{ ftl('compare-edge-the-bottom-line-is-that-while') }}
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/ie.html b/bedrock/firefox/templates/firefox/browsers/compare/ie.html index 146f709f0ee..dec91923186 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/ie.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/ie.html @@ -93,14 +93,14 @@{{ ftl('compare-ie-if-you-havent-moved-on-from-using', attrs='href="https://www.telegraph.co.uk/technology/2019/02/08/stop-using-internet-explorer-warns-microsofts-security-chief/" rel="external noopener" data-cta-type="link" data-cta-name="Microsoft security chief warned"'|safe) }}
+{{ ftl('compare-ie-if-you-havent-moved-on-from-using', attrs='href="https://www.telegraph.co.uk/technology/2019/02/08/stop-using-internet-explorer-warns-microsofts-security-chief/" rel="external noopener" data-cta-type="link"'|safe) }}
{{ ftl('compare-ie-microsoft-is-no-longer-supporting') }}
-{{ ftl('compare-ie-so-whats-the-solution-if-your', fallback='compare-ie-so-whats-the-solution-if-your-fallback', lockwise='href="%s" data-cta-type="link" data-cta-name="password manager"'|safe|format(url('firefox.features.password-manager')), - privacy='href="%s" data-cta-type="link" data-cta-name="privacy policy"'|safe|format(url('privacy.notices.firefox'))) }}
+{{ ftl('compare-ie-so-whats-the-solution-if-your', fallback='compare-ie-so-whats-the-solution-if-your-fallback', lockwise='href="%s" data-cta-type="link"'|safe|format(url('firefox.features.password-manager')), + privacy='href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.firefox'))) }}
{% include '/firefox/browsers/compare/includes/download-menu-list.html' %} @@ -178,8 +178,8 @@{{ ftl('compare-ie-really-the-only-reasons-to-use') }}
- {{ ftl('compare-ie-on-the-other-end-of-the-spectrum', fallback='compare-ie-on-the-other-end-of-the-spectrum-fallback', pocket='href="%s" data-cta-type="link" data-cta-name="Pocket"'|safe|format(url('firefox.pocket')), - products='href="%s" data-cta-type="link" data-cta-name="our other Firefox products"'|safe|format(url('firefox'))) }} + {{ ftl('compare-ie-on-the-other-end-of-the-spectrum', fallback='compare-ie-on-the-other-end-of-the-spectrum-fallback', pocket='href="%s" data-cta-type="link"'|safe|format(url('firefox.pocket')), + products='href="%s" data-cta-type="link"'|safe|format(url('firefox'))) }}
{% include '/firefox/browsers/compare/includes/download-menu-list.html' %} @@ -245,7 +245,7 @@{# Download link should be locale neutral. See issue #7982 #} - {{ ftl('compare-ie-our-opinion-is-just-to-go-with', attrs='href="/firefox/download/thanks/" data-cta-type="link" data-cta-name="download Firefox"'|safe) }} + {{ ftl('compare-ie-our-opinion-is-just-to-go-with', attrs='href="/firefox/download/thanks/" data-cta-type="link"'|safe) }}
{{ ftl('compare-opera-operas-privacy-policy-lacks', fallback='compare-opera-operas-privacy-policy-lacks-fallback') }}
-{{ ftl('compare-opera-firefoxs-privacy-policy-is', attrs = 'href="%s" data-cta-type="link" data-cta-name="privacy policy"'|safe|format(url('privacy.notices.firefox'))) }}
+{{ ftl('compare-opera-firefoxs-privacy-policy-is', attrs = 'href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.firefox'))) }}
{{ ftl('compare-opera-as-far-as-actual-privacy-protections') }}
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/safari.html b/bedrock/firefox/templates/firefox/browsers/compare/safari.html index c7c6c8e2598..d8674e88c29 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/safari.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/safari.html @@ -101,7 +101,7 @@{{ ftl('compare-safari-our-private-browsing-mode', attrs='href="https://addons.mozilla.org/firefox/addon/facebook-container/" rel="external noopener" data-cta-text="Facebook Container" data-cta-type="link"'|safe) }}
-{{ ftl('compare-safari-as-far-as-security-goes-firefox', lockwise='href="%s" data-cta-type="link" data-cta-name="password manager"'|safe|format(url('firefox.features.password-manager')), monitor='href="https://monitor.firefox.com/" rel="external noopener" data-cta-text="Monitor" data-cta-type="link"'|safe) }}
+{{ ftl('compare-safari-as-far-as-security-goes-firefox', lockwise='href="%s" data-cta-type="link"'|safe|format(url('firefox.features.password-manager')), monitor='href="https://monitor.firefox.com/" rel="external noopener" data-cta-text="Monitor" data-cta-type="link"'|safe) }}
{{ ftl('compare-safari-if-you-choose-to-use-safari') }}
@@ -238,7 +238,7 @@{{ ftl('compare-safari-firefox-and-safari-both-provide') }}
-{{ ftl('compare-safari-firefox-also-offers-a-similar-updated-v3', fallback='compare-safari-firefox-also-offers-a-similar-updated', attrs = 'href="%s" data-cta-type="link" data-cta-name="Mozilla account"'|safe|format(url('firefox.accounts'))) }}
+{{ ftl('compare-safari-firefox-also-offers-a-similar-updated-v3', fallback='compare-safari-firefox-also-offers-a-similar-updated', attrs = 'href="%s" data-cta-type="link"'|safe|format(url('firefox.accounts'))) }}
{{ ftl('compare-safari-the-firefox-app-for-ios-and', ios='href="%s" rel="external noopener" data-cta-text="iOS" data-cta-type="link"'|safe|format(app_store_url('firefox')), android='href="%s" rel="external noopener" data-cta-text="Android" data-cta-type="link"'|safe|format(play_store_url('firefox'))) }}
diff --git a/docs/attribution/0001-analytics.rst b/docs/attribution/0001-analytics.rst index 2e7966f4dcd..7fb0e24c691 100644 --- a/docs/attribution/0001-analytics.rst +++ b/docs/attribution/0001-analytics.rst @@ -169,6 +169,21 @@ For all generic CTA links and ``