mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 13:43:04 -05:00
Merge pull request 'Add fullpage-translations-customization.patch' (!64) from fullpage-translations-customization into main
Reviewed-on: https://codeberg.org/librewolf/source/pulls/64
This commit is contained in:
Bert van der Weerd
commit
9bc4436877
2 changed files with 194 additions and 0 deletions
|
|
@ -8,6 +8,7 @@ patches/devtools-bypass.patch
|
||||||
patches/disable-data-reporting-at-compile-time.patch
|
patches/disable-data-reporting-at-compile-time.patch
|
||||||
patches/flatpak-autoconf.patch
|
patches/flatpak-autoconf.patch
|
||||||
patches/fullpage-translations.patch
|
patches/fullpage-translations.patch
|
||||||
|
patches/fullpage-translations-customization.patch
|
||||||
patches/hide-passwordmgr.patch
|
patches/hide-passwordmgr.patch
|
||||||
patches/librewolf-prefs.patch
|
patches/librewolf-prefs.patch
|
||||||
patches/mozilla_dirs.patch
|
patches/mozilla_dirs.patch
|
||||||
|
|
|
||||||
193
patches/fullpage-translations-customization.patch
Normal file
193
patches/fullpage-translations-customization.patch
Normal file
|
|
@ -0,0 +1,193 @@
|
||||||
|
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
|
||||||
|
--- a/browser/base/content/main-popupset.inc.xhtml
|
||||||
|
+++ b/browser/base/content/main-popupset.inc.xhtml
|
||||||
|
@@ -654,6 +654,8 @@
|
||||||
|
checked="false"
|
||||||
|
autocheck="false"
|
||||||
|
oncommand="TranslationsPanel.onNeverTranslateSite()"/>
|
||||||
|
+ <menuitem data-l10n-id="translations-panel-disable-translations"
|
||||||
|
+ oncommand="TranslationsPanel.openDisableTranslations()"/>
|
||||||
|
<menuseparator/>
|
||||||
|
<menuitem class="manage-languages-menuitem"
|
||||||
|
data-l10n-id="translations-panel-settings-manage-languages"
|
||||||
|
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
|
||||||
|
--- a/browser/components/preferences/main.inc.xhtml
|
||||||
|
+++ b/browser/components/preferences/main.inc.xhtml
|
||||||
|
@@ -382,27 +382,36 @@
|
||||||
|
preference="layout.spellcheckDefault"/>
|
||||||
|
|
||||||
|
<!-- Translations -->
|
||||||
|
- <vbox id="translationsGroup" hidden="true" data-subcategory="translations">
|
||||||
|
+ <vbox id="translationsGroup" data-subcategory="translations">
|
||||||
|
<label><html:h2 data-l10n-id="translations-manage-header"/></label>
|
||||||
|
- <hbox id="translations-manage-description" align="center">
|
||||||
|
- <description flex="1" data-l10n-id="translations-manage-intro"/>
|
||||||
|
- <button id="translations-manage-settings-button"
|
||||||
|
- is="highlightable-button"
|
||||||
|
- class="accessory-button"
|
||||||
|
- data-l10n-id="translations-manage-settings-button"/>
|
||||||
|
- </hbox>
|
||||||
|
- <vbox>
|
||||||
|
- <html:div id="translations-manage-install-list" hidden="true">
|
||||||
|
- <hbox class="translations-manage-language">
|
||||||
|
- <label data-l10n-id="translations-manage-install-description"></label>
|
||||||
|
- <button id="translations-manage-install-all"
|
||||||
|
- data-l10n-id="translations-manage-language-install-all-button"></button>
|
||||||
|
- <button id="translations-manage-delete-all"
|
||||||
|
- data-l10n-id="translations-manage-language-remove-all-button"></button>
|
||||||
|
- </hbox>
|
||||||
|
- <!-- The downloadable languages will be listed here. -->
|
||||||
|
- </html:div>
|
||||||
|
- <description id="translations-manage-error" hidden="true"></description>
|
||||||
|
+ <checkbox id="translations-manage-enable"
|
||||||
|
+ data-l10n-id="translations-manage-enable"
|
||||||
|
+ preference="browser.translations.enable"
|
||||||
|
+ data-subcategory="translations-enable" />
|
||||||
|
+ <vbox id="innerTranslationsGroup" hidden="true">
|
||||||
|
+ <checkbox id="translations-manage-autopopup"
|
||||||
|
+ data-l10n-id="translations-manage-autopopup"
|
||||||
|
+ preference="browser.translations.automaticallyPopup" />
|
||||||
|
+ <hbox id="translations-manage-description" align="center">
|
||||||
|
+ <description flex="1" data-l10n-id="translations-manage-intro"/>
|
||||||
|
+ <button id="translations-manage-settings-button"
|
||||||
|
+ is="highlightable-button"
|
||||||
|
+ class="accessory-button"
|
||||||
|
+ data-l10n-id="translations-manage-settings-button"/>
|
||||||
|
+ </hbox>
|
||||||
|
+ <vbox>
|
||||||
|
+ <html:div id="translations-manage-install-list" hidden="true">
|
||||||
|
+ <hbox class="translations-manage-language">
|
||||||
|
+ <label data-l10n-id="translations-manage-install-description"></label>
|
||||||
|
+ <button id="translations-manage-install-all"
|
||||||
|
+ data-l10n-id="translations-manage-language-install-all-button"></button>
|
||||||
|
+ <button id="translations-manage-delete-all"
|
||||||
|
+ data-l10n-id="translations-manage-language-remove-all-button"></button>
|
||||||
|
+ </hbox>
|
||||||
|
+ <!-- The downloadable languages will be listed here. -->
|
||||||
|
+ </html:div>
|
||||||
|
+ <description id="translations-manage-error" hidden="true"></description>
|
||||||
|
+ </vbox>
|
||||||
|
</vbox>
|
||||||
|
</vbox>
|
||||||
|
</groupbox>
|
||||||
|
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
|
||||||
|
--- a/browser/components/preferences/main.js
|
||||||
|
+++ b/browser/components/preferences/main.js
|
||||||
|
@@ -141,6 +141,10 @@ Preferences.addAll([
|
||||||
|
{ id: "dom.ipc.processCount.web", type: "int" },
|
||||||
|
{ id: "layers.acceleration.disabled", type: "bool", inverted: true },
|
||||||
|
|
||||||
|
+ /* Fullpage Translations */
|
||||||
|
+ { id: "browser.translations.enable", type: "bool" },
|
||||||
|
+ { id: "browser.translations.automaticallyPopup", type: "bool" },
|
||||||
|
+
|
||||||
|
// Files and Applications
|
||||||
|
{ id: "pref.downloads.disable_button.edit_actions", type: "bool" },
|
||||||
|
|
||||||
|
@@ -323,6 +327,17 @@ var gMainPane = {
|
||||||
|
|
||||||
|
gMainPane.initTranslations();
|
||||||
|
|
||||||
|
+ Preferences.get("browser.translations.enable").on("change", () => {
|
||||||
|
+ if(!Preferences.get("browser.translations.enable").value)
|
||||||
|
+ confirmRestartPrompt(false, 1, true, false).then(buttonIndex => {
|
||||||
|
+ if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
|
||||||
|
+ Services.startup.quit(
|
||||||
|
+ Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart
|
||||||
|
+ );
|
||||||
|
+ }
|
||||||
|
+ });
|
||||||
|
+ });
|
||||||
|
+
|
||||||
|
if (
|
||||||
|
Services.prefs.getBoolPref(
|
||||||
|
"media.videocontrols.picture-in-picture.enabled"
|
||||||
|
@@ -784,6 +799,10 @@ var gMainPane = {
|
||||||
|
() => this.writeCheckSpelling()
|
||||||
|
);
|
||||||
|
Preferences.addSyncFromPrefListener(
|
||||||
|
+ document.getElementById("translations-manage-enable"),
|
||||||
|
+ () => this.readEnableTranslations()
|
||||||
|
+ );
|
||||||
|
+ Preferences.addSyncFromPrefListener(
|
||||||
|
document.getElementById("alwaysAsk"),
|
||||||
|
() => this.readUseDownloadDir()
|
||||||
|
);
|
||||||
|
@@ -1010,24 +1029,33 @@ var gMainPane = {
|
||||||
|
document.getElementById("zoomBox").hidden = false;
|
||||||
|
},
|
||||||
|
|
||||||
|
+ readEnableTranslations(skipInit = false) {
|
||||||
|
+ const translationsEnabled = Preferences.get("browser.translations.enable").value;
|
||||||
|
+ document.getElementById("innerTranslationsGroup").hidden = !translationsEnabled;
|
||||||
|
+ if (!this._translationsInitialized && !skipInit)
|
||||||
|
+ this.initTranslations();
|
||||||
|
+ },
|
||||||
|
+
|
||||||
|
+ _translationsInitialized: false,
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Initialize the translations view.
|
||||||
|
*/
|
||||||
|
async initTranslations() {
|
||||||
|
+ this.readEnableTranslations(true);
|
||||||
|
+
|
||||||
|
if (!Services.prefs.getBoolPref("browser.translations.enable")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ this._translationsInitialized = true;
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Which phase a language download is in.
|
||||||
|
*
|
||||||
|
* @typedef {"downloaded" | "loading" | "uninstalled"} DownloadPhase
|
||||||
|
*/
|
||||||
|
|
||||||
|
- // Immediately show the group so that the async load of the component does
|
||||||
|
- // not cause the layout to jump. The group will be empty initially.
|
||||||
|
- document.getElementById("translationsGroup").hidden = false;
|
||||||
|
-
|
||||||
|
class TranslationsState {
|
||||||
|
/**
|
||||||
|
* The fully initialized state.
|
||||||
|
diff --git a/browser/components/translations/content/translationsPanel.js b/browser/components/translations/content/translationsPanel.js
|
||||||
|
--- a/browser/components/translations/content/translationsPanel.js
|
||||||
|
+++ b/browser/components/translations/content/translationsPanel.js
|
||||||
|
@@ -1322,6 +1322,12 @@ var TranslationsPanel = new (class {
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ openDisableTranslations() {
|
||||||
|
+ const window =
|
||||||
|
+ gBrowser.selectedBrowser.browsingContext.top.embedderElement.ownerGlobal;
|
||||||
|
+ 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
|
||||||
|
--- a/browser/locales/en-US/browser/translations.ftl
|
||||||
|
+++ b/browser/locales/en-US/browser/translations.ftl
|
||||||
|
@@ -58,6 +58,9 @@ translations-panel-settings-never-transl
|
||||||
|
translations-panel-settings-never-translate-site =
|
||||||
|
.label = Never translate this site
|
||||||
|
|
||||||
|
+translations-panel-disable-translations =
|
||||||
|
+ .label = Disable translations completely
|
||||||
|
+
|
||||||
|
## The translation panel appears from the url bar, and this view is the default
|
||||||
|
## translation view.
|
||||||
|
|
||||||
|
@@ -123,6 +126,10 @@ translations-manage-header = Translation
|
||||||
|
translations-manage-settings-button =
|
||||||
|
.label = Settings…
|
||||||
|
.accesskey = t
|
||||||
|
+translations-manage-enable =
|
||||||
|
+ .label = Enable fullpage translations
|
||||||
|
+translations-manage-autopopup =
|
||||||
|
+ .label = Prompt to translate pages that aren’t in the browser’s configured language
|
||||||
|
translations-manage-intro = Set your language and site translation preferences and manage languages installed for offline translation.
|
||||||
|
translations-manage-install-description = Install languages for offline translation
|
||||||
|
translations-manage-language-install-button =
|
||||||
Loading…
Reference in a new issue