Remove /firefox/privacy/, redirect to /privacy/

bedrock/firefox/redirects.py

@@ -602,6 +602,7 @@ def mobile_app(request, *args, **kwargs):
     # issue 14222
     redirect(r"^firefox/browsers/?$", "firefox"),
     # issue 14248
+    redirect(r"^firefox/privacy/?$", "privacy"),
     redirect(r"^firefox/privacy/products/?$", "products.landing"),
     redirect(r"^firefox/privacy/safe-passwords/?$", "firefox.features.password-manager"),
     redirect(r"^firefox/privacy/book/?$", "https://support.mozilla.org/kb/how-stay-safe-web"),

bedrock/firefox/templates/firefox/faq.html

@@ -99,7 +99,7 @@ <h2>{{ ftl('is-firefox-safe') }}</h2>
       </li>
       <li>
         <h2>{{ ftl('does-firefox-sell') }}</h2>
-        <p>{{ ftl('nope-never-have', url=url('firefox.privacy.index')) }}</p>
+        <p>{{ ftl('nope-never-have', url=url('privacy')) }}</p>
       </li>
       <li>
         <h2>{{ ftl('why-is-firefox') }}</h2>

bedrock/firefox/templates/firefox/features/private.html

@@ -24,6 +24,6 @@ <h3>{{ ftl('features-shared-footer-cta-title') }}</h3>
 {% endif %}
 
 <h2>{{ ftl('features-private-what-information-does-firefox') }}</h2>
-<p>{{ ftl('features-private-mozilla-the-maker-of-firefox', url=url('firefox.privacy.index')) }}</p>
+<p>{{ ftl('features-private-mozilla-the-maker-of-firefox', url=url('privacy')) }}</p>
 <p>{{ ftl('features-private-read-firefoxs-privacy-notice', url=url('privacy.notices.firefox')) }}</p>
 {% endblock article_content %}

bedrock/firefox/templates/firefox/features/sync.html

@@ -28,7 +28,7 @@
   ) }}
 </figure>
 
-<p>{{ ftl('features-sync-all-your-data-is-encrypted-on-our', privacy=url('firefox.privacy.index')) }}</p>
+<p>{{ ftl('features-sync-all-your-data-is-encrypted-on-our', privacy=url('privacy')) }}</p>
 
 <h2>{{ ftl('features-sync-send-tabs-from-one-device-to-another') }}</h2>
 <p>{{ ftl('features-sync-the-send-tab-feature-in-firefox') }}</p>

bedrock/firefox/templates/firefox/new/desktop/download.html

@@ -493,7 +493,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-challenging-the-stat
           }
         ) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-your-privacy-comes') }}</h3>
-        {% 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-type="link" data-cta-text="Personal Data Promise"'|safe|format(url('privacy')) %}
         <p>{{ ftl('firefox-desktop-download-as-the-internet', attrs=internet_attrs) }}</p>
       </div>
     </div>

bedrock/firefox/templates/firefox/nothing-personal/index.html

@@ -163,7 +163,7 @@ <h5>What does any of this have to do <br> with me?</h5>
             <p>Hey, you can customize Firefox to be all about you with <a href="{{ url('firefox.features.add-ons') }}" target="_blank" data-link-text="Add-ons">add-ons</a> and <a href="{{ url('firefox.features.customize') }}" target="_blank" data-link-text="Themes">themes</a>. Happy?</p>
 
             <h5>Ok, what’s the privacy-catch?</h5>
-            <p><a href="{{ url('firefox.privacy.index') }}" target="_blank" data-link-text="We don’t keep track of where you go">We don’t keep track of where you go</a> because 1. Yawn, and 2. We really don’t need it.</p>
+            <p><a href="{{ url('privacy') }}" target="_blank" data-link-text="We don’t keep track of where you go">We don’t keep track of where you go</a> because 1. Yawn, and 2. We really don’t need it.</p>
           </div>
 
           <div class="c-sticky-note c-attached-sticky">

bedrock/firefox/urls.py

@@ -202,8 +202,6 @@
         "firefox/browsers/compare/safari.html",
         ftl_files=["firefox/browsers/compare/safari", "firefox/browsers/compare/shared"],
     ),
