Commit 74856458 authored by Kathleen Brade's avatar Kathleen Brade
Browse files

Display help@rt.torproject.org in Network Settings.

parent bded2774
......@@ -35,7 +35,6 @@
<separator orient="vertical" />
<groupbox flex="1">
<description>&torsettings.prompt;</description>
<separator orient="horizontal" class="thin" />
</groupbox>
</hbox>
<separator />
......@@ -127,4 +126,7 @@
<description>&torsettings.bridgeHelp3;</description>
</wizardpage>
<hbox pack="start">
<label id="forAssistance" />
</hbox>
</wizard>
......@@ -15,6 +15,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
"resource://torlauncher/modules/tl-logger.jsm");
const kSupportAddr = "help@rt.torproject.org";
const kTorProcessReadyTopic = "TorProcessIsReady";
const kTorProcessExitedTopic = "TorProcessExited";
const kTorProcessDidNotStartTopic = "TorProcessDidNotStart";
......@@ -55,6 +58,13 @@ var gRestoreAfterHelpPanelID = null;
function initDialog()
{
var forAssistance = document.getElementById("forAssistance");
if (forAssistance)
{
forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString(
"forAssistance", [kSupportAddr], 1);
}
var cancelBtn = document.documentElement.getButton("cancel");
gIsInitialBootstrap = window.arguments[0];
if (gIsInitialBootstrap)
......
......@@ -70,5 +70,6 @@
<description>&torsettings.bridgeHelp3;</description>
</vbox>
</deck>
<spring />
<spring flex="1" />
<label id="forAssistance" />
</dialog>
......@@ -26,3 +26,5 @@ torlauncher.connect=Connect
torlauncher.quit=Quit
torlauncher.quit_win=Exit
torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S
......@@ -7,16 +7,24 @@
dialog {
width: 520px;
height: 440px;
height: 464px;
font: -moz-dialog;
}
wizard {
width: 540px;
height: 410px;
font: -moz-dialog;
padding-top: 0px;
}
#forAssistance {
margin-bottom: 6px;
-moz-user-select: text;
-moz-user-focus: normal;
cursor: text;
}
wizard label {
margin: 0px;
}
......
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