From 0a41a8f7a330630c5e2860eee8e34fdb2241958f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 18 Apr 2024 17:57:51 +0200 Subject: [PATCH] Fix fullpage-translations-customization.patch --- .../fullpage-translations-customization.patch | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/patches/fullpage-translations-customization.patch b/patches/fullpage-translations-customization.patch index 04d1ec6..1102990 100644 --- a/patches/fullpage-translations-customization.patch +++ b/patches/fullpage-translations-customization.patch @@ -1,21 +1,17 @@ -diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml -index 2633ccd..d2156e6 100644 --- a/browser/base/content/main-popupset.inc.xhtml +++ b/browser/base/content/main-popupset.inc.xhtml -@@ -654,6 +654,8 @@ +@@ -652,6 +652,8 @@ checked="false" autocheck="false" - oncommand="TranslationsPanel.onNeverTranslateSite()"/> + oncommand="FullPageTranslationsPanel.onNeverTranslateSite()"/> + ++ oncommand="FullPageTranslationsPanel.openDisableTranslations()"/> @@ -72,11 +68,9 @@ index 30b9076..c338c45 100644 -diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js -index 08c91c4..ef459f9 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -141,6 +141,10 @@ Preferences.addAll([ +@@ -144,6 +144,10 @@ Preferences.addAll([ { id: "dom.ipc.processCount.web", type: "int" }, { id: "layers.acceleration.disabled", type: "bool", inverted: true }, @@ -87,7 +81,7 @@ index 08c91c4..ef459f9 100644 // Files and Applications { id: "pref.downloads.disable_button.edit_actions", type: "bool" }, -@@ -323,6 +327,22 @@ var gMainPane = { +@@ -325,6 +329,22 @@ var gMainPane = { gMainPane.initTranslations(); @@ -110,7 +104,7 @@ index 08c91c4..ef459f9 100644 if ( Services.prefs.getBoolPref( "media.videocontrols.picture-in-picture.enabled" -@@ -783,6 +803,10 @@ var gMainPane = { +@@ -771,6 +791,10 @@ var gMainPane = { document.getElementById("checkSpelling"), () => this.writeCheckSpelling() ); @@ -121,7 +115,7 @@ index 08c91c4..ef459f9 100644 Preferences.addSyncFromPrefListener( document.getElementById("alwaysAsk"), () => this.readUseDownloadDir() -@@ -1010,24 +1034,33 @@ var gMainPane = { +@@ -1001,24 +1025,33 @@ var gMainPane = { document.getElementById("zoomBox").hidden = false; }, @@ -159,25 +153,24 @@ index 08c91c4..ef459f9 100644 class TranslationsState { /** * The fully initialized state. -diff --git a/browser/components/translations/content/translationsPanel.js b/browser/components/translations/content/translationsPanel.js -index b9916dc..1ff8d64 100644 ---- a/browser/components/translations/content/translationsPanel.js -+++ b/browser/components/translations/content/translationsPanel.js -@@ -1318,6 +1318,12 @@ var TranslationsPanel = new (class { +--- a/browser/components/translations/content/fullPageTranslationsPanel.js ++++ b/browser/components/translations/content/fullPageTranslationsPanel.js +@@ -1239,6 +1239,15 @@ var FullPageTranslationsPanel = new (class { ); } + openDisableTranslations() { + const window = + gBrowser.selectedBrowser.browsingContext.top.embedderElement.ownerGlobal; -+ window.openTrustedLinkIn("about:preferences#general-translations-enable", "tab"); ++ window.openTrustedLinkIn( ++ "about:preferences#general-translations-enable", ++ "tab" ++ ); + } + /** * Redirect the user to about:preferences */ -diff --git a/browser/locales/en-US/browser/translations.ftl b/browser/locales/en-US/browser/translations.ftl -index 8483a45..14478f4 100644 --- a/browser/locales/en-US/browser/translations.ftl +++ b/browser/locales/en-US/browser/translations.ftl @@ -58,6 +58,9 @@ translations-panel-settings-never-translate-unknown-language =