Replace Adjust QRCodes (Fixes mozilla#14172)

bedrock/firefox/redirects.py

@@ -27,13 +27,17 @@ def mobile_app(request, *args, **kwargs):
     campaign_options = [
         "firefox-whatsnew",
         "firefox-whatsnew-120",
+        "firefox-whatsnew-121-us",
+        "firefox-whatsnew-121-gb",
+        "firefox-whatsnew-121-de",
+        "firefox-whatsnew-121-fr",
         "firefox-whatsnew-122",
         "firefox-welcome-4",
         "firefox-welcome-6",
-        "firefox-welcome-17",
+        "firefox-welcome-17-en",
+        "firefox-welcome-17-de",
+        "firefox-welcome-17-fr",
         "firefox-browsers-mobile-get-app",
-        "firefox-browsers-mobile-android",
-        "firefox-browsers-mobile-ios",
         "firefox-browsers-mobile-focus",
     ]
 

bedrock/firefox/templates/firefox/browsers/mobile/get-app.html

@@ -40,7 +40,7 @@ <h1>{{ ftl('firefox-mobile-get-firefox-mobile') }}</h1>
     {% else %}
       <p>{{ ftl('firefox-mobile-scan-the-qr-code-to-get-started') }}</p>
       <div class="qr-code-wrapper">
-        <img src="{{ static('img/firefox/browsers/mobile/qr-firefox.png') }}" id="firefox-qr" data-mozillaonline-link="{{ static('img/firefox/browsers/mobile/qr-firefox-mozillaonline.png') }}" alt="" width="350" height="350">
+        <img src="{{ static('img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-get-app.png') }}" id="firefox-qr" data-mozillaonline-link="{{ static('img/firefox/browsers/mobile/qr-firefox-mozillaonline.png') }}" alt="" width="350" height="350">
       </div>
     {% endif %}
   </section>

bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html

@@ -14,7 +14,7 @@ <h2 class="c-inline-form-title">{{ ftl('mobile-android-get-firefox-for') }}</h2>
 {% else %}
   <p class="c-inline-form-body">{{ ftl('mobile-android-scan-the-qr-code-to-get-started') }}</p>
   <div class="qr-code-wrapper">
-    <img src="{{ static('img/firefox/browsers/mobile/qr-firefox.png') }}" width="400" height="400" id="firefox-qr"
+    <img src="{{ static('img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-android.png') }}" width="400" height="400" id="firefox-qr"
       data-mozillaonline-link="{{ static('img/firefox/browsers/mobile/qr-firefox-mozillaonline.png') }}"
       alt="{{ ftl('mobile-android-scan-alt-text') }}">
   </div>

bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-focus.html

@@ -10,14 +10,10 @@
   <h2 class="c-inline-form-title">{{ ftl('mobile-focus-get-firefox-focus') }}</h2>
   <p class="c-inline-form-body">{{ ftl('mobile-focus-scan-the-qr-code-to-get-started') }}</p>
   <div class="qr-code-wrapper">
-  {% if variation == 'pb' %}
-    <img src="{{ static('img/firefox/browsers/mobile/qr-variation.svg') }}" id="focus-qr" width="400" height="400" alt="{{ ftl('mobile-focus-scan-alt-text') }}">
+  {% if LANG == 'de' %}
+    <img src="{{ static('img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-klar.png') }}" id="focus-qr" width="400" height="400" alt="{{ ftl('mobile-focus-scan-alt-text') }}">
   {% else %}
-    {% if LANG == 'de' %}
-      <img src="{{ static('img/firefox/browsers/mobile/qr-klar.png') }}" id="focus-qr" width="400" height="400" alt="{{ ftl('mobile-focus-scan-alt-text') }}">
-    {% else %}
-      <img src="{{ static('img/firefox/browsers/mobile/qr-focus.png') }}" id="focus-qr" width="400" height="400" alt="{{ ftl('mobile-focus-scan-alt-text') }}">
-    {% endif %}
+    <img src="{{ static('img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-focus.png') }}" id="focus-qr" width="400" height="400" alt="{{ ftl('mobile-focus-scan-alt-text') }}">
   {% endif %}
   </div>
 </div>

bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html

@@ -14,7 +14,7 @@ <h2 class="c-inline-form-title">{{ ftl('mobile-ios-get-firefox-for') }}</h2>
 {% else %}
   <p class="c-inline-form-body">{{ ftl('mobile-ios-scan-the-qr-code-to-get-started') }}</p>
   <div class="qr-code-wrapper">
-    <img src="{{ static('img/firefox/browsers/mobile/qr-firefox.png') }}" width="400" height="400" id="firefox-qr"
+    <img src="{{ static('img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-ios.png') }}" width="400" height="400" id="firefox-qr"
       data-mozillaonline-link="{{ static('img/firefox/browsers/mobile/qr-firefox-mozillaonline.png') }}"
       alt="{{ ftl('mobile-ios-scan-alt-text') }}">
   </div>

bedrock/firefox/templates/firefox/welcome/page17/page17-b.html

@@ -23,23 +23,23 @@
   {% set main_title = 'Neues Jahr, neues Smartphone? <br> Hol dir jetzt einen richtig guten Browser. Firefox!'|safe %}
   {% set main_tagline = 'Firefox blockierst du ganz einfach Tracker, verwaltest spielend deine Passwörter und passt deine Datenschutzeinstellungen mit wenigen Klicks an.' %}
   {% set qr_caption = 'Um loszulegen, scanne den QR-Code' %}
-  {% set qr_alt = 'QR-Code zum Scannen für Firefox' %}
+  {% set qr_campaign = 'firefox-welcome-17-de' %}
   {% set android_url = play_store_url('firefox', 'firefox-welcome-17b-de') %}
   {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b-de') %}
 {% elif LANG == "fr" %}
   {% set page_title = 'Nouvelle année, nouveau téléphone ? Téléchargez l’application Firefox.' %}
   {% set main_title = 'Nouvelle année, nouveau téléphone ?<br> Téléchargez l’application Firefox.'|safe %}
   {% set main_tagline = 'Bloquez les traqueurs, gérez vos mots de passe et personnalisez simplement vos paramètres de confidentialité avec Firefox, où que vous soyez.' %}
   {% set qr_caption = 'Scanner le code QR pour commencer' %}
-  {% set qr_alt = 'Code QR à scanner pour Firefox' %}
+  {% set qr_campaign = 'firefox-welcome-17-fr' %}
   {% set android_url = play_store_url('firefox', 'firefox-welcome-17b-fr') %}
   {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b-fr') %}
 {% else %}
   {% set page_title = 'New year, new phone? Get the Firefox app.' %}
   {% set main_title = 'New year, new phone?<br> Get the Firefox app.'|safe %}
   {% set main_tagline = 'Block trackers, manage passwords and easily customize your privacy settings with Firefox on-the-go.' %}
   {% set qr_caption = 'Scan the QR code to get started' %}
-  {% set qr_alt = 'QR code to scan for Firefox' %}
+  {% set qr_campaign = 'firefox-welcome-17-en' %}
   {% set android_url = play_store_url('firefox', 'firefox-welcome-17b') %}
   {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b') %}
 {% endif %}
@@ -80,7 +80,7 @@ <h1 class="c-main-title">{{ main_title }}</h1>
       <p class="c-main-tagline">{{ main_tagline }}</p>
 
       <figure class="qr-code-wrapper">
-        <img src="{{ l10n_img('firefox/welcome/page17/qr-code.png') }}" width="200" height="200" alt="{{ qr_alt }}">
+        {{ qrcode('https://www.mozilla.org/firefox/browsers/mobile/app/?product=firefox&campaign=' + qr_campaign, 12) }}
         <figcaption>{{ qr_caption }}</figcaption>
       </figure>
 

bedrock/firefox/templates/firefox/welcome/page4.html

@@ -46,7 +46,7 @@ <h2 id="get-firefox">{{ ftl('welcome-page4-get-firefox-on-your-phone') }}</h2>
     {% else %}
       <h2>{{ ftl('welcome-page4-download-firefox-for-your') }}</h2>
       <div class="qr-code-wrapper">
-        <img src="{{ static('img/firefox/welcome/welcome-qr-firefox.png') }}" id="firefox-qr"
+        <img src="{{ static('img/firefox/welcome/qrcode-firefox-welcome-4.png') }}" id="firefox-qr"
           alt="">
       </div>
     {% endif %}

bedrock/firefox/templates/firefox/welcome/page6.html

@@ -54,7 +54,7 @@ <h3 class="modal-title">{{ ftl('welcome-page6-get-firefox-on-your-phone') }}</h3
     {% else %}
       <p>{{ ftl('welcome-page6-scan-the-qr-code-to-get-started') }}</p>
       <div class="qr-code-wrapper">
-        <img src="{{ static('img/firefox/browsers/mobile/qr-firefox.png') }}"
+        <img src="{{ static('img/firefox/welcome/qrcode-firefox-welcome-6.png') }}"
             id="firefox-qr"
             data-mozillaonline-link="{{ static('img/firefox/browsers/mobile/qr-firefox-mozillaonline.png') }}"
             alt="{{ ftl('welcome-page6-qr-code-to-scan-for-firefox') }}">