Skip to content

Commit

Permalink
Add WNP 117 for VPN and Relay [fix #13496, fix #13495]
Browse files Browse the repository at this point in the history
Co-authored-by: Nathan Barrett <30009669+nathan-barrett@users.noreply.github.com>
  • Loading branch information
craigcook and nathan-barrett committed Aug 19, 2023
1 parent 3686e42 commit 5a9664d
Show file tree
Hide file tree
Showing 11 changed files with 789 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}What’s new with Firefox{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{% block body_id %}firefox-whatsnew{% endblock %}

{% block page_css %}
{{ css_bundle('firefox_whatsnew_117_na_relay') }}
{% endblock %}

{% block experiments %}
{% if switch('experiment-whatsnew-117-na-vpn-relay', ['en-US']) %}
{{ js_bundle('firefox_whatsnew_117_experiment_na_vpn_relay') }}
{% endif %}
{% endblock %}

{% block site_header %}{% endblock %}

{% block wnp_content %}
<section class="wnp-content-main">
<div class="mzp-l-content mzp-t-content-md">
<div class="wnp-body">
<div class="mzp-c-wordmark mzp-t-wordmark-sm mzp-t-product-relay">Firefox Relay</div>
<div class="wnp-relay-animation" role="presentation">
<div class="relay-input">
<span>Enter your email address</span>
<img src="{{ static('img/firefox/whatsnew/whatsnew117-na/check.svg') }}" alt="" class="input-check">
</div>
<div class="relay-dropdown">
<button>
<img width="32" src="{{ static('img/firefox/whatsnew/whatsnew117-na/relay-inverse.svg') }}" alt="" class="wnp-relay-logo">
Generate relay mask
</button>
</div>
</div>
<h2 class="wnp-main-title">Avoiding spam just <br>got easier</h2>
<div class="wnp-body-text">
<p>New feature alert: Now Firefox Relay subscribers can now access their email masks right in the Firefox Browser.</p>
<p>Not using Relay? Let’s fix that.</p>
</div>
<p class="wnp-main-cta try-relay landing">
<a class="mzp-c-button mzp-t-product" href="https://relay.firefox.com/?{{ utm_params }}"
data-cta-text="Try Relay" data-cta-type="button">
Try it out
</a>
</p>
<p class="wnp-main-cta try-relay fxa">
<a class="mzp-c-button mzp-t-product"
href="https://relay.firefox.com/accounts/profile/?{{ utm_params }}"
data-cta-text="Try Relay" data-cta-type="button">
Try it out
</a>
</p>
</div>
<p class="wnp-sign-off">
<strong>Powered by Mozilla.</strong> Putting people before profits since 1998.
</p>
</section>
{% endblock %}

{% block js %}
{{ js_bundle('firefox_whatsnew_update') }}
{{ js_bundle('firefox_whatsnew_117_na_relay') }}
{% endblock %}
178 changes: 178 additions & 0 deletions bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx117-vpn.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{% block body_id %}firefox-whatsnew{% endblock %}

{% block page_css %}
{{ css_bundle('firefox_whatsnew_117_vpn') }}
{% endblock %}

{% block experiments %}
{% if switch('experiment-whatsnew-117-na-vpn-relay', ['en-US']) %}
{{ js_bundle('firefox_whatsnew_117_experiment_na_vpn_relay') }}
{% endif %}
{% endblock %}

{% block site_header %}{% endblock %}

{%- if LANG == "cs": -%}
{% set vpn_title = "Soukromí na vyšší úrovni je na dosah pouhým kliknutím" %}
{% set vpn_tagline = "Léto sice pomalu končí, ale vaše zabezpečení nikoli. Mozilla VPN je řešení, které vám na jedno kliknutí zajistí větší klid po celý rok." %}
{% set vpn_cta = "Získejte Mozilla VPN" %}
{% set vpn_signoff = "<strong>Provozováno společnosti Mozilla.</strong> Upřednostňujeme lidi před ziskem už od roku 1998."|safe %}

{%- elif LANG == "da": -%}
{% set vpn_title = "Det næste niveau af privatliv er kun ét klik væk" %}
{% set vpn_tagline = "Sommeren lakker mod enden, men det bør din sikkerhed ikke. Mozilla VPN kan give dig ekstra ro i sindet året rundt med kun ét klik." %}
{% set vpn_cta = "Få Mozilla VPN" %}
{% set vpn_signoff = "<strong>Leveret af Mozilla.</strong> Vi har sat mennesker over profit siden 1998."|safe %}

{%- elif LANG == "de": -%}
{% set vpn_title = "Mit einem Klick gibt’s Datenschutz der Extraklasse" %}
{% set vpn_tagline = "Der Sommer mag sich verabschieden, aber Ihre Sicherheit sollte bleiben. Mozilla VPN ist Ihre One-Click-Lösung für ein gutes Gefühl, das ganze Jahr über." %}
{% set vpn_cta = "Holen Sie sich Mozilla VPN" %}
{% set vpn_signoff = "<strong>Powered by Mozilla.</strong> Bei uns stehen Menschen seit 1998 über Gewinnen."|safe %}

{%- elif LANG == "el": -%}
{% set vpn_title = "Το απόρρητο επόμενου επιπέδου είναι μόλις ένα κλικ μακριά" %}
{% set vpn_tagline = "Το καλοκαίρι μπορεί να τελειώνει, αλλά η ασφάλειά σας δεν πρέπει.Το Mozilla VPN είναι η λύση με ένα-κλικ για περισσότερη ηρεμία όλο το χρόνο." %}
{% set vpn_cta = "Αποκτήστε το Mozilla VPN" %}
{% set vpn_signoff = "<strong>Με την υποστήριξη της Mozilla.</strong> Βάζοντας τους ανθρώπους πάνω από το κέρδος από το 1998."|safe %}

{%- elif LANG.startswith("es-"): -%}
{% set vpn_title = "La privacidad al máximo nivel está a un solo clic de distancia." %}
{% set vpn_tagline = "Aunque el verano afloje, tu seguridad no debería hacerlo.Mozilla VPN es tu solución en un solo clic para disfrutar de tranquilidad extra durante todo el año." %}
{% set vpn_cta = "Consigue Mozilla VPN" %}
{% set vpn_signoff = "<strong>Desarrollado por Mozilla.</strong> Priorizamos a las personas sobre el beneficio desde 1998."|safe %}

{%- elif LANG == "fi": -%}
{% set vpn_title = "Seuraavan tason tietosuoja on vain napsautuksen päässä" %}
{% set vpn_tagline = "Vaikka päivät lyhenevät, tietoturvan täytyy pysyä töissä. Mozilla VPN on yhden napsautuksen ratkaisu mielenrauhaan kaikkina vuodenaikoina." %}
{% set vpn_cta = "Hanki Mozilla VPN" %}
{% set vpn_signoff = "<strong>Powered by Mozilla.</strong> Ihmiset etusijalle voitontavoittelun sijaan jo vuodesta 1998."|safe %}

{%- elif LANG == "fr": -%}
{% set vpn_title = "La sécurité renforcée à portée de clic" %}
{% set vpn_tagline = "L’été touche à sa fin, mais votre sécurité reste importante. En un clic, Mozilla VPN vous protège tout au long de l’année." %}
{% set vpn_cta = "Obtenir Mozilla VPN" %}
{% set vpn_signoff = "<strong>Conçu par Mozilla.</strong> Nous plaçons les personnes avant le profit depuis 1998."|safe %}

{%- elif LANG == "hr": -%}
{% set vpn_title = "Viša razina privatnosti dostupna je samo jednim klikom" %}
{% set vpn_tagline = "Ljeto je možda na odlasku, ali vaša privatnost ne bi trebala biti. Mozilla VPN je vaše rješenje jednim klikom za dodatnu bezbrižnost tijekom cijele godine." %}
{% set vpn_cta = "Uzmite Mozilla VPN" %}
{% set vpn_signoff = "<strong>Powered by Mozilla.</strong> Stavljamo ljude ispred profita od 1998."|safe %}

{%- elif LANG == "hu": -%}
{% set vpn_title = "A biztonság következő szintje csak egy kattintásra van" %}
{% set vpn_tagline = "A nyár ugyan hamarosan lejár, de biztonsága sosem lehet a múlté. A Mozilla VPN egész évben plusz biztonságot nyújt, egyetlen kattintással." %}
{% set vpn_cta = "Mozilla VPN letöltése" %}
{% set vpn_signoff = "<strong>A Mozilla erejével.</strong> Mi az embereket helyezzük a profit elé – már 1998 óta."|safe %}

{%- elif LANG == "it": -%}
{% set vpn_title = "La privacy di livello assoluto a portata di clic" %}
{% set vpn_tagline = "L'estate sta finendo, ma la tua sicurezza non può mai andare in vacanza. Mozilla VPN è la tua soluzione a portata di clic per un anno intero di tranquillità." %}
{% set vpn_cta = "Scopri Mozilla VPN" %}
{% set vpn_signoff = "<strong>Creata da Mozilla.</strong> Dal 1998, prima le persone, poi i profitti."|safe %}

{%- elif LANG == "lt": -%}
{% set vpn_title = "Aukštesnio lygio privatumas vos vienu spustelėjimu" %}
{% set vpn_tagline = "Vasara gal ir baigiasi, tačiau jūsų saugumas neturėtų. „Mozilla VPN“ vos vienu spustelėjimu užtikrins ramybę visiems metams." %}
{% set vpn_cta = "Įsigykite „Mozilla VPN“" %}
{% set vpn_signoff = "<strong>Teikia „Mozilla“.</strong> Pirmenybė žmonėms, o ne pelnui, nuo 1998 m."|safe %}

{%- elif LANG == "lv": -%}
{% set vpn_title = "Nākamā līmeņa privātums ir tikai viena klikšķa attālumā" %}
{% set vpn_tagline = "Lai arī vasara tuvojas beigām, jūsu drošībai nevajadzētu beigties. Tikai viens klikšķis, un Mozilla VPN parūpēsies par jūsu sirdsmieru visa gada garumā." %}
{% set vpn_cta = "Iegādāties Mozilla VPN" %}
{% set vpn_signoff = "<strong>Nodrošina Mozilla.</strong> Rūpes par cilvēkiem, nevis peļņu, jau kopš 1998. gada."|safe %}

{%- elif LANG == "nl": -%}
{% set vpn_title = "Til uw privacy in één klik naar een hoger niveau" %}
{% set vpn_tagline = "De zomer loopt op zijn einde. Hoog tijd om uw veiligheid na te kijken. In één klik biedt Mozilla VPN u extra zekerheid gedurende het hele jaar." %}
{% set vpn_cta = "Mozilla VPN downloaden" %}
{% set vpn_signoff = "<strong>Mogelijk gemaakt door Mozilla.</strong> De organisatie die mensen belangrijker vindt dan winst, sinds 1998."|safe %}

{%- elif LANG == "pl": -%}
{% set vpn_title = "Jedno kliknięcie i wchodzisz na wyższy poziom prywatności" %}
{% set vpn_tagline = "Letnie słońce słabnie, Twoje bezpieczeństwo – wręcz przeciwnie. Mozilla VPN to prosty jak kliknięcie myszką sposób na spokojną głowę przez cały rok." %}
{% set vpn_cta = "Pobierz Mozilla VPN" %}
{% set vpn_signoff = "<strong>Wykorzystuje technologię Mozilla.</strong> Tworzymy dla ludzi, nie dla zysku – już od 1998 r."|safe %}

{%- elif LANG.startswith("pt"): -%}
{% set vpn_title = "A privacidade mais avançada está a um clique de distância" %}
{% set vpn_tagline = "O verão está quase a terminar, mas o mesmo não pode acontecer com a sua segurança. A VPN Mozilla é a sua solução com um só clique que lhe proporciona total tranquilidade durante todo o ano." %}
{% set vpn_cta = "Obtenha a VPN Mozilla" %}
{% set vpn_signoff = "<strong>Com tecnologia Mozilla.</strong> Colocamos as pessoas à frente dos lucros desde 1998."|safe %}

{%- elif LANG == "ru": -%}
{% set vpn_title = "Конфиденциальность следующего уровня будет вашей в один клик" %}
{% set vpn_tagline = "Лето, может быть, и подходит к концу, но не ваша безопасность.Mozilla VPN — это ваше решение одним кликом для дополнительного душевного спокойствия в течение всего года." %}
{% set vpn_cta = "Установить Mozilla VPN" %}
{% set vpn_signoff = "<strong>На базе Mozilla.</strong> Ставим людей выше прибыли с 1998 года."|safe %}

{%- elif LANG == "sk": -%}
{% set vpn_title = "Súkromie na vyššej úrovni je vzdialené len jedno kliknutie." %}
{% set vpn_tagline = "Leto sa síce končí, ale vaša bezpečnosť by sa nemala.VPN Mozilla je vaše riešenie na jedno kliknutie pre špeciálny pocit istoty počas celého roka." %}
{% set vpn_cta = "Získajte VPN Mozilla" %}
{% set vpn_signoff = "<strong>Podporované spoločnosťou Mozilla.</strong> Ľudí uprednostňujeme pred ziskom už od roku 1998."|safe %}

{%- elif LANG == "sl": -%}
{% set vpn_title = "Od napredne stopnje zasebnosti vas loči zgolj en klik." %}
{% set vpn_tagline = "Poletje se poslavlja, vaša varnost pa ne. Z rešitvijo Mozilla VPN boste brez skrbi vse leto." %}
{% set vpn_cta = "Prenesite Mozilla VPN" %}
{% set vpn_signoff = "<strong>Rešitev omogoča Mozilla.</strong> Ljudi postavljamo pred dobiček že od leta 1998."|safe %}

{%- else: -%}
{% set vpn_title = "Next-level privacy is just a click away" %}
{% set vpn_tagline = "Summer may be winding down, but your security shouldn’t. Mozilla VPN is your one-click solution for extra peace of mind all year long." %}
{% set vpn_cta = "Get Mozilla VPN" %}
{% set vpn_signoff = "<strong>Powered by Mozilla.</strong> Putting people before profits since 1998."|safe %}
{%- endif -%}

{% block wnp_content %}
<section class="wnp-content-main">
<div class="mzp-l-content mzp-t-content-md">
<div class="wnp-main-image">
<span class="toggle" role="presentation"><span class="toggle-display"></span></span>
</div>

<h2 class="wnp-main-title">{{ vpn_title }}</h2>

<p class="wnp-main-tagline">
{{ vpn_tagline }}
</p>

<p class="wnp-main-cta">
{% if variant == "2" %}
<a class="mzp-c-button mzp-t-product" href="{{ url('products.vpn.landing') }}#pricing" data-cta-text="Get Mozilla VPN" data-cta-type="button">
{{ vpn_cta }}
</a>
{% else %}
<a class="mzp-c-button mzp-t-product" href="{{ url('products.vpn.landing') }}" data-cta-text="Get Mozilla VPN" data-cta-type="button">
{{ vpn_cta }}
</a>
{% endif %}
</p>
</div>

<p class="wnp-sign-off">
{{ vpn_signoff }}
</p>
</div>
</section>
{% endblock %}

{% block js %}
{{ js_bundle('firefox_whatsnew_update') }}
{% endblock %}
46 changes: 42 additions & 4 deletions bedrock/firefox/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ class WhatsnewView(L10nTemplateView):
"firefox/whatsnew/whatsnew-fx117-de-reader-view.html": ["firefox/whatsnew/whatsnew"],
"firefox/whatsnew/whatsnew-fx117-fr-reader-view.html": ["firefox/whatsnew/whatsnew"],
"firefox/whatsnew/whatsnew-fx117-uk-reader-view.html": ["firefox/whatsnew/whatsnew"],
"firefox/whatsnew/whatsnew-fx117-vpn.html": ["firefox/whatsnew/whatsnew"],
"firefox/whatsnew/whatsnew-fx117-na-relay.html": ["firefox/whatsnew/whatsnew"],
}