-    # Issue 7765, 7709
-    page("firefox/privacy/", "firefox/privacy/index.html", ftl_files=["firefox/privacy-hub"]),
     # Issue 8432
     # Issue 13253: Ensure that Firefox can continue to refer to this URL.
     page("firefox/set-as-default/thanks/", "firefox/set-as-default/thanks.html", ftl_files="firefox/set-as-default/thanks"),

bedrock/foundation/templates/foundation/annualreport/2018/index.html

@@ -151,9 +151,9 @@ <h2>Private by Default</h2>
             device ecosystems.
           </p>
           <p>
-            {% with privacy=url('firefox.privacy.index') %}
+            {% with privacy=url('privacy') %}
             While we’re pleased to see privacy and online security, two issues <a href="{{ privacy }}">we’ve long
-              championed and backed up</a> with product features, business practices and industry pressure, these other
+            championed and backed up</a> with product features, business practices and industry pressure, these other
             companies’ approaches have had a deleterious effect—boxing in and overburdening users, limiting the web’s
             interoperability and making the internet less trustworthy.
             {% endwith %}
@@ -393,7 +393,7 @@ <h2>Beyond the Browser</h2>
             no matter how they access the internet.
           </p>
           <p>
-            {% with privacy=url('firefox.privacy.index') %}
+            {% with privacy=url('privacy') %}
             Recognizing that part of what threatens the health of the internet today is the lack of clarity about the
             value being exchanged for access to products and services, we’re exploring paid and subscription service
             offerings as a complement to the free services we already provide. In both cases, we are maintaining our

bedrock/foundation/templates/foundation/annualreport/2019/index.html

@@ -1148,7 +1148,7 @@ <h2 class="mzp-c-card-feature-title"><span class="highlight green">703M Pocket s
         <img src="{{ static('img/foundation/annualreport/2019/modal-dots-2.svg') }}" alt="" width="448" height="40">
         <h2 class="mzp-c-card-feature-title"><span class="highlight green">Launched Mozilla VPN</span></h2>
         <p class="mzp-c-card-feature-desc">In July, we launched <a href="{{ url('products.vpn.landing') }}">Mozilla VPN</a>, a service that people can trust to keep their connection to the internet safe and private on all their devices. While the VPN market is full of options for consumers, we saw two opportunities: 1) consumer demand for a truly trustworthy VPN and 2) our continued expansion into paid products.</p>
-        <p class="mzp-c-card-feature-desc">We adhere to easy, no-nonsense <a href="{{ url('firefox.privacy.index') }}">Data Privacy Principles</a>, which means we’re not sucking up user data ourselves, as some VPNs do. And since we are <a href="{{ url('mozorg.mission') }}">mission-driven</a>, consumers can trust that the dollars spent for Mozilla VPN will not only ensure top-notch security, but will be put to work making the internet better for everyone.</p>
+        <p class="mzp-c-card-feature-desc">We adhere to easy, no-nonsense <a href="{{ url('privacy') }}">Data Privacy Principles</a>, which means we’re not sucking up user data ourselves, as some VPNs do. And since we are <a href="{{ url('mozorg.mission') }}">mission-driven</a>, consumers can trust that the dollars spent for Mozilla VPN will not only ensure top-notch security, but will be put to work making the internet better for everyone.</p>
         <a class="mzp-c-button mzp-t-secondary" href="{{ url('products.vpn.landing' )}}">Learn more</a>
       </div>
     </div>

bedrock/privacy/redirects.py

@@ -18,7 +18,7 @@
     # mozilla/bedrock/#5745 - archive cliqz policy
     redirect(r"^privacy/firefox-cliqz/?$", "privacy.archive.firefox-cliqz-2018-06"),
     # mozilla/bedrock/#7983, #14248
-    redirect(r"^/privacy/products/?$", "firefox.privacy.index"),
+    redirect(r"^/privacy/products/?$", "privacy"),
     # mozilla/bedrock/#11610
     redirect(r"^privacy/firefox-os/?$", "privacy.archive.firefox-os-2022-05"),
     # issue 12156