From 242f61b81e6a2067316f86a41c589f6d0c5873ea Mon Sep 17 00:00:00 2001 From: Stephanie Hobson Date: Mon, 29 Jul 2024 20:26:59 -0700 Subject: [PATCH] Update analytics documentation, and reflect docs in code remove mixed data-cta and data-link remove UA dataLayer pushes Remove or rename unused UA data attributes doc updates --- .../includes/banners/fundraiser.html | 2 +- .../includes/protocol/footer/footer.html | 72 +-- .../protocol/navigation/menus/firefox.html | 16 +- .../protocol/navigation/menus/innovation.html | 8 +- .../protocol/navigation/menus/products.html | 16 +- .../protocol/navigation/menus/whoweare.html | 16 +- .../includes/protocol/navigation/nav-cta.html | 2 +- .../protocol/navigation/navigation.html | 2 +- bedrock/base/templates/macros-protocol.html | 4 +- bedrock/base/templates/macros.html | 3 +- .../templates/product-all-unified-macros.html | 4 +- bedrock/base/tests/test_macros.py | 6 +- .../careers/templates/careers/benefits.html | 2 +- bedrock/careers/templates/careers/home.html | 10 +- .../careers/templates/careers/locations.html | 2 +- bedrock/careers/templates/careers/teams.html | 2 +- bedrock/contentful/api.py | 2 +- .../templates/includes/contentful/cta.html | 10 +- bedrock/contentful/tests/data.py | 2 +- .../contentful/tests/test_contentful_api.py | 9 +- .../templates/firefox/all-unified.html | 6 +- .../firefox/browsers/browser-history.html | 6 +- .../firefox/browsers/chromebook.html | 4 +- .../firefox/browsers/compare/brave.html | 4 +- .../firefox/browsers/compare/edge.html | 4 +- .../firefox/browsers/compare/index.html | 2 +- .../firefox/browsers/compare/opera.html | 4 +- .../firefox/browsers/compare/safari.html | 4 +- .../firefox/browsers/mobile/index.html | 14 +- .../firefox/browsers/what-is-a-browser.html | 4 +- .../challenge-the-default/landing-base.html | 6 +- .../templates/firefox/channel/desktop.html | 4 +- .../templates/firefox/developer/index.html | 10 +- .../firefox/developer/whatsnew-mdnplus.html | 4 +- .../firefox/family/includes/agreement.html | 2 +- .../family/includes/download-firefox.html | 4 +- .../firefox/family/includes/modules/faq.html | 32 +- .../firefox/family/includes/resources.html | 2 +- bedrock/firefox/templates/firefox/faq.html | 6 +- .../firefox/features/includes/subnav.html | 8 +- .../templates/firefox/features/index.html | 2 +- .../templates/firefox/features/translate.html | 2 +- .../templates/firefox/includes/macros.html | 2 +- bedrock/firefox/templates/firefox/index.html | 20 +- .../templates/firefox/new/basic/thanks.html | 6 +- .../new/desktop/download-ms-store.html | 6 +- .../firefox/new/desktop/download.html | 24 +- .../templates/firefox/new/desktop/thanks.html | 12 +- .../templates/firefox/nightly/firstrun.html | 6 +- .../templates/firefox/nightly/whatsnew.html | 2 +- .../firefox/nothing-personal/index.html | 4 +- bedrock/firefox/templates/firefox/pocket.html | 4 +- .../firefox/set-as-default/landing.html | 2 +- bedrock/firefox/templates/firefox/switch.html | 6 +- .../templates/firefox/welcome/page1.html | 2 +- .../templates/firefox/welcome/page10.html | 2 +- .../templates/firefox/welcome/page11.html | 2 +- .../templates/firefox/welcome/page12.html | 2 +- .../templates/firefox/welcome/page13.html | 2 +- .../templates/firefox/welcome/page14.html | 2 +- .../firefox/welcome/page15/base.html | 4 +- .../templates/firefox/welcome/page16.html | 2 +- .../firefox/welcome/page17/page17-a.html | 2 +- .../firefox/welcome/page17/page17-c.html | 2 +- .../templates/firefox/welcome/page18.html | 4 +- .../templates/firefox/welcome/page2.html | 4 +- .../templates/firefox/welcome/page4.html | 2 +- .../templates/firefox/welcome/page6.html | 2 +- .../templates/firefox/welcome/page8.html | 10 +- .../templates/firefox/welcome/page9.de.html | 2 +- .../templates/firefox/welcome/page9.fr.html | 2 +- .../whatsnew/includes/mofo-donate-cta.html | 2 +- .../firefox/whatsnew/whatsnew-fx125-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx125-na.html | 4 +- .../firefox/whatsnew/whatsnew-fx126-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx126-na.html | 2 +- .../whatsnew/whatsnew-fx126beta-de.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-CA.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-GB.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-US.html | 2 +- .../whatsnew/whatsnew-fx126beta-fr.html | 2 +- .../firefox/whatsnew/whatsnew-fx127-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx127-na.html | 2 +- .../whatsnew/whatsnew-fx128-eu-addons.html | 2 +- .../whatsnew/whatsnew-fx128-eu-donate.html | 2 +- .../firefox/whatsnew/whatsnew-fx128-na.html | 2 +- .../firefox/whatsnew/whatsnew-fx129-na.html | 4 +- .../2021/includes/modal-blog.html | 18 +- .../foundation/annualreport/2021/index.html | 26 +- .../mozorg/templates/mozorg/about/index.html | 2 +- .../templates/mozorg/about/manifesto.html | 4 +- .../templates/mozorg/home/home-new.html | 16 +- .../mozorg/home/includes/ctd-promo-de.html | 4 +- .../mozorg/home/includes/featured-vpn.html | 2 +- .../home/includes/mofo-donate-promo.html | 2 +- .../includes/mozilla-account-promo.html | 2 +- bedrock/mozorg/tests/test_helper_misc.py | 4 +- .../templates/newsletter/includes/form.html | 2 +- .../newsletter/opt-out-confirmation.html | 8 +- .../pocket/firefox/new-tab-learn-more.html | 2 +- bedrock/pocket/templates/pocket/home.html | 2 +- .../templates/pocket/pocket-and-firefox.html | 4 +- .../products/templates/products/landing.html | 32 +- .../templates/products/mozsocial/invite.html | 2 +- .../templates/products/vpn/download.html | 22 +- .../templates/products/vpn/features.html | 16 +- .../products/vpn/includes/macros.html | 20 +- .../products/vpn/includes/subnav-refresh.html | 8 +- .../products/vpn/landing-refresh.html | 6 +- .../templates/products/vpn/landing.html | 12 +- .../products/vpn/pricing-refresh.html | 8 +- .../templates/products/vpn/pricing.html | 2 +- .../vpn/resource-center/base-article.html | 4 +- bedrock/products/tests/test_helper_misc.py | 12 +- docs/abtest.rst | 10 - docs/attribution/0001-analytics.rst | 495 ++++++++---------- docs/attribution/0004-mozilla-accounts.rst | 2 +- docs/l10n.rst | 2 +- docs/mozilla-accounts.rst | 2 +- media/js/base/banners/mozilla-banner.es6.js | 7 - media/js/base/core-datalayer-init.js | 5 - .../base/protocol/init-lang-switcher.es6.js | 6 - media/js/base/send-to-device.es6.js | 6 - .../all/all-downloads-unified-init.es6.js | 6 - .../challenge-the-default.es6.js | 28 - media/js/firefox/family/banner.es6.js | 7 - .../firefox/new/common/thanks-direct.es6.js | 12 - media/js/firefox/new/desktop/download.js | 6 - media/js/firefox/set-as-default/thanks.js | 15 - media/js/firefox/share-page.es6.js | 7 - media/js/firefox/welcome/welcome6.es6.js | 6 - media/js/firefox/welcome/welcome8.js | 12 - media/js/firefox/whatsnew/whatsnew-125-eu.js | 28 - media/js/firefox/whatsnew/whatsnew-125-na.js | 28 - media/js/firefox/whatsnew/whatsnew-126.js | 28 - media/js/firefox/whatsnew/whatsnew-126beta.js | 28 - media/js/firefox/whatsnew/whatsnew-127-eu.js | 28 - media/js/firefox/whatsnew/whatsnew-127-na.js | 28 - media/js/newsletter/newsletter-init.es6.js | 5 - .../vpn/landing-experiment-headlines.es6.js | 15 - .../vpn/resource-center-article.es6.js | 6 - .../spec/firefox/all/all-downloads-unified.js | 2 +- 142 files changed, 584 insertions(+), 990 deletions(-) diff --git a/bedrock/base/templates/includes/banners/fundraiser.html b/bedrock/base/templates/includes/banners/fundraiser.html index a6c8b2d65ad..e0fb8e39d33 100644 --- a/bedrock/base/templates/includes/banners/fundraiser.html +++ b/bedrock/base/templates/includes/banners/fundraiser.html @@ -70,6 +70,6 @@

{{ title }}

{{ tagline }}

- {{ button }} + {{ button }} {% endcall %} {% endblock %} diff --git a/bedrock/base/templates/includes/protocol/footer/footer.html b/bedrock/base/templates/includes/protocol/footer/footer.html index b35d9204873..8938b9b16f1 100644 --- a/bedrock/base/templates/includes/protocol/footer/footer.html +++ b/bedrock/base/templates/includes/protocol/footer/footer.html @@ -10,7 +10,7 @@

- {% set moco_link = 'href="%s" data-link-type="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %} - {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-type="footer" data-link-text="Mozilla Foundation"'|safe %} + {% set moco_link = 'href="%s" data-link-position="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %} + {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-position="footer" data-link-text="Mozilla Foundation"'|safe %} {{ ftl('footer-visit-mozilla-corporations', moco_link=moco_link, mofo_link=mofo_link) }}
{{ ftl('footer-portions-of-this-content', url=url('foundation.licensing.website-content'), current_year=current_year|string) }}

diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html b/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html index b87e73963d6..5e86dba43f7 100644 --- a/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html +++ b/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html @@ -15,7 +15,7 @@ -

{{ ftl('navigation-v2-view-all-firefox-browsers') }}

+

{{ ftl('navigation-v2-view-all-firefox-browsers') }}

diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html b/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html index fd7e2e14aea..fa11b398a31 100644 --- a/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html +++ b/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html @@ -15,7 +15,7 @@ {% else %} {% endif %} diff --git a/bedrock/base/tests/test_macros.py b/bedrock/base/tests/test_macros.py index f56326aa40e..826b274053c 100644 --- a/bedrock/base/tests/test_macros.py +++ b/bedrock/base/tests/test_macros.py @@ -27,9 +27,9 @@ def inner_html(el): EXPECTED_NAV_HTML = { "title_text": """Testing title""", "title_icon": """""", - "title_link": """""", - "current_link": """ Testing current link """, # noqa: E501 - "regular_link": """ Testing link """, + "title_link": """""", + "current_link": """ Testing current link """, # noqa: E501 + "regular_link": """ Testing link """, "is_summary": """is-summary""", "is_details_default_closed": """is-details is-closed""", } diff --git a/bedrock/careers/templates/careers/benefits.html b/bedrock/careers/templates/careers/benefits.html index 324c7db9d79..39c79a10a07 100644 --- a/bedrock/careers/templates/careers/benefits.html +++ b/bedrock/careers/templates/careers/benefits.html @@ -16,7 +16,7 @@

Benefits for real life

set us apart from other companies in our industry.

- See our open roles + See our open roles

diff --git a/bedrock/careers/templates/careers/home.html b/bedrock/careers/templates/careers/home.html index b0acffd7cad..e4b24db5085 100644 --- a/bedrock/careers/templates/careers/home.html +++ b/bedrock/careers/templates/careers/home.html @@ -165,7 +165,7 @@

- Read more + Read more

@@ -266,7 +266,7 @@

- Read more about our benefits + Read more about our benefits

@@ -276,7 +276,7 @@

See yourself on one of our teams?

- Find your role + Find your role

@@ -379,7 +379,7 @@

- View all teams + View all teams

@@ -410,7 +410,7 @@

- Read more about the future of work at Mozilla + Read more about the future of work at Mozilla

diff --git a/bedrock/careers/templates/careers/locations.html b/bedrock/careers/templates/careers/locations.html index 5c97f6df8c2..7d652139a4c 100644 --- a/bedrock/careers/templates/careers/locations.html +++ b/bedrock/careers/templates/careers/locations.html @@ -15,7 +15,7 @@

We’ll meet you where you are — office optional choose where they do it.

- Read more about how we work + Read more about how we work
diff --git a/bedrock/careers/templates/careers/teams.html b/bedrock/careers/templates/careers/teams.html index cfd23a0f299..6077c2430fd 100644 --- a/bedrock/careers/templates/careers/teams.html +++ b/bedrock/careers/templates/careers/teams.html @@ -15,7 +15,7 @@

Meet Mozilla’s teams

builders and creators working together to keep the internet open and accessible to all.

- See our open roles + See our open roles
diff --git a/bedrock/contentful/api.py b/bedrock/contentful/api.py index 67a9ba5903a..edddeb5463e 100644 --- a/bedrock/contentful/api.py +++ b/bedrock/contentful/api.py @@ -296,7 +296,7 @@ def render(self, node): rel = ' rel="external noopener"' # add analytics cta_text = _make_plain_text(node) - data_cta = f' data-cta-type="link" data-cta-text="{cta_text}"' + data_cta = f' data-cta-text="{cta_text}"' return f'{self._render_content(node)}' diff --git a/bedrock/contentful/templates/includes/contentful/cta.html b/bedrock/contentful/templates/includes/contentful/cta.html index 5d4397e0bdb..b0703798fcb 100644 --- a/bedrock/contentful/templates/includes/contentful/cta.html +++ b/bedrock/contentful/templates/includes/contentful/cta.html @@ -16,7 +16,7 @@ {% elif action == 'Explore Firefox' %} - {{ label }} + {{ label }} {% elif action == 'Create a Firefox Account' %} @@ -30,18 +30,18 @@ {% elif action == 'Get Pocket' %} - {{ label }} + {{ label }} {% elif action == 'Get Mozilla VPN' %} - {{ label }} + {{ label }} {% elif action == 'Try Relay' %} - {{ label }} + {{ label }} {% elif action == 'Get MDN Plus' %} - {{ label }} + {{ label }} {% endif %} diff --git a/bedrock/contentful/tests/data.py b/bedrock/contentful/tests/data.py index 23dd9e00899..91b0f4ce14f 100644 --- a/bedrock/contentful/tests/data.py +++ b/bedrock/contentful/tests/data.py @@ -27,7 +27,7 @@ "entries": [ { "component": "text", - "body": '

Virtual private networks (VPNs) and secure web proxies are solutions for better privacy and security online, but it can be confusing to figure out which one is right for you. Here\u2019s a look at how these services protect you and how to choose the best option for when you\u2019re online.

\n

Stop ISPs from spying on you

\n

When you use Firefox, Enhanced Tracking Protection automatically blocks many third party web trackers from following you around the web. But here\u2019s an interesting fact: your internet service provider (ISP) that you are paying for an internet connection \u2014 can still observe and track you.

\n

Because your internet traffic moves to and from your devices (computer, phone, tv, tablet) through your ISP, they can see where you go online. An ISP can see what sites you visit, how long you\u2019re on them, your location and information about your devices. An ISP may not know the specifics of what you did on those sites (like what you bought, searched for or read) thanks to encryption, but they could make inferences about you based on the sites that you visited. That personal data can be used to create detailed profiles about you. Why would ISPs do that? In short: this data is valuable.

\n

ISPs can use this information for their own ad targeting or for monetization opportunities that could include sharing your information with third parties interested in data mining, marketing and targeted advertising, which means less privacy and more tracking. Browsing in private mode doesn\u2019t prevent ISPs from seeing where you go online. But sending your web traffic through a web proxy or VPN can make it much harder.

\n

When should you choose a VPN or a secure proxy?

\n

VPNs and secure web proxies have shared goals: they secure connections. They can, and do, mask your original IP address and protect web traffic that you send between you and your VPN or secure proxy provider. But when would you want to use a VPN vs a proxy?

\n\n\n

Secure web proxy: browser-level protection

\n

A secure web proxy works for tasks that you might do only in your browser. This can amount to a lot of activity like shopping, paying bills, logging into social media and reading emails. A secure web proxy serves as an intermediary between your browser and the internet. Your web browsing data will pass through a secure tunnel to the internet directly from your browser, masking your IP address, so the web server you are contacting doesn\u2019t know exactly where you are in the world. And that makes you harder to track and target.

\n

A proxy is useful when you\u2019re browsing the web on a public WiFi. When a proxy is enabled, it will stop eavesdroppers on the same network from spying on your browsing activity or reading your transactions on unencrypted sites. It sounds harmless, but public WiFi networks can be like a backdoor for hackers.

\n

Firefox Private Network is an easy to install browser extension that provides a secure, encrypted tunnel to the web to protect your browser connection anywhere you use Firefox. It\'s fast and easy to turn on whenever you need it for extra security in your browser

\n

VPNs: device-level protection

\n

VPNs do more than proxies in that a proxy only protects what you do in your browser, whereas a VPN protects all your traffic, including your browser, wherever you have a VPN installed and enabled. VPNs provide added security and privacy for all your online activity \u2014 an important consideration if you want to keep your activity to yourself and make it more difficult for data hungry trackers and ISPs to create a profile of you across all your devices, like your phone, computer and tablet.

\n

A VPN works by creating a secure \u201ctunnel\u201d between your device and the internet at large. It protects your privacy in two key ways:

\n
  1. Concealing your IP address, protecting your identity and obscuring your location.
  2. Encrypting your traffic between you and your VPN provider so that no one on your local network can decipher or modify it.
\n

A VPN also offers security on open and public WiFi connections. Open WiFi can be risky, and it\u2019s impossible to be sure that someone else isn\u2019t connecting to the same network to snoop on what you\u2019re doing. Even if your traffic is encrypted, they can still see which sites you are visiting. And if you\u2019re using an app that doesn\u2019t have encryption \u2014 and even today, many don\u2019t \u2014 then they can see everything you are doing in that app. Mozilla VPN is a fast, secure, trustworthy service that can help close the security gap for you. Mozilla VPN also lets you choose your \u201clocation\u201d (where your traffic appears to be coming from) from more than 30 countries.

\n

Choose a trustworthy service

\n

The most important thing to consider when picking either a VPN or a proxy service is choosing a trustworthy company. Be sure you understand the terms you\u2019re agreeing to. Many claim to be great and focused on privacy, but a large number of them fall short on their promise. Not all proxy and VPN services are secure and private. Some will log your online activities so they can sell your data and information to marketing firms themselves. Other services will try to convince you to install malware on your devices.

\n

We\u2019ve done the legwork to ensure that both the Mozilla VPN and Firefox Private Network proxy extension actually respect your privacy, and it\u2019s something we\u2019re willing to stake our reputation on. Mozilla has a reputation for building products that help you keep your information safe. We follow our easy to read, no-nonsense Data Privacy Principles which allow us to focus only on the information we need to provide a service. And since we are backed by a mission-driven company, you can trust that the dollars you spend for this product will not only ensure you have top-notch security, but also are making the internet better for everyone.

\n', + "body": '

Virtual private networks (VPNs) and secure web proxies are solutions for better privacy and security online, but it can be confusing to figure out which one is right for you. Here\u2019s a look at how these services protect you and how to choose the best option for when you\u2019re online.

\n

Stop ISPs from spying on you

\n

When you use Firefox, Enhanced Tracking Protection automatically blocks many third party web trackers from following you around the web. But here\u2019s an interesting fact: your internet service provider (ISP) that you are paying for an internet connection \u2014 can still observe and track you.

\n

Because your internet traffic moves to and from your devices (computer, phone, tv, tablet) through your ISP, they can see where you go online. An ISP can see what sites you visit, how long you\u2019re on them, your location and information about your devices. An ISP may not know the specifics of what you did on those sites (like what you bought, searched for or read) thanks to encryption, but they could make inferences about you based on the sites that you visited. That personal data can be used to create detailed profiles about you. Why would ISPs do that? In short: this data is valuable.

\n

ISPs can use this information for their own ad targeting or for monetization opportunities that could include sharing your information with third parties interested in data mining, marketing and targeted advertising, which means less privacy and more tracking. Browsing in private mode doesn\u2019t prevent ISPs from seeing where you go online. But sending your web traffic through a web proxy or VPN can make it much harder.

\n

When should you choose a VPN or a secure proxy?

\n

VPNs and secure web proxies have shared goals: they secure connections. They can, and do, mask your original IP address and protect web traffic that you send between you and your VPN or secure proxy provider. But when would you want to use a VPN vs a proxy?

\n\n\n

Secure web proxy: browser-level protection

\n

A secure web proxy works for tasks that you might do only in your browser. This can amount to a lot of activity like shopping, paying bills, logging into social media and reading emails. A secure web proxy serves as an intermediary between your browser and the internet. Your web browsing data will pass through a secure tunnel to the internet directly from your browser, masking your IP address, so the web server you are contacting doesn\u2019t know exactly where you are in the world. And that makes you harder to track and target.

\n

A proxy is useful when you\u2019re browsing the web on a public WiFi. When a proxy is enabled, it will stop eavesdroppers on the same network from spying on your browsing activity or reading your transactions on unencrypted sites. It sounds harmless, but public WiFi networks can be like a backdoor for hackers.

\n

Firefox Private Network is an easy to install browser extension that provides a secure, encrypted tunnel to the web to protect your browser connection anywhere you use Firefox. It\'s fast and easy to turn on whenever you need it for extra security in your browser

\n

VPNs: device-level protection

\n

VPNs do more than proxies in that a proxy only protects what you do in your browser, whereas a VPN protects all your traffic, including your browser, wherever you have a VPN installed and enabled. VPNs provide added security and privacy for all your online activity \u2014 an important consideration if you want to keep your activity to yourself and make it more difficult for data hungry trackers and ISPs to create a profile of you across all your devices, like your phone, computer and tablet.

\n

A VPN works by creating a secure \u201ctunnel\u201d between your device and the internet at large. It protects your privacy in two key ways:

\n
  1. Concealing your IP address, protecting your identity and obscuring your location.
  2. Encrypting your traffic between you and your VPN provider so that no one on your local network can decipher or modify it.
\n

A VPN also offers security on open and public WiFi connections. Open WiFi can be risky, and it\u2019s impossible to be sure that someone else isn\u2019t connecting to the same network to snoop on what you\u2019re doing. Even if your traffic is encrypted, they can still see which sites you are visiting. And if you\u2019re using an app that doesn\u2019t have encryption \u2014 and even today, many don\u2019t \u2014 then they can see everything you are doing in that app. Mozilla VPN is a fast, secure, trustworthy service that can help close the security gap for you. Mozilla VPN also lets you choose your \u201clocation\u201d (where your traffic appears to be coming from) from more than 30 countries.

\n

Choose a trustworthy service

\n

The most important thing to consider when picking either a VPN or a proxy service is choosing a trustworthy company. Be sure you understand the terms you\u2019re agreeing to. Many claim to be great and focused on privacy, but a large number of them fall short on their promise. Not all proxy and VPN services are secure and private. Some will log your online activities so they can sell your data and information to marketing firms themselves. Other services will try to convince you to install malware on your devices.

\n

We\u2019ve done the legwork to ensure that both the Mozilla VPN and Firefox Private Network proxy extension actually respect your privacy, and it\u2019s something we\u2019re willing to stake our reputation on. Mozilla has a reputation for building products that help you keep your information safe. We follow our easy to read, no-nonsense Data Privacy Principles which allow us to focus only on the information we need to provide a service. And since we are backed by a mission-driven company, you can trust that the dollars you spend for this product will not only ensure you have top-notch security, but also are making the internet better for everyone.

\n', "width_class": "mzp-t-content-md", } ], diff --git a/bedrock/contentful/tests/test_contentful_api.py b/bedrock/contentful/tests/test_contentful_api.py index ecceabdf957..440663a8364 100644 --- a/bedrock/contentful/tests/test_contentful_api.py +++ b/bedrock/contentful/tests/test_contentful_api.py @@ -520,7 +520,7 @@ def test_LinkRenderer__mozilla_link(mock_get_current_request): output = LinkRenderer({"text": TextRenderer}).render(mozilla_mock_hyperlink_node) expected = ( 'Example' + ' data-cta-text="Example" rel="external noopener">Example' ) assert output == expected @@ -534,10 +534,7 @@ def test_LinkRenderer__mozilla_link__existing_utm(mock_get_current_request): mozilla_mock_hyperlink_node = deepcopy(mock_hyperlink_node) mozilla_mock_hyperlink_node["data"]["uri"] = "https://mozilla.org/test/page/?utm_source=UTMTEST" output = LinkRenderer({"text": TextRenderer}).render(mozilla_mock_hyperlink_node) - expected = ( - 'Example' - ) + expected = 'Example' assert output == expected @@ -549,7 +546,7 @@ def test_LinkRenderer__non_mozilla(): "text": TextRenderer, } ).render(mock_hyperlink_node) - == 'Example' + == 'Example' ) diff --git a/bedrock/firefox/templates/firefox/all-unified.html b/bedrock/firefox/templates/firefox/all-unified.html index ab968cbfc95..dca61a4ba4f 100644 --- a/bedrock/firefox/templates/firefox/all-unified.html +++ b/bedrock/firefox/templates/firefox/all-unified.html @@ -151,7 +151,7 @@

{{ ftl('firefox-all-choose-which-firefox') }}

- {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe) }} + {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-text="You can set up our APT repository instead"'|safe) }}

{{ ftl('firefox-all-choose-which-firefox') }}

} ) }} -
  • {{ ftl('firefox-all-product-send-link') }}
    • +
  • {{ ftl('firefox-all-product-send-link') }}
    • @@ -208,7 +208,7 @@

    {{ ftl('firefox-all-choose-which-firefox') }}

    } ) }} -
  • {{ ftl('firefox-all-product-send-link') }}
    • +
  • {{ ftl('firefox-all-product-send-link') }}
    • diff --git a/bedrock/firefox/templates/firefox/browsers/browser-history.html b/bedrock/firefox/templates/firefox/browsers/browser-history.html index 0497a643058..040d2c2278d 100644 --- a/bedrock/firefox/templates/firefox/browsers/browser-history.html +++ b/bedrock/firefox/templates/firefox/browsers/browser-history.html @@ -26,17 +26,17 @@

    - + {{ ftl('sub-navigation-firefox') }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html index a8730a0cd5d..7db61cbf5cd 100644 --- a/bedrock/firefox/templates/firefox/browsers/chromebook.html +++ b/bedrock/firefox/templates/firefox/browsers/chromebook.html @@ -55,7 +55,7 @@

    {{ ftl('browsers-chromebook-dropdown-copy') }}
  • - + {{ ftl('browsers-chromebook-get-firefox-desktop') }}
    • @@ -115,7 +115,7 @@

    {{ ftl('browsers-chromebook-is-it-hard') }}

    } ) }} -

    {{ ftl('browsers-chromebook-install-firefox-as', url='href="https://support.mozilla.org/kb/run-firefox-chromeos?utm_source=www.mozilla.org-firefox-browsers-chromebook&utm_medium=referral&utm_campaign=seo" rel="external noopener" data-cta-text="Install Firefox for Chromebook" data-cta-type="link"'|safe) }}

    +

    {{ ftl('browsers-chromebook-install-firefox-as', url='href="https://support.mozilla.org/kb/run-firefox-chromeos?utm_source=www.mozilla.org-firefox-browsers-chromebook&utm_medium=referral&utm_campaign=seo" rel="external noopener" data-cta-text="Install Firefox for Chromebook" '|safe) }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/compare/brave.html b/bedrock/firefox/templates/firefox/browsers/compare/brave.html index f61d78fa5f7..95bcc3cd958 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/brave.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/brave.html @@ -20,8 +20,8 @@

    {{ ftl('compare-shared-we-also-offer-easy') }}

    {{ ftl('compare-shared-its-easy-to-switch') }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/compare/edge.html b/bedrock/firefox/templates/firefox/browsers/compare/edge.html index bebb97d1e48..cb8e5ee50d2 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/edge.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/edge.html @@ -18,8 +18,8 @@

    {{ ftl('compare-shared-we-also-offer-easy') }}

    {{ ftl('compare-edge-and-we-make-it-easy-for-you') }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/compare/index.html b/bedrock/firefox/templates/firefox/browsers/compare/index.html index d5171262c0e..c20d416651d 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/index.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/index.html @@ -14,7 +14,7 @@ ga_title ) -%}
  • - +

    {{ title }}

    {{ ftl('ui-learn-more') }}

     diff --git a/bedrock/firefox/templates/firefox/browsers/compare/opera.html b/bedrock/firefox/templates/firefox/browsers/compare/opera.html index e3afc1786f7..a3a24aa7777 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/opera.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/opera.html @@ -16,8 +16,8 @@

    {{ ftl('compare-shared-firefox-also-has-built-in') }}

    {{ ftl('compare-opera-firefox-offers-a-wide-range-of') }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/compare/safari.html b/bedrock/firefox/templates/firefox/browsers/compare/safari.html index 22608278c39..8769058eeac 100644 --- a/bedrock/firefox/templates/firefox/browsers/compare/safari.html +++ b/bedrock/firefox/templates/firefox/browsers/compare/safari.html @@ -17,8 +17,8 @@

    {{ ftl('compare-safari-but-firefox-also-has-built-in') }}

    {{ ftl('compare-safari-firefox-offers-a-wide-range-of') }}

    diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html index 23e186fdbb5..83cfb8a824d 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/index.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/index.html @@ -83,14 +83,14 @@

    {{ ftl('browsers-mobile-go-your-own-way') }}

    'height': '263' } ) }} -

    {{ ftl('browsers-mobile-firefox-for-android') }}

    +

    {{ ftl('browsers-mobile-firefox-for-android') }}

    {{ ftl('browsers-mobile-infinitely-customizable-private') }}

    {{ ftl('browsers-mobile-download') }}

    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('ui-learn-more') }}

    @@ -105,14 +105,14 @@

    {{ ftl('browsers-mobile-firefox-for-ios') }}

    +

    {{ ftl('browsers-mobile-firefox-for-ios') }}

    {{ ftl('browsers-mobile-get-enhanced-tracking-protection') }}

    {{ ftl('browsers-mobile-download') }}

    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('ui-learn-more') }}

    @@ -128,7 +128,7 @@

    {{ ftl('browsers-mobile-firefox-focus') }}

    +

    {{ ftl('browsers-mobile-firefox-focus') }}

    {{ ftl('browsers-mobile-looking-for-a-streamlined') }}

    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('ui-learn-more') }}

    @@ -154,7 +154,7 @@

    {{ ftl('browsers-mobile-download') }}

    ) %}

    {{ ftl('browsers-mobile-see-how-firefox-for-desktop-compare-v2') }}

    {{ ftl('browsers-mobile-see-how-firefox-for-desktop-strong-v2') }}

    -

    {{ ftl('browsers-mobile-compare') }}

    +

    {{ ftl('browsers-mobile-compare') }}

    {% endcall %} diff --git a/bedrock/firefox/templates/firefox/browsers/what-is-a-browser.html b/bedrock/firefox/templates/firefox/browsers/what-is-a-browser.html index cd640ba7eeb..e66f60e56bc 100644 --- a/bedrock/firefox/templates/firefox/browsers/what-is-a-browser.html +++ b/bedrock/firefox/templates/firefox/browsers/what-is-a-browser.html @@ -21,13 +21,13 @@

    - + {{ ftl('sub-navigation-firefox') }}

    diff --git a/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html b/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html index 389399b0afc..5ac4c942479 100644 --- a/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html +++ b/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html @@ -36,8 +36,8 @@ {% endblock %} {% macro cta_group(position) -%} - {{ cta_default }} - {{ cta_mobile }} + {{ cta_default }} + {{ cta_mobile }} {{ download_firefox_thanks(button_class='not-firefox', alt_copy=cta_download, download_location=position, locale_in_transition=True) }} {%- endmacro %} @@ -390,7 +390,7 @@

    {{ cred_community_title }}

    {{ footer_title }}

    -

    {{ footer_body|format('href="https://community.mozilla.org/" target="_blank" rel="noopener noreferrer" data-cta-type="link" data-cta-text="Community"')|safe }}

    +

    {{ footer_body|format('href="https://community.mozilla.org/" target="_blank" rel="noopener noreferrer" data-cta-text="Community"')|safe }}

    {{ cta_group('footer') }}

    {{ footer_mobile }}

    {{ footer_desktop }}

    diff --git a/bedrock/firefox/templates/firefox/channel/desktop.html b/bedrock/firefox/templates/firefox/channel/desktop.html index b93975a7c1d..8eedd8afe36 100644 --- a/bedrock/firefox/templates/firefox/channel/desktop.html +++ b/bedrock/firefox/templates/firefox/channel/desktop.html @@ -67,7 +67,7 @@ {% endcall %}

    {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/products/firefox/install-and-update-firefox" rel="external noopener" - data-cta-type="link" data-cta-text="Get help with your installation"') }}

    + data-cta-text="Get help with your installation"') }}

    diff --git a/bedrock/firefox/templates/firefox/family/includes/download-firefox.html b/bedrock/firefox/templates/firefox/family/includes/download-firefox.html index 561b94d913e..534a45a0044 100644 --- a/bedrock/firefox/templates/firefox/family/includes/download-firefox.html +++ b/bedrock/firefox/templates/firefox/family/includes/download-firefox.html @@ -17,13 +17,13 @@

    We - + Set Firefox as your default browser
    - + Get Firefox on your phone
    diff --git a/bedrock/firefox/templates/firefox/family/includes/modules/faq.html b/bedrock/firefox/templates/firefox/family/includes/modules/faq.html index 43b70feb8db..1ef1f654ec4 100644 --- a/bedrock/firefox/templates/firefox/family/includes/modules/faq.html +++ b/bedrock/firefox/templates/firefox/family/includes/modules/faq.html @@ -13,7 +13,7 @@ {{ module_tag(title='FAQs', anchor='faq') }}

    Not-so FAQs, answered by

    -

    Our friends at Common Sense Media lend their expert advice on some of today’s toughest online parenting scenarios.

    +

    Our friends at Common Sense Media lend their expert advice on some of today’s toughest online parenting scenarios.

    Here are some toughies

    @@ -30,12 +30,12 @@
    I watched The Social Dilemma, now I’m considering banishing my kids
  • Do you ever feel like you've spent too much time online?
  • Do you ever feel pressured to be online?
    • -

    Next, have a conversation with them about their social media habits, and create a family tech planner with consistent rules. Consider having them take a break from social media for a set number of days (or hours).

    +

    Next, have a conversation with them about their social media habits, and create a family tech planner with consistent rules. Consider having them take a break from social media for a set number of days (or hours).

    More information to explore
    @@ -45,12 +45,12 @@
    More information to explore
    What's the deal with Fortnite anyway?
    -

    Fortnite is a fantastic action game, best suited for kids age 13+. Just watch out for in-game purchases and monitor the online chat, where kids could be paired with random teammates in public matches.

    +

    Fortnite is a fantastic action game, best suited for kids age 13+. Just watch out for in-game purchases and monitor the online chat, where kids could be paired with random teammates in public matches.

    Kids love Fortnite for lots of reasons. Younger gamers are drawn to it because it has a more cartoonish look than other, more gory video games. Older kids like that it’s a way of interacting with peers and socializing with friends — as well as complete strangers — so it could require parental moderation.

    More information to explore
    @@ -60,12 +60,12 @@
    More information to explore
    How long is too long to stick my preschooler in front of the iPad?
    -

    Kids are spending more time with digital devices — and at younger ages — than ever before. The American Academy of Pediatrics has helpful guidelines for limiting screen time for young kids. They recommend preschoolers age 2-5 have no more than 1 hour of high-quality screen time each day. That's because little kids learn best from interacting with the physical world and with caring grown-ups.

    +

    Kids are spending more time with digital devices — and at younger ages — than ever before. The American Academy of Pediatrics has helpful guidelines for limiting screen time for young kids. They recommend preschoolers age 2-5 have no more than 1 hour of high-quality screen time each day. That's because little kids learn best from interacting with the physical world and with caring grown-ups.

    The reality is, there's no magic number that's perfect for every kid. What's important is the quality and age-appropriateness of your kids' content, and how your kids engage with it, and balancing their time with and without screens in a way that's healthy and supports their development. With any entertainment you choose for your kids — movies, games, TV shows, apps — you want to look for how it engages your child. For example, if it makes them happy and gets them learning new skills and life lessons — great. But if it's stressing them out and teaching them negative behaviors — it's time to pull back from that media.

    More information to explore
    @@ -83,11 +83,11 @@
    Some kid made a TikTok about my kid, but didn't mention her by name. Is this
  • Hacking accounts
  • Spreading mean rumors online
    • -

    If you think your child is being bullied online, help them take a break. Then, think about whether they're being hurt on purpose or repeatedly. If the answer is no, talk with them about dealing with hurtful online behavior. If the answer is yes, give your child strategies to try to stop the bullying.

    +

    If you think your child is being bullied online, help them take a break. Then, think about whether they're being hurt on purpose or repeatedly. If the answer is no, talk with them about dealing with hurtful online behavior. If the answer is yes, give your child strategies to try to stop the bullying.

    More information to explore
    @@ -99,11 +99,11 @@
    C'mon, does it really matter if companies track what my kids do online?

    It's not about whether they collect it — it's a matter of what they do with it.

    Young people are the most surveilled and tracked generation ever. Their personal information, activities, hobbies and networks are exposed — and often for sale — from birth. With this information, companies form detailed files that can determine children’s futures.

    -

    Kids’ online activity is largely on mobile devices, meaning their location, activities and conversations are tracked. And with an increase in community cameras, Bluetooth trackers and other sensors, kids are watched wherever they go. Luckily, there are steps you can take to protect their privacy online.

    +

    Kids’ online activity is largely on mobile devices, meaning their location, activities and conversations are tracked. And with an increase in community cameras, Bluetooth trackers and other sensors, kids are watched wherever they go. Luckily, there are steps you can take to protect their privacy online.

    More information to explore
    diff --git a/bedrock/firefox/templates/firefox/family/includes/resources.html b/bedrock/firefox/templates/firefox/family/includes/resources.html index 70da06ebd49..7349858302e 100644 --- a/bedrock/firefox/templates/firefox/family/includes/resources.html +++ b/bedrock/firefox/templates/firefox/family/includes/resources.html @@ -73,6 +73,6 @@

    Can't get enough of this parenting/
    internet stuff? - View more + View more

    diff --git a/bedrock/firefox/templates/firefox/faq.html b/bedrock/firefox/templates/firefox/faq.html index e1310c6eaf1..ad0c80c3c73 100644 --- a/bedrock/firefox/templates/firefox/faq.html +++ b/bedrock/firefox/templates/firefox/faq.html @@ -22,16 +22,16 @@

    - + {{ ftl('sub-navigation-firefox') }}

    diff --git a/bedrock/firefox/templates/firefox/features/includes/subnav.html b/bedrock/firefox/templates/firefox/features/includes/subnav.html index 42a80a0544b..143b0551a69 100644 --- a/bedrock/firefox/templates/firefox/features/includes/subnav.html +++ b/bedrock/firefox/templates/firefox/features/includes/subnav.html @@ -10,19 +10,19 @@

    - + {{ ftl('sub-navigation-firefox-features') }}

    diff --git a/bedrock/firefox/templates/firefox/features/index.html b/bedrock/firefox/templates/firefox/features/index.html index 3cf462d2488..c7362bf3487 100644 --- a/bedrock/firefox/templates/firefox/features/index.html +++ b/bedrock/firefox/templates/firefox/features/index.html @@ -15,7 +15,7 @@ desc ) -%}
  • - +

    {{ title }}

    {{ desc }}

    {{ ftl('ui-learn-more') }}

    diff --git a/bedrock/firefox/templates/firefox/features/translate.html b/bedrock/firefox/templates/firefox/features/translate.html index f0ef1168320..df7ff83a0ed 100644 --- a/bedrock/firefox/templates/firefox/features/translate.html +++ b/bedrock/firefox/templates/firefox/features/translate.html @@ -57,5 +57,5 @@

    {{ ftl('features-translate-what-languages-are-currently') }}

    {{ ftl('features-translate-and-more-languages-are-in') }}

    {{ ftl('features-translate-firefox-speaks-your-language') }}

    -

    {{ ftl('features-translate-the-firefox-translations-feature', download='href="%s" data-cta-type="link" data-cta-text="Get started in your preferred language"'|safe|format(url('firefox.new'))) }}

    +

    {{ ftl('features-translate-the-firefox-translations-feature', download='href="%s" data-cta-text="Get started in your preferred language"'|safe|format(url('firefox.new'))) }}

    {% endblock %} diff --git a/bedrock/firefox/templates/firefox/includes/macros.html b/bedrock/firefox/templates/firefox/includes/macros.html index 7b85cd98128..c1d83d66322 100644 --- a/bedrock/firefox/templates/firefox/includes/macros.html +++ b/bedrock/firefox/templates/firefox/includes/macros.html @@ -69,7 +69,7 @@     -

    {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" +

    {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-text="You can set up our APT repository instead"')}}

    diff --git a/bedrock/firefox/templates/firefox/index.html b/bedrock/firefox/templates/firefox/index.html index 4d1ed68d665..36a0cae4a77 100644 --- a/bedrock/firefox/templates/firefox/index.html +++ b/bedrock/firefox/templates/firefox/index.html @@ -75,21 +75,21 @@

    'height': '233' } ) }} -

    {{ ftl('firefox-browsers-desktop') }}

    +

    {{ ftl('firefox-browsers-desktop') }}

    {{ ftl('firefox-browsers-seriously-private-browsing') }}

    {# Old IE users need to click a download button, the JS on the thank you page doesn't get them the right download if we send them there directly #} {# Download link should be locale neutral see issue 7982 #} - {{ ftl('firefox-browsers-download-for-desktop') }} + {{ ftl('firefox-browsers-download-for-desktop') }}

    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('ui-learn-more') }}

    @@ -104,7 +104,7 @@

    {{ ftl('firefox-browsers-mobile') }}

    +

    {{ ftl('firefox-browsers-mobile') }}

    {{ ftl('firefox-browsers-take-the-same-level-of-privacy') }}

    @@ -118,10 +118,10 @@
    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('ui-learn-more') }}

    @@ -136,10 +136,10 @@

    {{ ftl('firefox-browsers-enterprise') }}

    +

    {{ ftl('firefox-browsers-enterprise') }}

    {{ ftl('firefox-browsers-get-unmatched-data-protection') }}

    -

    {{ ftl('firefox-browsers-enterprise-packages') }}

    -

    {{ ftl('ui-learn-more') }}

    +

    {{ ftl('firefox-browsers-enterprise-packages') }}

    +

    {{ ftl('ui-learn-more') }}

    diff --git a/bedrock/firefox/templates/firefox/new/basic/thanks.html b/bedrock/firefox/templates/firefox/new/basic/thanks.html index d479392fd80..38de65a8a2e 100644 --- a/bedrock/firefox/templates/firefox/new/basic/thanks.html +++ b/bedrock/firefox/templates/firefox/new/basic/thanks.html @@ -50,9 +50,9 @@

    {{ ftl('firefox-new-download-interr {% if ftl_has_messages('firefox-new-if-you-see-a-prompt', 'firefox-new-visit-support-for-more') %} {% endif %} @@ -65,7 +65,7 @@

    {{ ftl('firefox-new-download-interr class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64-v2') }} {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" - data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %} + data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}

    {{ ftl('download-button-using-debian', attrs=attrs) }}

    {# Edge-case platform support messaging #} diff --git a/bedrock/firefox/templates/firefox/new/desktop/download-ms-store.html b/bedrock/firefox/templates/firefox/new/desktop/download-ms-store.html index a2005b86c96..c3f70412a7b 100644 --- a/bedrock/firefox/templates/firefox/new/desktop/download-ms-store.html +++ b/bedrock/firefox/templates/firefox/new/desktop/download-ms-store.html @@ -13,7 +13,7 @@ {% macro custom_nav_cta() %} {% set ms_store_href = ms_store_url(product='firefox', campaign=ms_store_attribution_code, handler='ms-windows-store') %}
    - + Download Firefox
    @@ -26,7 +26,7 @@ class_name='mzp-t-product mzp-t-secondary mzp-t-md', optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'navigation' } ) }} @@ -44,7 +44,7 @@ {{ ms_store_button(href=ms_store_href) }}
    - + Download from the web
    diff --git a/bedrock/firefox/templates/firefox/new/desktop/download.html b/bedrock/firefox/templates/firefox/new/desktop/download.html index fdb3ec80fec..2fea4e344f3 100644 --- a/bedrock/firefox/templates/firefox/new/desktop/download.html +++ b/bedrock/firefox/templates/firefox/new/desktop/download.html @@ -77,7 +77,7 @@ {% if outdated %} - {% set update_url = 'href="%s" data-cta-type="link" data-cta-text="Update to the latest version"'|safe|format(('https://support.mozilla.org/kb/update-firefox-latest-release' + referrals)) %} + {% set update_url = 'href="%s" data-cta-text="Update to the latest version"'|safe|format(('https://support.mozilla.org/kb/update-firefox-latest-release' + referrals)) %} {% if ftl_has_messages('firefox-desktop-out-of-date') %}

    • -

    See Release Notes

    +

    See Release Notes

    {% endif %} @@ -275,7 +275,7 @@

    {{ ftl('firefox-desktop-download-we-block-the-ad') }}

    {{ ftl('firefox-desktop-download-for-everyone') }}

    {{ ftl('firefox-desktop-download-available-in-over') }}

    -

    {{ ftl('firefox-desktop-download-review-system-req') }}

    +

    {{ ftl('firefox-desktop-download-review-system-req') }}

    {{ download_picture('everyone', 367, 302, '', 'mzp-c-block-media-img') }} @@ -455,7 +455,7 @@

    {{ ftl('firefox-desktop-downloa

    • {{ ftl('firefox-desktop-download-extensions-for-every') }}

      - {% set extensions_attrs = 'href="https://addons.mozilla.org/firefox/extensions/%s" rel="external noopener" data-cta-type="link" data-cta-text="extension for everyone"'|safe|format(referrals) %} + {% set extensions_attrs = 'href="https://addons.mozilla.org/firefox/extensions/%s" rel="external noopener" data-cta-text="extension for everyone"'|safe|format(referrals) %}

      {{ ftl('firefox-desktop-download-from-security-to', attrs=extensions_attrs) }}

      • @@ -488,7 +488,7 @@

      {{ ftl('firefox-desktop-download } ) }}

      {{ ftl('firefox-desktop-download-challenging-the-status') }}

      - {% set created_attrs = 'href="%s" data-cta-type="link" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %} + {% set created_attrs = 'href="%s" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %}

      {{ ftl('firefox-desktop-download-firefox-was-created', attrs=created_attrs) }}

    @@ -505,7 +505,7 @@

    {{ ftl('firefox-desktop-download-challenging-the-stat } ) }}

    {{ ftl('firefox-desktop-download-your-privacy-comes') }}

    - {% set internet_attrs = 'href="%s" data-cta-type="link" data-cta-text="Personal Data Promise"'|safe|format(url('firefox.privacy.index')) %} + {% set internet_attrs = 'href="%s" data-cta-text="Personal Data Promise"'|safe|format(url('firefox.privacy.index')) %}

    {{ ftl('firefox-desktop-download-as-the-internet', attrs=internet_attrs) }}

    @@ -525,7 +525,7 @@

    {{ ftl('firefox-desktop-download-works-with-google')
    {{ download_picture('contain-mr1', '131', 138) }}

    {{ ftl('firefox-desktop-download-facebook-container') }}

    - {% set addon_attrs = 'href="https://addons.mozilla.org/firefox/addon/facebook-container/%s" rel="external noopener" data-cta-type="link" data-cta-text="Download this browser extension"'|safe|format(referrals) %} + {% set addon_attrs = 'href="https://addons.mozilla.org/firefox/addon/facebook-container/%s" rel="external noopener" data-cta-text="Download this browser extension"'|safe|format(referrals) %}

    {{ ftl('firefox-desktop-download-download-this-browser', attrs=addon_attrs) }}

    @@ -540,14 +540,14 @@

    {{ ftl('firefox-desktop-download-sync-your-devices')
    {{ download_picture('screenshots-mr1', '131', 138) }}

    {{ ftl('firefox-desktop-download-screenshots') }}

    - {% set screenshot_attrs = 'href="https://support.mozilla.org/kb/firefox-screenshots%s" rel="external noopener" data-cta-type="link" data-cta-text="screenshot"'|safe|format(referrals) %} + {% set screenshot_attrs = 'href="https://support.mozilla.org/kb/firefox-screenshots%s" rel="external noopener" data-cta-text="screenshot"'|safe|format(referrals) %}

    {{ ftl('firefox-desktop-download-grab-a-high', attrs=screenshot_attrs) }}

    {{ download_picture('etp', '134', 138) }}

    {{ ftl('firefox-desktop-download-enhanced-tracking-protection') }}

    - {% set automatically_attrs = 'href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop%s" rel="external noopener" data-cta-type="link" data-cta-text="block many trackers"'|safe|format(referrals) %} + {% set automatically_attrs = 'href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop%s" rel="external noopener" data-cta-text="block many trackers"'|safe|format(referrals) %}

    {{ ftl('firefox-desktop-download-firefox-automatically', attrs=automatically_attrs) }}

    @@ -563,7 +563,7 @@

    {{ ftl('firefox-desktop-download-picture-in-picture')
    - {% set questions_attrs = 'href="https://support.mozilla.org/products/firefox%s&utm_content=mozilla-support" rel="external noopener" data-cta-type="link" data-cta-text="Mozilla support"'|safe|format(referrals) %} + {% set questions_attrs = 'href="https://support.mozilla.org/products/firefox%s&utm_content=mozilla-support" rel="external noopener" data-cta-text="Mozilla support"'|safe|format(referrals) %} {{ ftl('firefox-desktop-download-questions', attrs=questions_attrs) }}
    diff --git a/bedrock/firefox/templates/firefox/new/desktop/thanks.html b/bedrock/firefox/templates/firefox/new/desktop/thanks.html index 07dd45f7bb4..26dcd1c4eea 100644 --- a/bedrock/firefox/templates/firefox/new/desktop/thanks.html +++ b/bedrock/firefox/templates/firefox/new/desktop/thanks.html @@ -56,19 +56,19 @@

    {{ ftl('firefox-desktop-download-interr {% if ftl_has_messages('firefox-desktop-download-if-you-see-a-prompt', 'firefox-desktop-download-visit-support-for-more') %} {% endif %}

    - {% set support_mac_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-mac%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %} + {% set support_mac_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-mac%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %} {{ ftl('firefox-desktop-download-get-help', attrs=support_mac_attrs) }}

    - {% set support_windows_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-windows%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %} + {% set support_windows_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-windows%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %} {{ ftl('firefox-desktop-download-get-help', attrs=support_windows_attrs) }}

    @@ -76,11 +76,11 @@

    {{ ftl('firefox-desktop-download-interr {{ ftl('download-button-linux-32-v2') }} {{ ftl('download-button-linux-64-v2') }}

    - {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %} + {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}

    {{ ftl('download-button-using-debian', attrs=attrs) }}

    - {% set support_else_attrs = 'href="https://support.mozilla.org/products/firefox/install-and-update-firefox%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %} + {% set support_else_attrs = 'href="https://support.mozilla.org/products/firefox/install-and-update-firefox%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %} {{ ftl('firefox-desktop-download-get-help', attrs=support_else_attrs) }}

    diff --git a/bedrock/firefox/templates/firefox/nightly/firstrun.html b/bedrock/firefox/templates/firefox/nightly/firstrun.html index 48deb52625d..54cb752befe 100644 --- a/bedrock/firefox/templates/firefox/nightly/firstrun.html +++ b/bedrock/firefox/templates/firefox/nightly/firstrun.html @@ -61,7 +61,7 @@

    {{ ftl('nightly-firstrun-choose-an-area') }}

    base_el='li' ) %}

    {{ ftl('nightly-firstrun-find-and-file-bugs') }}

    - {{ ftl('nightly-firstrun-start-testing') }} + {{ ftl('nightly-firstrun-start-testing') }} {% endcall %} {% call picto( @@ -78,7 +78,7 @@

    {{ ftl('nightly-firstrun-choose-an-area') }}

    base_el='li' ) %}

    {{ ftl('nightly-firstrun-file-bugs-and-work') }}

    - {{ ftl('nightly-firstrun-start-coding') }} + {{ ftl('nightly-firstrun-start-coding') }} {% endcall %} {% call picto( @@ -95,7 +95,7 @@

    {{ ftl('nightly-firstrun-choose-an-area') }}

    base_el='li' ) %}

    {{ ftl('nightly-firstrun-make-firefox-available') }}

    - {{ ftl('nightly-firstrun-start-localizing') }} + {{ ftl('nightly-firstrun-start-localizing') }} {% endcall %} diff --git a/bedrock/firefox/templates/firefox/nightly/whatsnew.html b/bedrock/firefox/templates/firefox/nightly/whatsnew.html index 1f4b9b871dd..bd20dbe2893 100644 --- a/bedrock/firefox/templates/firefox/nightly/whatsnew.html +++ b/bedrock/firefox/templates/firefox/nightly/whatsnew.html @@ -52,7 +52,7 @@

    ¿Quieres ayudar en España?

    ¿Quieres implicarte en uno de los proyectos open source más importantes en el mundo y ayudarnos a crear una web más abierta para todos?

    -

    ¡Entra en el chat y hablemos!

    +

    ¡Entra en el chat y hablemos!


    diff --git a/bedrock/firefox/templates/firefox/nothing-personal/index.html b/bedrock/firefox/templates/firefox/nothing-personal/index.html index 48de1cdf347..964b6502d83 100644 --- a/bedrock/firefox/templates/firefox/nothing-personal/index.html +++ b/bedrock/firefox/templates/firefox/nothing-personal/index.html @@ -29,9 +29,9 @@

    Firefox by Mozilla

    Feeling browser-curious? We won’t tell.

    - Learn more + Learn more - Set as default + Set as default {{ download_firefox_thanks(alt_copy='Download Firefox', dom_id='protocol-nav-download-firefox', button_class='mzp-t-primary mzp-t-lg c-download-firefox-cta', download_location='primary') }}
    diff --git a/bedrock/firefox/templates/firefox/pocket.html b/bedrock/firefox/templates/firefox/pocket.html index 777b2ea8a91..7b992d32940 100644 --- a/bedrock/firefox/templates/firefox/pocket.html +++ b/bedrock/firefox/templates/firefox/pocket.html @@ -45,7 +45,7 @@

    An Award-Winning App From Firefox

    Over 10 million users rely on Pocket to discover and savor the best articles, news, stories and videos. And as a member of the Firefox family, privacy is paramount.

    -

    {{ pocket_fxa_button(entrypoint=_entrypoint, button_text='Try Pocket Now', optional_parameters={'s': _source}, optional_attributes={'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}

    +

    {{ pocket_fxa_button(entrypoint=_entrypoint, button_text='Try Pocket Now', optional_parameters={'s': _source}, optional_attributes={'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}

    {% endcall %} {% call split( @@ -114,7 +114,7 @@

    }, optional_attributes={ 'data-cta-text': 'Try Pocket Now', - 'data-cta-type': 'activate pocket', + 'data-cta-type': 'pocket', 'data-cta-position': 'secondary' } ) }} diff --git a/bedrock/firefox/templates/firefox/set-as-default/landing.html b/bedrock/firefox/templates/firefox/set-as-default/landing.html index 675b8471929..f2db546c2cf 100644 --- a/bedrock/firefox/templates/firefox/set-as-default/landing.html +++ b/bedrock/firefox/templates/firefox/set-as-default/landing.html @@ -35,7 +35,7 @@ ) %}
    - + {{ ftl('set-as-default-landing-make-firefox-your-default') }}
    diff --git a/bedrock/firefox/templates/firefox/switch.html b/bedrock/firefox/templates/firefox/switch.html index c474b8b8099..3ecdef21e84 100644 --- a/bedrock/firefox/templates/firefox/switch.html +++ b/bedrock/firefox/templates/firefox/switch.html @@ -57,13 +57,13 @@ {% set share_url = settings.CANONICAL_URL + canonical_path %}
    diff --git a/bedrock/firefox/templates/firefox/welcome/page11.html b/bedrock/firefox/templates/firefox/welcome/page11.html index 2e883cf0f4b..e2b4b1dab45 100644 --- a/bedrock/firefox/templates/firefox/welcome/page11.html +++ b/bedrock/firefox/templates/firefox/welcome/page11.html @@ -74,7 +74,7 @@

    {{ ftl('welcome-page11-it-protects-your-credit') } class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } ) }} diff --git a/bedrock/firefox/templates/firefox/welcome/page12.html b/bedrock/firefox/templates/firefox/welcome/page12.html index c56052d97a2..bf6b70ab29a 100644 --- a/bedrock/firefox/templates/firefox/welcome/page12.html +++ b/bedrock/firefox/templates/firefox/welcome/page12.html @@ -65,7 +65,7 @@

    Access global info & entertainment

    class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } ) }} diff --git a/bedrock/firefox/templates/firefox/welcome/page13.html b/bedrock/firefox/templates/firefox/welcome/page13.html index 3c281f895f2..e7dee6c760d 100644 --- a/bedrock/firefox/templates/firefox/welcome/page13.html +++ b/bedrock/firefox/templates/firefox/welcome/page13.html @@ -76,7 +76,7 @@

    {{ ftl('welcome-page13-cover-your-work') }}

    class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } ) }} diff --git a/bedrock/firefox/templates/firefox/welcome/page14.html b/bedrock/firefox/templates/firefox/welcome/page14.html index 2ebbdbe9958..b40c0bb64d8 100644 --- a/bedrock/firefox/templates/firefox/welcome/page14.html +++ b/bedrock/firefox/templates/firefox/welcome/page14.html @@ -48,7 +48,7 @@

    {% if show_coupon %}{{ ftl('welcome-page14-page-title' page_anchor="#pricing", optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } )}} diff --git a/bedrock/firefox/templates/firefox/welcome/page15/base.html b/bedrock/firefox/templates/firefox/welcome/page15/base.html index 3a68035e1f6..38fb123a83e 100644 --- a/bedrock/firefox/templates/firefox/welcome/page15/base.html +++ b/bedrock/firefox/templates/firefox/welcome/page15/base.html @@ -69,7 +69,7 @@

    {{ var_2_main_title }}

    class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Try Mozilla VPN', - 'data-cta-type' : 'button' + 'data-cta-type' : 'vpn', } )}} @@ -113,7 +113,7 @@

    {{ var_1_main_title }}

    class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Try Mozilla VPN', - 'data-cta-type' : 'button' + 'data-cta-type' : 'vpn', } )}} diff --git a/bedrock/firefox/templates/firefox/welcome/page16.html b/bedrock/firefox/templates/firefox/welcome/page16.html index 5a8a4ff99f9..050857e82eb 100644 --- a/bedrock/firefox/templates/firefox/welcome/page16.html +++ b/bedrock/firefox/templates/firefox/welcome/page16.html @@ -92,7 +92,7 @@

    This Cybersecurity Month, take 20% off your first year< }, optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } )}} diff --git a/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html b/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html index 086238c63d2..f9fec2c133f 100644 --- a/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html +++ b/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html @@ -90,7 +90,7 @@

    {{ main_title }}

    class_name='mzp-t-product mzp-t-xl', optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', 'data-cta-position' : 'primary-cta', } )}} diff --git a/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html b/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html index 2477a4359b1..9f1944a1d68 100644 --- a/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html +++ b/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html @@ -75,7 +75,7 @@

    {{ main_title }}

    -

    {{ main_cta }}

    +

    {{ main_cta }}

    {{ main_tagline }}

    diff --git a/bedrock/firefox/templates/firefox/welcome/page18.html b/bedrock/firefox/templates/firefox/welcome/page18.html index d9c4eac3a74..c95b06e7429 100644 --- a/bedrock/firefox/templates/firefox/welcome/page18.html +++ b/bedrock/firefox/templates/firefox/welcome/page18.html @@ -51,8 +51,8 @@

    Shop summer sales with confidence

    New in Firefox: Review Checker analyzes product reviews and checks them for authenticity. Click on the price tag icon when you shop on Amazon, Best Buy, or Walmart. - Learn more

    -

    Try it now

    + Learn more

    +

    Try it now

    {{ resp_img('img/firefox/welcome/page18/fakespot-rc.png', srcset={ diff --git a/bedrock/firefox/templates/firefox/welcome/page2.html b/bedrock/firefox/templates/firefox/welcome/page2.html index 56ae494b812..7bc975ff3e0 100644 --- a/bedrock/firefox/templates/firefox/welcome/page2.html +++ b/bedrock/firefox/templates/firefox/welcome/page2.html @@ -33,7 +33,7 @@ ) %}

    - {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }} + {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}

    {% endcall %} {% endblock %} @@ -78,7 +78,7 @@

    {{ ftl('welcome-page2-discover-new-stories') }}< {% block secondary_cta %}

    - {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'secondary'}) }} + {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'secondary'}) }}

    {% endblock %} diff --git a/bedrock/firefox/templates/firefox/welcome/page4.html b/bedrock/firefox/templates/firefox/welcome/page4.html index 6d61bb9957d..7cb619d2bc5 100644 --- a/bedrock/firefox/templates/firefox/welcome/page4.html +++ b/bedrock/firefox/templates/firefox/welcome/page4.html @@ -109,7 +109,7 @@

    {{ ftl('welcome-page4-go-faster-do-more', fallba {% block secondary_cta %}
    - + {{ ftl('welcome-page4-get-the-firefox-mobile') }}
    diff --git a/bedrock/firefox/templates/firefox/welcome/page6.html b/bedrock/firefox/templates/firefox/welcome/page6.html index a243aeac3a2..934d5d2850f 100644 --- a/bedrock/firefox/templates/firefox/welcome/page6.html +++ b/bedrock/firefox/templates/firefox/welcome/page6.html @@ -36,7 +36,7 @@
    - + {{ ftl('welcome-page6-make-firefox-your-default') }}
    diff --git a/bedrock/firefox/templates/firefox/welcome/page8.html b/bedrock/firefox/templates/firefox/welcome/page8.html index 4757f0a0f9c..27aaa346ab0 100644 --- a/bedrock/firefox/templates/firefox/welcome/page8.html +++ b/bedrock/firefox/templates/firefox/welcome/page8.html @@ -30,7 +30,7 @@ heading_level=1 ) %}

    - + {{ ftl('welcome-page8-view-your-protection-report') }}

    @@ -47,7 +47,7 @@

    {{ ftl('welcome-page8-enhanced-tracking-protection') }}

    {{ ftl('welcome-page8-automatically-block-sites') }}

    - + {{ ftl('welcome-page8-see-whats-blocked') }}
    @@ -63,12 +63,12 @@

    {% if LANG == "en-US" %}

    See if your personal info has been exposed in a data breach. We’ll automatically remove it from sites selling it and continuously monitor your identity for future leaks.

    - + Check for breaches now {% else %}

    {{ ftl('welcome-page8-see-what-youve-been') }}

    - + {{ ftl('welcome-page8-go-to-monitor') }} {% endif %} @@ -83,7 +83,7 @@

    {{ ftl('welcome-page8-facebook-container') }}

    {{ ftl('welcome-page8-stay-connected') }}

    - + {{ ftl('welcome-page8-add-facebook-container') }}
    diff --git a/bedrock/firefox/templates/firefox/welcome/page9.de.html b/bedrock/firefox/templates/firefox/welcome/page9.de.html index 029abf0e8ba..1a5af416f6c 100644 --- a/bedrock/firefox/templates/firefox/welcome/page9.de.html +++ b/bedrock/firefox/templates/firefox/welcome/page9.de.html @@ -40,7 +40,7 @@

    Schnell, zuverlässig und extra sicher mit 30 Tage Geld-zurück-Garantie.

    - Hol dir Mozilla VPN + Hol dir Mozilla VPN

    {% endcall %} {% endblock %} diff --git a/bedrock/firefox/templates/firefox/welcome/page9.fr.html b/bedrock/firefox/templates/firefox/welcome/page9.fr.html index 5fbcd0d3611..91a282c8d53 100644 --- a/bedrock/firefox/templates/firefox/welcome/page9.fr.html +++ b/bedrock/firefox/templates/firefox/welcome/page9.fr.html @@ -40,7 +40,7 @@

    Rapide, fiable et ultra sécurisé avec une garantie de remboursement de 30 jours.

    - Installer Mozilla VPN + Installer Mozilla VPN

    {% endcall %} {% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html b/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html index eff8f559947..678a328fb9c 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html +++ b/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html @@ -19,7 +19,7 @@ {% endif %}
    - + diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html index 41c7c724fa6..dd4cfc900b0 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html @@ -71,7 +71,7 @@

    {{ main_title }}

    {{ main_tagline }}

    - + {{ cta_fast }}

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html index eab3a10a8ea..0e3e6b5c39c 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html @@ -41,13 +41,13 @@

    Fast. And getting faster.

    - + Make Firefox your default

    - + How fast is fast?

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html index 7685987b595..1e662c02aea 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html @@ -92,7 +92,7 @@

    - + {{ main_cta }}

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html index fd2e0352504..a608c1687de 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html @@ -41,7 +41,7 @@

    A browser that's truly yours

    - + Personalize your Firefox

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html index e6cde95ad70..95fd82a1b6c 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html @@ -39,7 +39,7 @@

    Sag Hola zu Firefox translations

    Klicke auf das Diese Seite übersetzen Icon in der Adressleiste von Firefox und genieße noch mehr Inhalte aus dem Web.

    -

    Jetzt ausprobieren

    +

    Jetzt ausprobieren

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html index 931b44a3b29..ae298f457b3 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html @@ -39,7 +39,7 @@

    Say ‘Bonjour’ to Firefox translations

    Click the Translate this page icon in Firefox’s address bar and enjoy content across the web.

    -

    Try it now

    +

    Try it now

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html index c1d0acccea1..586ec55a4a5 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html @@ -39,7 +39,7 @@

    Say ‘Bonjour’ to Firefox translations

    Click the Translate this page in Firefox’s address bar and enjoy content from around the world.

    -

    Try it now

    +

    Try it now

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html index 3da347697c9..b1472c3c5b0 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html @@ -39,7 +39,7 @@

    Say ‘Hola’ to Firefox translations

    Click the Translate this page icon in Firefox’s address bar and enjoy content across the web.

    -

    Try it now

    +

    Try it now

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html index aab4530a45d..15bac95fdf3 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html @@ -39,7 +39,7 @@

    Dites ‘Hello’ à Firefox translations

    Cliquez sur l'icône Traduire cette page dans la barre d'adresse de Firefox et profitez de plus de contenu sur le Web.

    -

    Essayer maintenant

    +

    Essayer maintenant

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html index b4a6a617405..e74481675db 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html @@ -95,7 +95,7 @@

    {{ main_title }}

    {{ tagline_one }}

    {{ tagline_two }}

    -

    {{ cta }}

    +

    {{ cta }}

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html index 89635ad48de..a3409519aa3 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html @@ -40,7 +40,7 @@

    Join our community

    - + Connect with Mozilla

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html index 2f3f96fd61f..b9de693b8e2 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html @@ -92,7 +92,7 @@

    {{ main_title }}

    - + {{ page_cta }}

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html index 9065373801c..4a6885327af 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html @@ -99,7 +99,7 @@

    {{ main_title }}

    - + {{ page_cta }} ❤️ diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html index 2d3e6d1b73f..f032eb586fe 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html @@ -30,7 +30,7 @@

    World-class multitasking

    Picture-In-Picture lets you watch every cartwheel and handspring without putting your life on pause. Just click the Picture-in-Picture button to pop out any video.

    - + Learn more

    diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html index d01dc1aab75..26cbb26fc10 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html @@ -31,13 +31,13 @@

    Webpages, simplified.

    - + Always use Firefox

    - + Learn more

    diff --git a/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html b/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html index 3645eb44e5b..6b054a0cad1 100644 --- a/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html +++ b/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html @@ -28,7 +28,7 @@

    The fight continues in Washington

    platforms.

    - + Learn more @@ -47,7 +47,7 @@

    Leading by Example

    the targeting behind every paid ad we place.

    - + Learn more @@ -67,7 +67,7 @@

    Crowdsourcing research into YouTube’s AI

    accountable.

    - + Learn more @@ -87,7 +87,7 @@

    Sounding the alarm on period trackers

    news media.

    - + Learn more @@ -107,7 +107,7 @@

    Total Cookie Protection

    Firefox is our next step towards creating a better internet where privacy is the default.

    - + Learn more @@ -127,7 +127,7 @@

    Battling misinformation in Kenya

    to confront it.

    - + Learn more @@ -148,7 +148,7 @@

    Making voice technology for everyone

    voice clips and newly added languages from Central Kurdish to Norwegian Nyorsk.

    - + Learn more @@ -168,7 +168,7 @@

    Keeping your online lives private

    your browsing activity and your multiple online lives between tabs.

    - + Learn more @@ -188,7 +188,7 @@

    Listening to the future of AI

    make online life healthier for everyone.

    - + Learn more diff --git a/bedrock/foundation/templates/foundation/annualreport/2021/index.html b/bedrock/foundation/templates/foundation/annualreport/2021/index.html index 6cafef4e65d..f19dedb8e41 100644 --- a/bedrock/foundation/templates/foundation/annualreport/2021/index.html +++ b/bedrock/foundation/templates/foundation/annualreport/2021/index.html @@ -114,13 +114,13 @@

    Mozilla’s next chapter:
    A word from @@ -271,8 +271,8 @@

    {{ ftl('home-join-us-in-shaping') }}

    {% endcall %} {% endif %} - {% set moz_ventures = 'href="%s" data-cta-type="link" data-cta-text="Mozilla Ventures"'|safe|format(('https://mozilla.vc/'+utm_params)) %} - {% set moz_ai = 'href="%s" data-cta-type="link" data-cta-text="Mozilla AI"'|safe|format(('https://mozilla.ai/'+utm_params)) %} + {% set moz_ventures = 'href="%s" data-cta-text="Mozilla Ventures"'|safe|format(('https://mozilla.vc/'+utm_params)) %} + {% set moz_ai = 'href="%s" data-cta-text="Mozilla AI"'|safe|format(('https://mozilla.ai/'+utm_params)) %} {% call split( diff --git a/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html b/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html index 4f73dc161f4..a37f157e3a3 100644 --- a/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html +++ b/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html @@ -35,7 +35,7 @@

    Dein Browser ist soooooo Standard

    (Wir haben auch ein paar wirklich gute Argumente.)

    - Ich schau mir Firefox mal an + Ich schau mir Firefox mal an {% endcall %} @@ -69,7 +69,7 @@

    Und was machen wir jetzt?

    Wir könnten dich nach deinem Lieblingsdino fragen, ein kleines Gedicht für dich schreiben, oder dir unseren Mobile Browser zeigen.

    - Zeigt mir den Mobile Browser + Zeigt mir den Mobile Browser {% endcall %} diff --git a/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html b/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html index d9e2d2e0494..ebd9651a84d 100644 --- a/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html +++ b/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html @@ -11,6 +11,6 @@ {{ ftl('home-featured-product') }}

    {{ ftl('home-feature-blur-your-location') }}

    - {{ ftl('home-cta-get-vpn') }} + {{ ftl('home-cta-get-vpn') }} diff --git a/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html b/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html index f85d586105c..ced9237d133 100644 --- a/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html +++ b/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html @@ -11,6 +11,6 @@ {{ ftl('home-mofo-build-our-movement') }}

    {{ ftl('home-mofo-donate-to-mofo-today') }}

    - {{ ftl('home-mofo-donate') }} + {{ ftl('home-mofo-donate') }} diff --git a/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html b/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html index 764bd2de417..d33d93d1f4a 100644 --- a/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html +++ b/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html @@ -47,7 +47,7 @@

    {{ ftl('moz-account-promo-title', class=gradient_class) }}

    }} diff --git a/bedrock/mozorg/tests/test_helper_misc.py b/bedrock/mozorg/tests/test_helper_misc.py index e0029f674af..f7f438057ed 100644 --- a/bedrock/mozorg/tests/test_helper_misc.py +++ b/bedrock/mozorg/tests/test_helper_misc.py @@ -1012,13 +1012,13 @@ def test_pocket_fxa_button(self): is_button_class=True, include_metrics=True, optional_parameters={"s": "ffpocket", "foo": "bar"}, - optional_attributes={"data-cta-text": "Try Pocket Now", "data-cta-type": "activate pocket", "data-cta-position": "primary"}, + optional_attributes={"data-cta-text": "Try Pocket Now", "data-cta-type": "pocket", "data-cta-position": "primary"}, ) expected = ( 'Try Pocket Now' + 'data-cta-text="Try Pocket Now" data-cta-type="pocket" data-cta-position="primary">Try Pocket Now' ) self.assertEqual(markup, expected) diff --git a/bedrock/newsletter/templates/newsletter/includes/form.html b/bedrock/newsletter/templates/newsletter/includes/form.html index 3bc366f94a2..fa5b33881f4 100644 --- a/bedrock/newsletter/templates/newsletter/includes/form.html +++ b/bedrock/newsletter/templates/newsletter/includes/form.html @@ -99,7 +99,7 @@

    -

    diff --git a/bedrock/products/templates/products/vpn/download.html b/bedrock/products/templates/products/vpn/download.html index 629f2268fa9..2ab74efb8e5 100644 --- a/bedrock/products/templates/products/vpn/download.html +++ b/bedrock/products/templates/products/vpn/download.html @@ -79,7 +79,7 @@

    {{ self.page_title_full() }}

    {{ ftl('vpn-download-for-windows-long') }}

    {{ ftl('vpn-download-based-on-your') }}

    {{ ftl('vpn-download-for-windows-requirements') }}

    - + {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }} @@ -93,7 +93,7 @@

    {{ ftl('vpn-download-for-windows-long') }}

    {{ ftl('vpn-download-for-mac-long', fallback='vpn-download-for-mac') }}

    {{ ftl('vpn-download-based-on-your') }}

    {{ ftl('vpn-download-version-requirements', version='11.0') }}

    - + {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }} @@ -107,7 +107,7 @@

    {{ ftl('vpn-download-for-mac-long', fallback='vpn-download-for-mac') }}

    {{ ftl('vpn-download-for-linux-long', fallback='vpn-download-for-linux') }}

    {{ ftl('vpn-download-based-on-your') }}

    {{ ftl('vpn-download-for-linux-requirements', version='20.04') }}

    - + {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }} @@ -121,7 +121,7 @@

    {{ ftl('vpn-download-for-linux-long', fallback='vpn-download-for-linux') }}<

    {{ ftl('vpn-download-for-ios-long-v2', fallback='vpn-download-for-ios') }}

    {{ ftl('vpn-download-based-on-your') }}

    {{ ftl('vpn-download-version-requirements', version='14.0') }}

    - + {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }} @@ -135,7 +135,7 @@

    {{ ftl('vpn-download-for-ios-long-v2', fallback='vpn-download-for-ios') }}{{ ftl('vpn-download-for-android-long', fallback='vpn-download-for-android') }}

    {{ ftl('vpn-download-based-on-your') }}

    {{ ftl('vpn-download-version-requirements', version='8.0') }}

    - + {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }} @@ -154,7 +154,7 @@

    {{ ftl('vpn-download-also-available') }}

    {{ ftl('vpn-download-for-windows-v2') }}

    {{ ftl('vpn-download-for-windows-requirements') }}

    - + {{ ftl('vpn-download-for-windows-long') }} @@ -167,7 +167,7 @@

    {{ ftl('vpn-download-for-windows-v2') }}

    {{ ftl('vpn-download-for-mac') }}

    {{ ftl('vpn-download-version-requirements', version='11.0') }}

    - + @@ -180,7 +180,7 @@

    {{ ftl('vpn-download-for-mac') }}

    {{ ftl('vpn-download-for-linux') }}

    {{ ftl('vpn-download-for-linux-requirements', version='20.04') }}

    - + @@ -193,7 +193,7 @@

    {{ ftl('vpn-download-for-linux') }}

    {{ ftl('vpn-download-for-ios') }}

    {{ ftl('vpn-download-version-requirements', version='14.0') }}

    - + @@ -206,7 +206,7 @@

    {{ ftl('vpn-download-for-ios') }}

    {{ ftl('vpn-download-for-android') }}

    {{ ftl('vpn-download-version-requirements', version='8.0') }}

    - + @@ -216,7 +216,7 @@

    {{ ftl('vpn-download-for-android') }}

    {% if ftl_has_messages('vpn-download-previous-versions') %}

    - {{ ftl('vpn-download-previous-versions') }} + {{ ftl('vpn-download-previous-versions') }}

    {% endif %} diff --git a/bedrock/products/templates/products/vpn/features.html b/bedrock/products/templates/products/vpn/features.html index bf839f04df0..994e44a47b2 100644 --- a/bedrock/products/templates/products/vpn/features.html +++ b/bedrock/products/templates/products/vpn/features.html @@ -79,7 +79,7 @@

  • - {% set wireguard_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://mullvad.net/help/why-wireguard/')) %} + {% set wireguard_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://mullvad.net/help/why-wireguard/')) %}
    @@ -172,7 +172,7 @@

    {{ ftl('vpn-features-secure') }}

    base_el='li' ) %}

    - {% set feature_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/multi-hop-encrypt-your-data-twice-enhanced-security' + _params)) %} + {% set feature_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/multi-hop-encrypt-your-data-twice-enhanced-security' + _params)) %} {{ ftl('vpn-features-multi-hop-feature', feature=feature_url) }}

    {% endcall %} @@ -192,7 +192,7 @@

    {{ ftl('vpn-features-secure') }}

    base_el='li' ) %}

    - {% set dns_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/how-do-i-change-my-dns-settings' + _params)) %} + {% set dns_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/how-do-i-change-my-dns-settings' + _params)) %} {{ ftl('vpn-features-keep-traffic-protected', dns=dns_url) }}

    @@ -288,7 +288,7 @@

    {{ ftl('vpn-features-personalize-which-apps') }}

    media_after=True ) %} - {% set containers_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/use-multi-account-containers-mozilla-vpn' + _params)) %} + {% set containers_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/use-multi-account-containers-mozilla-vpn' + _params)) %}

    {{ ftl('vpn-features-set-different-locations') }}

    @@ -337,7 +337,7 @@

    {{ ftl('vpn-features-trustworthy') }}

    base_el='li' ) %}

    - {% set privacy_notice = 'href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.subscription-services')) %} + {% set privacy_notice = 'href="%s" '|safe|format(url('privacy.notices.subscription-services')) %} {{ ftl('vpn-features-simply-put-we-dont', privacy=privacy_notice) }}

    @@ -358,7 +358,7 @@

    {{ ftl('vpn-features-trustworthy') }}

    base_el='li' ) %}

    - {% set github_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://github.com/mozilla-mobile/mozilla-vpn-client')) %} + {% set github_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://github.com/mozilla-mobile/mozilla-vpn-client')) %} {{ ftl('vpn-features-made-with-open-source-code', github=github_url) }}

    @@ -379,7 +379,7 @@

    {{ ftl('vpn-features-trustworthy') }}

    base_el='li' ) %}

    - {% set report_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://blog.mozilla.org/mozilla/news/mozilla-vpn-completes-independent-security-audit-by-cure53' + _params)) %} + {% set report_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://blog.mozilla.org/mozilla/news/mozilla-vpn-completes-independent-security-audit-by-cure53' + _params)) %} {{ ftl('vpn-features-weve-been-audited', report=report_url) }}

    @@ -400,7 +400,7 @@

    {{ ftl('vpn-features-trustworthy') }}

    base_el='li' ) %}

    - {% set mofo_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://foundation.mozilla.org/' + _params)) %} + {% set mofo_url = 'href="%s" rel="external noopener" target="_blank"'|safe|format(('https://foundation.mozilla.org/' + _params)) %} {{ ftl('vpn-features-were-backed-by-mofo', mofo=mofo_url) }}

    diff --git a/bedrock/products/templates/products/vpn/includes/macros.html b/bedrock/products/templates/products/vpn/includes/macros.html index 9d61c42a070..997d8c419b9 100644 --- a/bedrock/products/templates/products/vpn/includes/macros.html +++ b/bedrock/products/templates/products/vpn/includes/macros.html @@ -96,14 +96,14 @@

    {{ subheading }}

    {% macro vpn_conditional_cta(position) -%} {% if vpn_available %} - + {{ ftl('vpn-shared-subscribe-link') }}

    {{ ftl('vpn-shared-money-back-guarantee') }}

    {% else %} - + {{ ftl('vpn-shared-waitlist-link') }} @@ -118,14 +118,14 @@

    {{ subheading }}

    {% if vpn_available %}

    {% set pricing_url = '#pricing' if request.path.endswith('/products/vpn/') else url('products.vpn.landing') + '#pricing' %} - + {{ ftl('vpn-shared-subscribe-link') }}

    {{ ftl('vpn-shared-features-guarantee') }}

    {% else %}

    - + {{ ftl('vpn-shared-waitlist-link') }}

    @@ -136,11 +136,11 @@

    {{ subheading }}

    {% macro vpn_nav_cta(link_text, alt_link_text, download_link_text, utm_source, utm_campaign) -%}
    {% if vpn_available %} - + {{ ftl('vpn-shared-subscribe-link') }} {% else %} - + {{ ftl('vpn-shared-waitlist-link') }} {% endif %} @@ -151,11 +151,11 @@

    {{ subheading }}

    {% if vpn_available %} {% set pricing_url = '#pricing' if request.path.endswith('/products/vpn/') else url('products.vpn.landing') + '#pricing' %} - + {{ ftl('vpn-shared-subscribe-link') }} {% else %} - + {{ ftl('vpn-shared-waitlist-link') }} {% endif %} @@ -211,11 +211,11 @@

    {{ heading }}

    class_name=class_name, optional_attributes= { 'data-cta-text' : 'Get Mozilla VPN', - 'data-cta-type' : 'button', + 'data-cta-type' : 'vpn', } ) }} {% else %} - + {{ alt_link_text }} {% endif %} diff --git a/bedrock/products/templates/products/vpn/includes/subnav-refresh.html b/bedrock/products/templates/products/vpn/includes/subnav-refresh.html index a08d0b7c3e0..98b4f551fa1 100644 --- a/bedrock/products/templates/products/vpn/includes/subnav-refresh.html +++ b/bedrock/products/templates/products/vpn/includes/subnav-refresh.html @@ -8,23 +8,23 @@

    - + {{ ftl('vpn-subnav-title') }}

    • - + {{ ftl('vpn-subnav-learn-about-vpns') }}
    • - + {{ ftl('vpn-subnav-features') }}
    • - + {{ ftl('vpn-subnav-download-mozilla-vpn') }}
      • diff --git a/bedrock/products/templates/products/vpn/landing-refresh.html b/bedrock/products/templates/products/vpn/landing-refresh.html index 5a5d3c1b366..6962b28a29c 100644 --- a/bedrock/products/templates/products/vpn/landing-refresh.html +++ b/bedrock/products/templates/products/vpn/landing-refresh.html @@ -99,7 +99,7 @@

      {{ ftl('vpn-landing-powerful-privacy-for-peace') }}

      {% if vpn_available %}

      - + {{ vpn_saving(country_code=country_code, lang=LANG, bundle_relay=False, ftl_string='vpn-shared-save-percent-on') }} @@ -108,7 +108,7 @@

      {{ ftl('vpn-landing-powerful-privacy-for-peace') }}

      {% else %} - + {{ ftl('vpn-shared-waitlist-link') }} {% endif %} @@ -165,7 +165,7 @@

      {{ ftl('vpn-landing-one-subscription-for-all-your')

      {{ ftl('vpn-shared-mozilla-vpn-is-not-yet-available') }}

      - + {{ ftl('vpn-shared-waitlist-link') }}
      diff --git a/bedrock/products/templates/products/vpn/landing.html b/bedrock/products/templates/products/vpn/landing.html index a5aa0a8cce0..eb2f6a53aa5 100644 --- a/bedrock/products/templates/products/vpn/landing.html +++ b/bedrock/products/templates/products/vpn/landing.html @@ -93,7 +93,7 @@ ) %}
      - + {{ ftl('vpn-shared-waitlist-link') }} @@ -173,7 +173,7 @@ ) %}

      {{ ftl('vpn-shared-features-full-list-servers', url='https://mullvad.net/servers/', attrs='target="_blank" rel="external noopener noreferrer"') }}

      - + {{ ftl('vpn-shared-subscribe-link') }} @@ -198,7 +198,7 @@ class_name='vpn-content-media-left-half vpn-more-countries-coming-soon' ) %} - + {{ ftl('vpn-shared-waitlist-link') }} @@ -229,7 +229,7 @@ {{ ftl('vpn-add-relay-to-protect', url='https://relay.firefox.com/premium/' + _params)}}

      - + {{ ftl('vpn-shared-get-vpn-plus-relay') }} {% endcall %} @@ -326,14 +326,14 @@

      {{ ftl('vpn-landing-faq-manage-subscription-question-heading') }}

      {{ ftl('vpn-landing-faq-download-heading') }}

      - {% set attrs = 'href="' ~ url('products.vpn.download') ~ '" data-cta-type="link" data-cta-text="Download Page"' %} + {% set attrs = 'href="' ~ url('products.vpn.download') ~ '" data-cta-text="Download Page"' %} {{ ftl('vpn-landing-faq-download-desc', attrs=attrs) }}

      {% endif %} diff --git a/bedrock/products/templates/products/vpn/pricing-refresh.html b/bedrock/products/templates/products/vpn/pricing-refresh.html index 043a91524e2..78fa2ed32f9 100644 --- a/bedrock/products/templates/products/vpn/pricing-refresh.html +++ b/bedrock/products/templates/products/vpn/pricing-refresh.html @@ -52,7 +52,7 @@

      {{ ftl('vpn-pricing-one-subscription') }}

      {{ ftl('vpn-pricing-vpn-not-available') }}

      - + {{ ftl('vpn-shared-waitlist-link') }}
      @@ -73,8 +73,8 @@

      {{ ftl('vpn-pricing-refund-policy') }}

    • `;