# specific templates that should not be rendered in
Expand All @@ -421,7 +423,7 @@ class WhatsnewView(L10nTemplateView):
]

# place expected ?v= values in this list
variations = ["1", "2"]
variations = ["1", "2", "3", "4"]

def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
Expand Down Expand Up @@ -488,11 +490,16 @@ def get_template_names(self):
else:
template = "firefox/whatsnew/index.html"
elif version.startswith("117."):
if locale.startswith("en-"):
if country in WNP117_VPN_EXPANSION_COUNTRIES and ftl_file_is_active("firefox/whatsnew/whatsnew"):
template = "firefox/whatsnew/whatsnew-fx117-vpn.html"
elif locale.startswith("en-"):
if locale == "en-GB" or country == "GB":
template = "firefox/whatsnew/whatsnew-fx117-uk-reader-view.html"
else:
template = "firefox/whatsnew/index.html"
elif locale in ["en-US", "en-CA"]:
if variant == "3":
template = "firefox/whatsnew/whatsnew-fx117-na-relay.html"
else:
template = "firefox/whatsnew/whatsnew-fx117-vpn.html"
elif locale == "de":
template = "firefox/whatsnew/whatsnew-fx117-de-reader-view.html"
elif locale == "fr":
Expand Down Expand Up @@ -557,6 +564,37 @@ def get_template_names(self):
return [template]


