GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit ee6c4337 authored by Kathleen Brade's avatar Kathleen Brade

Bug 34206: Tor Launcher button labels are missing (Firefox 76)

Mozilla's wizard has a bug where localized labels are not loaded because
Fluent is not initialized early enough. Apply the same workaround as
Mozilla applied in https://bugzilla.mozilla.org/show_bug.cgi?id=1625938
parent df0350fc
...@@ -12,12 +12,18 @@ ...@@ -12,12 +12,18 @@
<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> <!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
torwizard="true" torwizard="true"
title="&torlauncher.localePicker.title;" title="&torlauncher.localePicker.title;"
windowtype="TorLauncher:LocalePicker" windowtype="TorLauncher:LocalePicker"
persist="screenX screenY" persist="screenX screenY"
onload="initLocaleDialog();"> onload="initLocaleDialog();">
<!-- Work around a fluent bug in the wizard code (see Mozilla bug 1625938) -->
<linkset>
<html:link rel="localization" href="toolkit/global/wizard.ftl"/>
</linkset>
<wizard id="TorLauncherLocalePicker"> <wizard id="TorLauncherLocalePicker">
<script type="application/x-javascript" <script type="application/x-javascript"
src="chrome://torlauncher/content/network-settings.js"/> src="chrome://torlauncher/content/network-settings.js"/>
......
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
onload="initDialog();" onload="initDialog();"
onunload="deinitDialog();"> onunload="deinitDialog();">
<!-- Work around a fluent bug in the wizard code (see Mozilla bug 1625938) -->
<linkset>
<html:link rel="localization" href="toolkit/global/wizard.ftl"/>
</linkset>
<wizard id="TorNetworkSettings" <wizard id="TorNetworkSettings"
defaulttitle="&torsettings.wizard.title.default;" defaulttitle="&torsettings.wizard.title.default;"
buttonlabelextra2="&torsettings.copyLog;"> buttonlabelextra2="&torsettings.copyLog;">
......
...@@ -2583,7 +2583,7 @@ function getElemValue(aID, aDefaultValue) ...@@ -2583,7 +2583,7 @@ function getElemValue(aID, aDefaultValue)
function getButton(aButtonName) function getButton(aButtonName)
{ {
let dialogOrWizard = document.documentElement.firstChild; let dialogOrWizard = document.querySelector("wizard");
return dialogOrWizard.getButton(aButtonName); return dialogOrWizard.getButton(aButtonName);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment