diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html index bcf978d392..f4c25e9b86 100644 --- a/bedrock/base/templates/macros.html +++ b/bedrock/base/templates/macros.html @@ -48,7 +48,7 @@ {% macro google_play_button(class_name='', extra_data_attributes={}, extra_img_attributes={}, href=settings.GOOGLE_PLAY_FIREFOX_LINK_UTMS, id='', product='Firefox', target='') -%} {% set optional_img_attributes = {'alt': ftl('download-button-google-play'), 'width': '152', 'height': '45', 'l10n': True} %} {% do optional_img_attributes.update(extra_img_attributes) %} - + {{ resp_img( url='img/firefox/android/btn-google-play.png', srcset={ diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html b/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html index b9ca3893fe..01fd1a90fd 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html @@ -40,7 +40,7 @@ {% else %}

{{ ftl('firefox-mobile-scan-the-qr-code-to-get-started') }}

- +
{% endif %} diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html index 1aaf891d09..1561995770 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html @@ -14,9 +14,7 @@ {% else %}

{{ ftl('mobile-android-scan-the-qr-code-to-get-started') }}

- {{ ftl('mobile-android-scan-alt-text') }} + {{ ftl('mobile-android-scan-alt-text') }}
{% endif %} diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html index 06359d2a1b..e9ff3091bd 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html @@ -14,9 +14,7 @@ {% else %}

{{ ftl('mobile-ios-scan-the-qr-code-to-get-started') }}

- {{ ftl('mobile-ios-scan-alt-text') }} + {{ ftl('mobile-ios-scan-alt-text') }}
{% endif %} diff --git a/bedrock/firefox/templates/firefox/welcome/page6.html b/bedrock/firefox/templates/firefox/welcome/page6.html index 4e738ad7eb..a243aeac3a 100644 --- a/bedrock/firefox/templates/firefox/welcome/page6.html +++ b/bedrock/firefox/templates/firefox/welcome/page6.html @@ -56,7 +56,6 @@
{{ ftl('welcome-page6-qr-code-to-scan-for-firefox') }}
{% endif %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/index-account.html b/bedrock/firefox/templates/firefox/whatsnew/index-account.html index 90f2245092..dcdfac9ba6 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/index-account.html +++ b/bedrock/firefox/templates/firefox/whatsnew/index-account.html @@ -66,7 +66,7 @@ {% else %}
- {{ ftl('whatsnew-account-qr-code-alt') }} + {{ ftl('whatsnew-account-qr-code-alt') }}
{% endif %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/index.html b/bedrock/firefox/templates/firefox/whatsnew/index.html index 0e4b5b12a9..9b77ba2d35 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/index.html +++ b/bedrock/firefox/templates/firefox/whatsnew/index.html @@ -50,7 +50,7 @@ {% else %}
- +
{% endif %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html index 27371351f3..884c2e395d 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html @@ -119,7 +119,7 @@

{{ ftl('whatsnew-s2d-you-got-it-get-firefox-for') }}

- {{ ftl('whatsnew-account-qr-code-alt') }} + {{ ftl('whatsnew-account-qr-code-alt') }}
diff --git a/bedrock/settings/__init__.py b/bedrock/settings/__init__.py index ebcadd0ff0..17d4a742b8 100644 --- a/bedrock/settings/__init__.py +++ b/bedrock/settings/__init__.py @@ -206,7 +206,6 @@ else: "trackertest.org", # mozilla service for tracker detection "www.surveygizmo.com", "accounts.firefox.com", - "accounts.firefox.com.cn", "www.youtube.com", "js.stripe.com", ] diff --git a/bedrock/settings/appstores.py b/bedrock/settings/appstores.py index f480f4028b..d324a7dac5 100644 --- a/bedrock/settings/appstores.py +++ b/bedrock/settings/appstores.py @@ -13,9 +13,6 @@ GOOGLE_PLAY_FIREFOX_LINK = "https://play.google.com/store/apps/details?id=org.mo # key/values (https://bugzilla.mozilla.org/show_bug.cgi?id=1099429#c0). GOOGLE_PLAY_FIREFOX_LINK_UTMS = GOOGLE_PLAY_FIREFOX_LINK + "&referrer=" + quote("utm_source=mozilla&utm_medium=Referral&utm_campaign=mozilla-org") -# Bug 1264843, Issue 13108: link to China build of Fx4A, for display within Fx China repack -GOOGLE_PLAY_FIREFOX_LINK_MOZILLAONLINE = "https://www.firefox.com.cn/mobile/get-app/" - # Link to Firefox for iOS on the Apple App Store. APPLE_APPSTORE_FIREFOX_LINK = "https://apps.apple.com/{country}/app/apple-store/id989804926" diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py index 915ec19573..ced447fe1c 100644 --- a/bedrock/settings/base.py +++ b/bedrock/settings/base.py @@ -883,7 +883,6 @@ from .appstores import ( # noqa: E402, F401 APPLE_APPSTORE_POCKET_LINK, GOOGLE_PLAY_FIREFOX_BETA_LINK, GOOGLE_PLAY_FIREFOX_LINK, - GOOGLE_PLAY_FIREFOX_LINK_MOZILLAONLINE, GOOGLE_PLAY_FIREFOX_LINK_UTMS, GOOGLE_PLAY_FIREFOX_NIGHTLY_LINK, GOOGLE_PLAY_FIREFOX_SEND_LINK, diff --git a/docs/mozilla-accounts.rst b/docs/mozilla-accounts.rst index 0d5350c90b..0c0303953d 100644 --- a/docs/mozilla-accounts.rst +++ b/docs/mozilla-accounts.rst @@ -263,10 +263,8 @@ Firefox Sync and UITour Since Firefox 80 the accounts link and email form macros use :ref:`UITour` to show the Mozilla accounts page and log the browser into Sync or an account. For non-Firefox browsers or if UITour is not available, the flow uses normal links that allow users to log into the Mozilla accounts -website only, without connecting the Firefox Desktop client. This UITour flow allows the Firefox browser -to determine the correct Mozilla accounts server and authentication flow (this includes handling the -China Repack build of Firefox). This transition was introduced to later migrate Firefox Desktop to an -OAuth based client authentication flow. +website only, without connecting the Firefox Desktop client. This transition was introduced to later +migrate Firefox Desktop to an OAuth based client authentication flow. The script that handles this logic is ``/media/js/base/fxa-link.js``, and will automatically apply to any link with a ``js-fxa-cta-link`` class name. The current code automatically detects if you are in the diff --git a/media/img/firefox/browsers/mobile/qr-firefox-mozillaonline.png b/media/img/firefox/browsers/mobile/qr-firefox-mozillaonline.png deleted file mode 100644 index 651cefb614..0000000000 Binary files a/media/img/firefox/browsers/mobile/qr-firefox-mozillaonline.png and /dev/null differ diff --git a/media/js/base/base-page-init.js b/media/js/base/base-page-init.js index 6986121498..4388fdbf41 100644 --- a/media/js/base/base-page-init.js +++ b/media/js/base/base-page-init.js @@ -16,18 +16,6 @@ utils.initMobileDownloadLinks(); utils.trackDownloadThanksButton(); - - /* Bug 1264843: In partner distribution of desktop Firefox, switch the - downloads to corresponding partner build of Firefox for Android. */ - if (typeof Mozilla.Client !== 'undefined') { - var client = Mozilla.Client; - - if (client.isFirefoxDesktop) { - client.getFirefoxDetails( - utils.maybeSwitchToChinaRepackImages - ); - } - } }); } diff --git a/media/js/base/fxa-link.es6.js b/media/js/base/fxa-link.es6.js index 7a822b9c8d..10feba7917 100644 --- a/media/js/base/fxa-link.es6.js +++ b/media/js/base/fxa-link.es6.js @@ -8,8 +8,7 @@ const FxaLink = {}; const client = Mozilla.Client; const allowedList = [ 'https://accounts.firefox.com/', - 'https://accounts.stage.mozaws.net/', - 'https://accounts.firefox.com.cn/' + 'https://accounts.stage.mozaws.net/' ]; /** diff --git a/media/js/base/fxa-product-button.es6.js b/media/js/base/fxa-product-button.es6.js index 8b9e3c9a07..46fe6227aa 100644 --- a/media/js/base/fxa-product-button.es6.js +++ b/media/js/base/fxa-product-button.es6.js @@ -7,7 +7,6 @@ const FxaProductButton = {}; const allowedList = [ - 'https://accounts.firefox.com.cn/', 'https://accounts.firefox.com/', 'https://accounts.stage.mozaws.net/', 'https://getpocket.com/', diff --git a/media/js/base/mozilla-utils.js b/media/js/base/mozilla-utils.js index 5ba46ea14a..ec14ce485e 100644 --- a/media/js/base/mozilla-utils.js +++ b/media/js/base/mozilla-utils.js @@ -107,31 +107,6 @@ if (typeof window.Mozilla === 'undefined') { } }; - // Bug 1264843: link to China build of Fx4A, for display within Fx China repack - Utils.maybeSwitchToChinaRepackImages = function (client) { - if (!client.distribution) { - return; - } - - var distribution = client.distribution.toLowerCase(); - - // only swap out images for China Repack builds (issue 10157) - if (distribution !== 'mozillaonline') { - return; - } - - var images = document.querySelectorAll( - 'img[data-' + distribution + '-link]' - ); - - for (var j = 0; j < images.length; j++) { - var distributionSrc = images[j].getAttribute( - 'data-' + distribution + '-link' - ); - images[j].setAttribute('src', distributionSrc); - } - }; - // client-side redirects (handy for testing) Utils.doRedirect = function (destination) { if (destination) { diff --git a/tests/unit/spec/base/mozilla-utils.js b/tests/unit/spec/base/mozilla-utils.js index 202cf900f2..946b6698f9 100755 --- a/tests/unit/spec/base/mozilla-utils.js +++ b/tests/unit/spec/base/mozilla-utils.js @@ -58,38 +58,6 @@ describe('mozilla-utils.js', function () { }); }); - describe('maybeSwitchToChinaRepackImages', function () { - const defaultSrc = '/img/placeholder.png'; - const partnerASrc = '/img/foo.png'; - - beforeEach(function () { - const img = ``; - document.body.insertAdjacentHTML('beforeend', img); - }); - - afterEach(function () { - document.querySelectorAll('.test-image').forEach((e) => { - e.parentNode.removeChild(e); - }); - }); - - it('should use specified image for mozillaonline distributions', function () { - Mozilla.Utils.maybeSwitchToChinaRepackImages({ - distribution: 'mozillaonline' - }); - const img = document.querySelector('.test-image'); - expect(img.src).toContain(partnerASrc); - }); - - it('should use default image for other distributions', function () { - Mozilla.Utils.maybeSwitchToChinaRepackImages({ - distribution: 'regata os' - }); - const img = document.querySelector('.test-image'); - expect(img.src).toContain(defaultSrc); - }); - }); - describe('getDownloadAttributionValues', function () { it('should return expected values for Windows', function () { const site = { diff --git a/tests/unit/spec/firefox/all/all-downloads-unified.js b/tests/unit/spec/firefox/all/all-downloads-unified.js index c9758cfa2b..d65509a4e0 100644 --- a/tests/unit/spec/firefox/all/all-downloads-unified.js +++ b/tests/unit/spec/firefox/all/all-downloads-unified.js @@ -436,7 +436,7 @@ describe('all-downloads-unified.js', function () {

Multiple languages