Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to adblocker feature page [fix #15104] #15189

Merged
merged 1 commit into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions bedrock/firefox/templates/firefox/features/adblocker.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,25 @@ <h2>{{ ftl('features-adblocker-so-many-ads-so-little') }}</h2>
<p>{{ ftl('features-adblocker-these-ads-might-be-loud', firefox=url('firefox.new'), addons='https://blog.mozilla.org/firefox/ad-blocker-roundup-5-adblockers-that-improve-your-internet-experience/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>

<h2>{{ ftl('features-adblocker-find-the-right-ad-blocker') }}</h2>

{% if ftl_has_messages(
'features-adblocker-there-are-scores-of-content',
'features-adblocker-considered-by-many-to-be-the',
'features-adblocker-adguard-adblocker-blunts',
'features-adblocker-ghostery-is-another-great',
'features-adblocker-these-extensions-work-beautifully') %}
<p>{{ ftl('features-adblocker-there-are-scores-of-content') }}</p>
<p>{{ ftl('features-adblocker-considered-by-many-to-be-the', attrs='href="https://addons.mozilla.org/firefox/addon/ublock-origin/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features"|safe') }}</p>
<p>{{ ftl('features-adblocker-adguard-adblocker-blunts', attrs1='href="https://addons.mozilla.org/firefox/addon/adguard-adblocker/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features"|safe', attrs2='href="https://addons.mozilla.org/firefox/addon/popup-blocker/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features"|safe') }}</p>
<p>{{ ftl('features-adblocker-ghostery-is-another-great', attrs='href="https://addons.mozilla.org/firefox/addon/ghostery/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features"|safe') }}</p>
{% set desktop_link = 'href="%s" data-link-type="link" data-link-text="Firefox for desktop"'|safe|format(url('firefox.new')) %}
{% set android_link = 'href="%s" data-link-type="link" data-link-text="Firefox for desktop"'|safe|format(url('firefox.browsers.mobile.android')) %}
<p>{{ ftl('features-adblocker-these-extensions-work-beautifully', attrs1=desktop_link, attrs2=android_link) }}</p>
{% else %}
<p>{{ ftl('features-adblocker-theres-adblocker-ultimate', url='https://addons.mozilla.org/firefox/addon/adblocker-ultimate/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
<p>{{ ftl('features-adblocker-popup-ads-are-the-worst', url='https://addons.mozilla.org/firefox/addon/popup-blocker/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
<p>{{ ftl('features-adblocker-one-of-the-most-popular', url='https://addons.mozilla.org/firefox/addon/adblock-for-firefox/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
{% endif %}

<h2>{{ftl('features-adblocker-create-a-tracker-free') }}</h2>
<p>{{ ftl('features-adblocker-on-firefox-you-can-use', privacy='https://restoreprivacy.com/firefox-privacy/', blocking='https://support.mozilla.org/kb/content-blocking?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
Expand Down
23 changes: 23 additions & 0 deletions l10n/en/firefox/features/adblocker.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,37 @@ features-adblocker-these-ads-might-be-loud = These ads might be loud video ads,

features-adblocker-find-the-right-ad-blocker = Find the right ad blocker for you

features-adblocker-there-are-scores-of-content = There are scores of content blockers out there, but here are a few fantastic options curated by { -brand-name-mozilla }…

# Variables:
# $attrs (string) - link to https://addons.mozilla.org/firefox/addon/ublock-origin/ with other attributes
features-adblocker-considered-by-many-to-be-the = Considered by many to be the gold standard among ad blockers, <a { $attrs }>uBlock Origin</a> is renowned for its effectiveness and efficiency. Highly customizable, yet it also works brilliantly right “out of the box.”

# Variables:
# $attrs1 (string) - link to https://addons.mozilla.org/firefox/addon/adguard-adblocker/ with other attributes
# $attsr2 (string) - link to https://addons.mozilla.org/firefox/addon/popup-blocker/ with other attributes
features-adblocker-adguard-adblocker-blunts = <a { $attrs1 }>AdGuard AdBlocker</a> blunts advertising everywhere. It blocks ads on the web, social media, even those annoying pop-ups (however if you’re looking to just suppress pop-ups you can’t go wrong with <a { $attrs2 }>Popup Blocker</a>).

# Variables:
# $attrs (string) - link to https://addons.mozilla.org/firefox/addon/ghostery/ with other attributes
features-adblocker-ghostery-is-another-great = <a { $attrs }>Ghostery</a> is another great choice that not only blocks ads but provides additional anti-tracking benefits.

# Variables:
# $attrs1 (string) - link to /firefox/new/ with other attributes
# $attsr2 (string) - link to /firefox/mobile/android/ with other attributes
features-adblocker-these-extensions-work-beautifully = These extensions work beautifully on both <a { $attrs1 }>{ -brand-name-firefox } for desktop</a> and <a { $attrs2 }>Android</a>.

# Obsolete string (expires: 2024-11-18)
# Variables:
# $url (url) - link to https://addons.mozilla.org/firefox/addon/adblocker-ultimate/
features-adblocker-theres-adblocker-ultimate = There’s <a href="{ $url }">AdBlocker Ultimate</a> that gets rid of every single ad, but buyer beware. Some of your favorite newspapers and magazines rely on advertising. Too many people blocking their ads could put them out of business.

# Obsolete string (expires: 2024-11-18)
# Variables:
# $url (url) - link to https://addons.mozilla.org/firefox/addon/popup-blocker/
features-adblocker-popup-ads-are-the-worst = Popup ads are the worst. Block them with <a href="{ $url }">Popup Blocker</a> and never deal with another annoying popup again.

# Obsolete string (expires: 2024-11-18)
# Variables:
# $url (url) - link to https://addons.mozilla.org/firefox/addon/adblock-for-firefox/
features-adblocker-one-of-the-most-popular = One of the most popular ad blockers for { -brand-name-chrome }, { -brand-name-safari } and { -brand-name-firefox } is <a href="{ $url }">AdBlock</a>. Use it to block ads on { -brand-name-facebook }, { -brand-name-youtube } and { -brand-name-hulu }.
Expand Down