diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch index 8abbc59..1efcf2e 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch @@ -494,13 +494,14 @@ diff -Nru a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - \ No newline at end of file -diff -Nru a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js ---- a/browser/components/preferences/moreFromMozilla.js 2022-05-22 09:35:55.404674027 +0000 -+++ b/browser/components/preferences/moreFromMozilla.js 2022-05-22 21:42:46.814391896 +0000 -@@ -81,38 +81,7 @@ - }, +diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js +index bf97580d..31017a6f 100644 +--- a/browser/components/preferences/moreFromMozilla.js ++++ b/browser/components/preferences/moreFromMozilla.js +@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = { renderProducts() { + const isRegionUS = Region.home.toLowerCase() === "us"; - let products = [ - { - id: "firefox-mobile", @@ -532,6 +533,19 @@ diff -Nru a/browser/components/preferences/moreFromMozilla.js b/browser/componen - }, - }, - }, +- { +- id: "mozilla-monitor", +- title_string_id: "more-from-moz-mozilla-monitor-title", +- description_string_id: isRegionUS +- ? "more-from-moz-mozilla-monitor-us-description" +- : "more-from-moz-mozilla-monitor-global-description", +- region: isRegionUS ? "us" : "global", +- button: { +- id: "mozillaMonitor", +- label_string_id: "more-from-moz-mozilla-monitor-button", +- actionURL: "https://monitor.mozilla.org/", +- }, +- }, - ]; + let products = []; diff --git a/helpers/make-firefox b/helpers/make-firefox index 362a967..3641bdc 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -94,7 +94,7 @@ pref("datareporting.healthreport.about.reportUrl", "https://trisquel.info/legal" pref("datareporting.healthreport.infoURL", "https://trisquel.info/legal"); EOF # Replace privacy page -sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml +grep -rl 'https://www.mozilla.org/legal/privacy/' | xargs -r sed -i 's%https://www.mozilla.org/legal/privacy/*"%https://trisquel.info/legal"%' # Disable telemetry pings grep -rl TELEMETRY_BASE_URL | xargs -r sed -i 's|"https://incoming.telemetry.mozilla.org/submit"|""|' @@ -107,7 +107,7 @@ grep -rl toolkit.telemetry.shutdownPingSender.enabled | xargs -r sed -i '/toolk grep -rl toolkit.telemetry.newProfilePing.enabled | xargs -r sed -i '/toolkit.telemetry.newProfilePing.enabled/s|true|false|' grep -rl toolkit.telemetry.firstShutdownPing.enabled | xargs -r sed -i '/toolkit.telemetry.firstShutdownPing.enabled/s|true|false|' grep -rl toolkit.telemetry.bhrPing.enabled | xargs -r sed -i '/toolkit.telemetry.bhrPing.enabled/s|true|false|' -grep -rl browser.ping-centre.telemetry | xargs -r sed -i '/browser.ping-centre.telemetry/s|true|false|' +# fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1868988 grep -rl security.certerrors.recordEventTelemetry | xargs -r sed -i '/security.certerrors.recordEventTelemetry/s|true|false|' grep -rl services.sync.telemetry.maxPayloadCount modules/ | xargs -r sed -i '/services.sync.telemetry.maxPayloadCount/s|500|-1|' grep -rl services.sync.telemetry.submissionInterval modules/ | xargs -r sed -i '/services.sync.telemetry.submissionInterval/s|43200|-1|'