Remove adjust links (Fixes mozilla#11698)

alexgibson · Feb 7, 2024 · cbee29b · cbee29b
1 parent 72bc0ad
commit cbee29b
Show file tree

Hide file tree

Showing 31 changed files with 241 additions and 622 deletions.
diff --git a/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html b/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
@@ -4,8 +4,8 @@
  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
 
-{% set android_url = firefox_adjust_url('android', 'app-store-banner') %}
-{% set ios_url = firefox_adjust_url('ios', 'app-store-banner') %}
+{% set android_url = play_store_url('firefox', 'app-store-banner') %}
+{% set ios_url = app_store_url('firefox', 'app-store-banner') %}
 
 {% if ftl_has_messages('banner-firefox-app-store-title', 'banner-firefox-app-store-free-google-play', 'banner-firefox-app-store-free-app-store', 'ui-view') %}
 <aside class="c-banner hide-from-legacy-ie mzp-t-firefox t-native" id="firefox-app-store-banner">

diff --git a/bedrock/base/templates/includes/banners/mobile/focus-app-store.html b/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
@@ -4,8 +4,8 @@
  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
 
-{% set android_url = focus_adjust_url('android', 'app-store-banner') %}
-{% set ios_url = focus_adjust_url('ios', 'app-store-banner') %}
+{% set android_url = play_store_url('focus', 'app-store-banner') %}
+{% set ios_url = app_store_url('focus', 'app-store-banner') %}
 
 {% if ftl_has_messages('banner-firefox-focus-app-store-title', 'banner-firefox-app-store-free-google-play', 'banner-firefox-app-store-free-app-store', 'ui-view') %}
 <aside class="c-banner hide-from-legacy-ie mzp-t-firefox t-native" id="firefox-app-store-banner">

diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html
@@ -19,7 +19,7 @@
   {{ css_bundle('chromebook') }}
 {% endblock %}
 
-{% set android_url = firefox_adjust_url('android', 'firefox-browsers-chromebook') %}
+{% set android_url = play_store_url('firefox', 'firefox-browsers-chromebook') %}
 
 {% block site_header %}
   {% with hide_nav_cta=True %}
@@ -49,7 +49,7 @@ <h1 class="mzp-u-title-xl">{{ ftl('browsers-chromebook-get-firefox-browser') }}<
     <h4 class="mzp-c-menu-list-title">{{ ftl('browsers-chromebook-dropdown-copy') }}</h4>
     <ul class="mzp-c-menu-list-list download-platform-list">
       <li class="mzp-c-menu-list-item">
-        <a href="{{ firefox_adjust_url('android', 'firefox-browsers-faq') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
+        <a href="{{ play_store_url('firefox', 'firefox-browsers-chromebook') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
           {{ ftl('browsers-chromebook-browsers-chromebook-get-firefox-for') }}
           <p><small>{{ ftl('browsers-chromebook-x86-based-chromebook') }}</small></p>
         </a>

diff --git a/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html b/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
@@ -20,7 +20,7 @@ <h5 class="mzp-c-menu-list-title">{{ get_browser }}</h5>
     {# Download link should be locale neutral see issue 7982 #}
     <li class="mzp-c-menu-list-item"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard">{{ get_desktop }}</a></li>
   <!--<![endif]-->
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ play_store_url('firefox', 'firefox-browsers-compare') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ app_store_url('firefox', 'firefox-browsers-compare') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
   </ul>
 </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/index.html b/bedrock/firefox/templates/firefox/browsers/index.html
@@ -39,8 +39,8 @@
   {% endif %}
 {% endblock %}
 
-{% set android_url = firefox_adjust_url('android', 'browsers-page') %}
-{% set ios_url = firefox_adjust_url('ios', 'browsers-page') %}
+{% set android_url = play_store_url('firefox', 'firefox-browsers') %}
+{% set ios_url = app_store_url('firefox', 'firefox-browsers') %}
 {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-browsers' %}
 {% set _entrypoint = 'mozilla.org-firefox-browsers' %}
 
@@ -149,8 +149,8 @@ <h2 class="c-landing-grid-title "><a class="mzp-c-cta-link" href="{{ url('firefo
       <div id="menu-mobile-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('firefox-browsers-download-for-mobile') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ play_store_url('firefox', 'firefox-browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ app_store_url('firefox', 'firefox-browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
           <li class="mzp-c-menu-list-item t-getapp"><a href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-type="link" data-cta-text="Get App Mobile">{{ ftl('firefox-browsers-send-me-a-link') }}</a></li>
         </ul>
       </div>

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/android.html b/bedrock/firefox/templates/firefox/browsers/mobile/android.html
@@ -11,7 +11,7 @@
 
 {% set show_firefox_app_store_banner = switch('firefox-app-store-banner') %}
 {% set show_send_to_device = LANG in settings.SEND_TO_DEVICE_LOCALES %}
-{% set android_url = firefox_adjust_url('android', 'mobile-android-page') %}
+{% set android_url = play_store_url('firefox', 'firefox-browsers-mobile-android') %}
 
 {% block page_css %}
   {{ css_bundle('protocol-split') }}

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/focus.html b/bedrock/firefox/templates/firefox/browsers/mobile/focus.html
@@ -16,10 +16,8 @@
 
 {% set show_firefox_app_store_banner = switch('firefox-app-store-banner') %}
 {% set show_send_to_device = LANG in settings.SEND_TO_DEVICE_LOCALES %}
-{% set android_url = focus_adjust_url('android', 'mobile-focus-page') %}
-{% set variation_android_adjust_url = 'https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc171-uk&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus' %}
-{% set variation_ios_adjust_url = 'https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc171-uk&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337' %}
-{% set ios_url = focus_adjust_url('ios', 'mobile-focus-page') %}
+{% set android_url = play_store_url('focus', 'firefox-browsers-mobile-focus') %}
+{% set ios_url = app_store_url('focus', 'firefox-browsers-mobile-focus') %}
 
 {% block page_css %}
   {{ css_bundle('protocol-split') }}
@@ -68,18 +66,10 @@ <h1 class="mzp-u-title-xl">{{ ftl('mobile-focus-simply-private-mobile') }}</h1>
     <ul class="mobile-download-buttons">
 
       <li class="android">
-        {% if variation == 'pb' %}
-          {{ google_play_button(href=variation_android_adjust_url, id="playStoreLink-primary")}}
-        {% else %}
-          {{ google_play_button(href=android_url, id='playStoreLink-primary') }}
-        {% endif %}
+        {{ google_play_button(href=android_url, id='playStoreLink-primary') }}
       </li>
       <li class="ios">
-        {% if variation == 'pb' %}
-          {{ apple_app_store_button(href=variation_ios_adjust_url, id='appStoreLink-primary') }}
-        {% else %}
-          {{ apple_app_store_button(href=ios_url, id='appStoreLink-primary') }}
-        {% endif %}
+        {{ apple_app_store_button(href=ios_url, id='appStoreLink-primary') }}
       </li>
     </ul>
   {% endcall %}

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html b/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html
@@ -26,8 +26,8 @@
 {% endblock %}
 
 {% set message_set = 'fx-mobile-download-desktop' %}
-{% set android_url = firefox_adjust_url('android', 'mobile-get-app-page') %}
-{% set ios_url = firefox_adjust_url('ios', 'mobile-get-app-page') %}
+{% set android_url = play_store_url('firefox', 'firefox-browsers-mobile-get-app') %}
+{% set ios_url = app_store_url('firefox', 'firefox-browsers-mobile-get-app') %}
 
 {% block content %}
 <main class="mzp-l-content mzp-t-content-md mzp-t-firefox">

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/get-ios.html b/bedrock/firefox/templates/firefox/browsers/mobile/get-ios.html
@@ -34,7 +34,8 @@ <h1>
     {{ ftl('get-ios-firefox-mobile-adapts') }}
   </p>
   <p class="c-cta">
-    {{ apple_app_store_button(href='https://nn8g.adj.st/?adjust_t=ucunb4r') }}
+    {% set ios_url = app_store_url('firefox', 'firefox-browsers-mobile-get-ios') %}
+    {{ apple_app_store_button(href=ios_url) }}
   </p>
 </div>
 

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
@@ -10,8 +10,8 @@
 {% extends "firefox/base/base-protocol.html" %}
 
 {% set show_firefox_app_store_banner = switch('firefox-app-store-banner') %}
-{% set android_url = firefox_adjust_url('android', 'mobile-page') %}
-{% set ios_url = firefox_adjust_url('ios', 'mobile-page') %}
+{% set android_url = play_store_url('firefox', 'firefox-browsers-mobile') %}
+{% set ios_url = app_store_url('firefox', 'firefox-browsers-mobile') %}
 {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-mobile' %}
 {% set _entrypoint = 'mozilla.org-firefox-mobile' %}
 
@@ -87,7 +87,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.androi
       <p>{{ ftl('browsers-mobile-infinitely-customizable-private') }}</p>
 
       <p id="android-download">
-        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ play_store_url('firefox', 'firefox-browsers-mobile') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
       <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
@@ -109,7 +109,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios')
       <p>{{ ftl('browsers-mobile-get-enhanced-tracking-protection') }}</p>
 
       <p id="ios-download">
-        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ app_store_url('firefox', 'firefox-browsers-mobile') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
       <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
@@ -133,8 +133,8 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus'
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('browsers-mobile-download') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ play_store_url('focus', 'firefox-browsers-mobile') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ app_store_url('focus', 'firefox-browsers-mobile') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
         </ul>
       </div>
 

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/ios.html b/bedrock/firefox/templates/firefox/browsers/mobile/ios.html
@@ -11,7 +11,7 @@
 
 {% set show_firefox_app_store_banner = switch('firefox-app-store-banner') %}
 {% set show_send_to_device = LANG in settings.SEND_TO_DEVICE_LOCALES %}
-{% set ios_url = firefox_adjust_url('ios', 'mobile-ios-page') %}
+{% set ios_url = app_store_url('firefox', 'firefox-browsers-mobile-ios') %}
 
 {% block page_css %}
   {{ css_bundle('protocol-split') }}

diff --git a/bedrock/firefox/templates/firefox/contentful-all.html b/bedrock/firefox/templates/firefox/contentful-all.html
@@ -12,8 +12,8 @@
 {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=' + _utm_campaign %}
 
 {% set show_send_to_device = LANG in settings.SEND_TO_DEVICE_LOCALES %}
-{% set android_url = firefox_adjust_url('android', 'mobile-page') %}
-{% set ios_url = firefox_adjust_url('ios', 'mobile-page') %}
+{% set android_url = play_store_url('firefox', 'mobile-page') %}
+{% set ios_url = app_store_url('firefox', 'mobile-page') %}
 
 {# meta data #}
 {% block page_title %}{{ info.title }}{% endblock %}

diff --git a/bedrock/firefox/templates/firefox/facebookcontainer/index.html b/bedrock/firefox/templates/firefox/facebookcontainer/index.html
@@ -51,10 +51,10 @@ <h1 class="mzp-u-title-lg">{{ ftl('facebook-container-facebook-well-contained-ke
 
         <ul>
           <li>
-            {{ google_play_button(href=firefox_adjust_url('android', 'fb-container-page'), id='playStoreLink') }}
+            {{ google_play_button(href=play_store_url('firefox', 'firefox-facebook-container'), id='playStoreLink') }}
           </li>
           <li>
-            {{ apple_app_store_button(href=firefox_adjust_url('ios', 'fb-container-page'), id='appStoreLink') }}
+            {{ apple_app_store_button(href=app_store_url('firefox', 'firefox-facebook-container'), id='appStoreLink') }}
           </li>
         </ul>
       {% endif %}

diff --git a/bedrock/firefox/templates/firefox/home/index-master.html b/bedrock/firefox/templates/firefox/home/index-master.html
@@ -138,8 +138,8 @@ <h5 class="mzp-c-menu-list-title">{{ ftl('firefox-home-download-the-browser') }}
           <li class="mzp-c-menu-list-item menu-desktop-unsupported"><a href="{{ url('firefox.new') }}" class="ga-product-download"  data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-home-desktop') }}</a></li>
           {# Download link should be locale neutral see issue 7982 #}
           <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" class="ga-product-download" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard" data-link-text="Trackers">{{ ftl('firefox-home-desktop') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-text="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-text="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-android"><a href="{{ play_store_url('firefox', 'firefox-home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-text="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ app_store_url('firefox', 'firefox-home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-text="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
         </ul>
       </div>
       <p id="test-fbc" class="js-fx-only"><a class="mzp-c-cta-link" href="https://addons.mozilla.org/firefox/addon/facebook-container/{{ referrals }}">{{ ftl('firefox-home-get-the-facebook-container') }}</a></p>
@@ -207,8 +207,8 @@ <h4>{{ ftl('firefox-home-trade-clickbait-for') }}</h4>
       <div class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h5 class="mzp-c-menu-list-title">{{ ftl('firefox-home-download-the-app') }}</h5>
         <ul class="mzp-c-menu-list-list" id="menu-pocket">
-          <li class="mzp-c-menu-list-item"><a href="{{ pocket_adjust_url('android', 'firefox-home') }}" rel="external noopener" data-cta-type="link" data-cta-text="Download Pocket for Android" data-link-text="Pocket"> {{ ftl('firefox-home-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ pocket_adjust_url('ios', 'firefox-home') }}" rel="external noopener" data-cta-type="link" data-cta-text="Download Pocket for iOS" data-link-text="Pocket">{{ ftl('firefox-home-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ play_store_url('pocket', 'firefox-home') }}" rel="external noopener" data-cta-type="link" data-cta-text="Download Pocket for Android" data-link-text="Pocket"> {{ ftl('firefox-home-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ app_store_url('pocket', 'firefox-home') }}" rel="external noopener" data-cta-type="link" data-cta-text="Download Pocket for iOS" data-link-text="Pocket">{{ ftl('firefox-home-ios') }}</a></li>
         </ul>
       </div>
       <p><a class="mzp-c-cta-link" href="https://getpocket.com/signup/{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Download for iOS" data-link-text="Pocket">{{ ftl('firefox-home-learn-more-about-pocket') }}</a></p>

diff --git a/bedrock/firefox/templates/firefox/new/desktop/download.html b/bedrock/firefox/templates/firefox/new/desktop/download.html
@@ -12,7 +12,7 @@
                                                   'firefox-desktop-download-just-download-the-browser',
                                                   'firefox-desktop-download-get-more-from-firefox') %}
 {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-desktop' %}
-{% set ios_url = 'https://apps.apple.com/app/apple-store/id989804926?pt=373246&ct=mozilla-org-firefox-new&mt=8' %}
+{% set ios_url = app_store_url('firefox', 'mozilla-org-firefox-new') %}
 
 {% block string_data %}{% endblock %}