WNP117_VPN_EXPANSION_COUNTRIES = [
"AT", # Austria
"BE", # Belgium
"BG", # Bulgaria
"CH", # Switzerland
"CY", # Cyprus
"CZ", # Czech Republic
# "DE", # Germany
"DK", # Denmark
"EE", # Estonia
"ES", # Spain
"FI", # Finland
# "FR", # France
"HR", # Croatia
"HU", # Hungary
"IE", # Ireland
"IT", # Italy
"LT", # Lithuania
"LU", # Luxembourg
"LV", # Latvia
"MT", # Malta
"NL", # Netherlands
"PL", # Poland
"PT", # Portugal
"RO", # Romania
"SE", # Sweden
"SI", # Slovenia
"SK", # Slovakia
]


class DownloadThanksView(L10nTemplateView):
ftl_files_map = {
"firefox/new/basic/thanks.html": ["firefox/new/download"],
Expand Down
5 changes: 5 additions & 0 deletions l10n/en/firefox/whatsnew/whatsnew.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

### URL: https://www-dev.allizom.org/firefox/60.0/whatsnew/

whatsnew-page-title-v2 = What’s new with { -brand-name-firefox }
# Obsolete string
whatsnew-page-title = What’s new with { -brand-name-firefox } - More privacy, more protections.
whatsnew-page-description = Take your stand against an industry that’s selling your data to third parties. Stay smart and safe online with technology that fights for you.
whatsnew-firefox = { -brand-name-firefox }
Expand All @@ -25,3 +28,5 @@ whatsnew-out-of-date-notification-v2 = An even newer { -brand-name-firefox } is
# Variables:
# $url (url) - link to https://www.mozilla.org/firefox/notes/
whatsnew-release-notes = Read the <a href="{ $url }">Release Notes</a> to know more about what’s new in your { -brand-name-firefox } browser.
whatsnew-signoff = <strong>Powered by { -brand-name-mozilla }.</strong> Putting people before profits since 1998.
Loading

0 comments on commit 5a9664d

Please sign in to comment.