Point links away from firefox.privacy.* subpages (#14669)

* Update vpn when-to-use privacy link to kb * Update fx more cards * Reorder fx more cards * Replace misinformation broken link * Update sumo kb link --------- Co-authored-by: Jan Brasna <[email protected]>
mozilla · Jun 19, 2024 · 98e86e8 · 98e86e8
1 parent 7077dbc
commit 98e86e8
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 73 deletions.
diff --git a/bedrock/firefox/templates/firefox/more.html b/bedrock/firefox/templates/firefox/more.html
@@ -132,73 +132,14 @@ <h2>{{ ftl('learn-more-about-firefox', fallback='firefox-products-are') }}</h2>
         link_url=url('firefox.browsers.chromebook'),
       )}}
 
-      {{ card(
-        title=ftl('firefox-more-firefox-quantum'),
-        ga_title='Firefox Browsers',
-        image=resp_img('img/firefox/more/firefox-quantum.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('firefox-more-quantum-was-revolution'),
-        link_url=url('firefox.browsers.quantum')
-      )}}
-    </div>
-    <div class="mzp-l-card-third">
-      {{ card(
-        title=ftl('firefox-more-little-book'),
-        ga_title='Little Book of Privacy',
-        image=resp_img('img/firefox/more/little-book-of-privacy.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc= ftl('firefox-more-you-can-reclaim'),
-        link_url=url('firefox.privacy.book')
-      )}}
-
-      {{ card(
-        title=ftl('incognito-browser-what'),
-        ga_title='Features Private Browsing',
-        image=resp_img('img/firefox/more/incognito-browser.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('firefox-calls-it'),
-        link_url=url('firefox.browsers.incognito-browser')
-      )}}
-
-      {{ card(
-        title=ftl('firefox-more-is-firefox-a-private-browser'),
-        ga_title='Features Private',
-        image=resp_img('img/firefox/more/private.png', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('firefox-more-were-focused-on-your-right-to'),
-        link_url=url('firefox.features.private')
-      )}}
-    </div>
-    <div class="mzp-l-card-quarter">
-      {{ card(
-        title=ftl('the-ad-blocker'),
-        ga_title='Featires Adblocker',
-        image=resp_img('img/firefox/more/firefox-adblocker.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('so-many-ads'),
-        link_url=url('firefox.features.adblocker'),
-      )}}
-
-      {{ card(
-        title=ftl('firefox-more-protection'),
-        ga_title='Features Private Browsing',
-        image=resp_img('img/firefox/more/private-browsing.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('were-obsessed-with'),
-        link_url=url('firefox.features.private-browsing')
-      )}}
-
       {{ card(
         title=ftl('firefox-more-firefox-sync'),
         ga_title='Features Safe Browser',
         image=resp_img('img/firefox/more/firefox-sync.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
         desc=ftl('firefox-more-access-your-sync'),
         link_url=url('firefox.features.sync')
       )}}
-
-      {{ card(
-        title=ftl('firefox-more-avoid-misinformation-heading'),
-        ga_title='Avoid Misinformation',
-        image=resp_img('img/firefox/more/avoid-misinformation.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        desc=ftl('firefox-more-avoid-misinformation-desc'),
-        link_url=url('firefox.more.misinformation')
-      )}}
     </div>
-
     <div class="mzp-l-card-third">
       {{ card(
         title=ftl('comparing-firefox-chrome'),
@@ -224,7 +165,6 @@ <h2>{{ ftl('learn-more-about-firefox', fallback='firefox-products-are') }}</h2>
         link_url=url('firefox.browsers.compare.brave')
       )}}
     </div>
-
     <div class="mzp-l-card-third">
       {{ card(
         title=ftl('comparing-firefox-safari'),
@@ -241,9 +181,32 @@ <h2>{{ ftl('learn-more-about-firefox', fallback='firefox-products-are') }}</h2>
         desc=ftl('be-free-to'),
         link_url=url('firefox.browsers.compare.opera')
       )}}
+
+      {{ card(
+        title=ftl('incognito-browser-what'),
+        ga_title='Features Private Browsing',
+        image=resp_img('img/firefox/more/incognito-browser.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('firefox-calls-it'),
+        link_url=url('firefox.browsers.incognito-browser')
+      )}}
     </div>
+    <div class="mzp-l-card-quarter">
+      {{ card(
+        title=ftl('firefox-more-is-firefox-a-private-browser'),
+        ga_title='Features Private',
+        image=resp_img('img/firefox/more/private.png', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('firefox-more-were-focused-on-your-right-to'),
+        link_url=url('firefox.features.private')
+      )}}
+
+      {{ card(
+        title=ftl('the-ad-blocker'),
+        ga_title='Features Adblocker',
+        image=resp_img('img/firefox/more/firefox-adblocker.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('so-many-ads'),
+        link_url=url('firefox.features.adblocker'),
+      )}}
 
-    <div class="mzp-l-card-third">
       {{ card(
         title=ftl('firefox-more-fingerprinter-blocking'),
         ga_title='Fingerprinter Blocking',
@@ -252,6 +215,23 @@ <h2>{{ ftl('learn-more-about-firefox', fallback='firefox-products-are') }}</h2>
         link_url=url('firefox.features.fingerprinting')
       )}}
 
+      {{ card(
+        title=ftl('firefox-more-protection'),
+        ga_title='Features Private Browsing',
+        image=resp_img('img/firefox/more/private-browsing.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('were-obsessed-with'),
+        link_url=url('firefox.features.private-browsing')
+      )}}
+    </div>
+    <div class="mzp-l-card-third">
+      {{ card(
+        title=ftl('firefox-more-avoid-misinformation-heading'),
+        ga_title='Avoid Misinformation',
+        image=resp_img('img/firefox/more/avoid-misinformation.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('firefox-more-avoid-misinformation-desc'),
+        link_url=url('firefox.more.misinformation')
+      )}}
+
       {{ card(
         title=ftl('firefox-more-translate-the-web'),
         ga_title='Translate',
@@ -261,11 +241,11 @@ <h2>{{ ftl('learn-more-about-firefox', fallback='firefox-products-are') }}</h2>
       )}}
 
       {{ card(
-        title=ftl('firefox-more-a-guide-to'),
-        ga_title='Safe Passwords',
-        desc=ftl('firefox-more-more-and-more'),
-        image=resp_img('img/firefox/more/passwords.png', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
-        link_url=url('firefox.privacy.passwords')
+        title=ftl('firefox-more-firefox-quantum'),
+        ga_title='Firefox Browsers',
+        image=resp_img('img/firefox/more/firefox-quantum.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
+        desc=ftl('firefox-more-quantum-was-revolution'),
+        link_url=url('firefox.browsers.quantum')
       )}}
     </div>
   </div>

diff --git a/bedrock/firefox/templates/firefox/more/misinformation.html b/bedrock/firefox/templates/firefox/more/misinformation.html
@@ -59,7 +59,7 @@ <h2>{{ ftl('misinformation-what-is-heading') }}</h2>
 
     <h2>{{ ftl('misinformation-false-info-heading') }}</h2>
 
-    <p>{{ ftl('misinformation-widespread-online', tracking='https://blog.mozilla.org/firefox/how-to-stop-web-trackers/' + _params) }}</p>
+    <p>{{ ftl('misinformation-widespread-online', tracking='https://blog.mozilla.org/products/firefox/firefox-privacy-protections/' + _params) }}</p>
     <p>{{ ftl('misinformation-tracking-advertising') }}</p>
     <p>{{ ftl('misinformation-social-newtorks') }}</p>
   </section>

diff --git a/bedrock/products/templates/products/vpn/more/when-to-use.html b/bedrock/products/templates/products/vpn/more/when-to-use.html
@@ -36,7 +36,7 @@ <h3>{{ ftl('vpn-when-to-use-5-in-your') }}</h3>
 <p>{{ ftl('vpn-when-to-use-because-your-internet') }}</p>
 
 <h3>{{ ftl('vpn-when-to-use-make-sure-you') }}</h3>
-<p>{{ ftl('vpn-when-to-use-a-vpn-provides', book=url('firefox.privacy.book')) }}</p>
+<p>{{ ftl('vpn-when-to-use-a-vpn-provides', book='https://support.mozilla.org/kb/how-stay-safe-web') }}</p>
 
 <h3>{{ ftl('vpn-when-to-use-mozilla-vpn-a') }}</h3>
 <p>{{ ftl('vpn-when-to-use-the-most-important',

diff --git a/l10n/en/firefox/more.ftl b/l10n/en/firefox/more.ftl
@@ -23,9 +23,7 @@ choose-which-firefox = Choose which { -brand-name-firefox-browser } to download
 firefox-more-firefox-chromebook = { -brand-name-firefox-browser } for { -brand-name-chromebook }
 firefox-more-while-on-chromebook = While a { -brand-name-chromebook } already has { -brand-name-chrome } installed, downloading and using { -brand-name-firefox } as your go-to browser provides you with a few benefits
 firefox-more-firefox-quantum = { -brand-name-firefox-quantum }
-firefox-more-quantum-was-revolution ={ -brand-name-firefox-quantum } was a revolution in { -brand-name-firefox } development. In 2017, we created a new, lightning fast browser that constantly improves. { -brand-name-firefox-quantum } is the { -brand-name-firefox-browser }.
-firefox-more-little-book = Little Book of Privacy
-firefox-more-you-can-reclaim = You can reclaim your privacy and gain back control over your very own internet experience! It’s actually surprisingly easy. Everyone can do it.
+firefox-more-quantum-was-revolution = { -brand-name-firefox-quantum } was a revolution in { -brand-name-firefox } development. In 2017, we created a new, lightning fast browser that constantly improves. { -brand-name-firefox-quantum } is the { -brand-name-firefox-browser }.
 firefox-more-firefox-sync = { -brand-name-firefox-sync }
 firefox-more-access-your-sync = Access and sync your bookmarks, passwords, open tabs and more — everywhere you use { -brand-name-firefox }.
 we-believe-everyone = We believe everyone should have access to the internet — that’s why we make the { -brand-name-firefox-browser } available in more than 90 languages with the help of dedicated volunteers around the world.

diff --git a/l10n/en/firefox/more/misinformation.ftl b/l10n/en/firefox/more/misinformation.ftl
@@ -14,7 +14,7 @@ misinformation-ultimately-harmful = Ultimately, both misinformation and disinfor
 misinformation-false-info-heading = Where does false information show up?
 
 # Variables:
-#   $tracking (url) - link to https://blog.mozilla.org/firefox/how-to-stop-web-trackers/
+#   $tracking (url) - link to https://blog.mozilla.org/products/firefox/firefox-privacy-protections/
 misinformation-widespread-online = You can come across misinformation and disinformation everywhere but it is most widespread and impactful when shared online. Algorithms and <a href="{ $tracking }">tracking</a> have increased the ability for misinformation and disinformation to reach a larger audience on websites, blogs, forums and social networks.
 
 misinformation-tracking-advertising = You may have heard about tracking primarily in the context of advertising. However, it’s also a powerful tool when it comes to the spread of false information. Why is that? When you browse the internet or your social network feed, your behavior, interests, contacts in some instances and more are tracked by various parties across websites in order to create an extremely detailed profile of you to sell to others without your knowledge or consent. These profiles are used for personalized advertising but can also serve to present any kind of targeted information to you.

diff --git a/l10n/en/products/vpn/more/when-to-use-a-vpn.ftl b/l10n/en/products/vpn/more/when-to-use-a-vpn.ftl
@@ -35,7 +35,7 @@ vpn-when-to-use-because-your-internet = Because your internet traffic at home mo
 vpn-when-to-use-make-sure-you = Make sure you understand what a VPN doesn’t do
 
 # Variables
-#   $book (url) - https://www.mozilla.org/firefox/privacy/book/
+#   $book (url) - https://support.mozilla.org/kb/how-stay-safe-web
 vpn-when-to-use-a-vpn-provides = A VPN provides an important security link by protecting your private data before it travels over the internet, and it also conceals your IP address, helping to protect your identity and location. It won’t, however, prevent you from things like clicking on suspicious links, downloading malware or being victimized by email fraud. You still need to practice <a href="{ $book }">good habits to stay safe online</a>.
 vpn-when-to-use-mozilla-vpn-a = { -brand-name-mozilla-vpn }, a trustworthy VPN service
 

diff --git a/media/img/firefox/more/little-book-of-privacy.jpg b/media/img/firefox/more/little-book-of-privacy.jpg
diff --git a/media/img/firefox/more/passwords.png b/media/img/firefox/more/passwords.png