commit 8d94cc4e5de9bdce74fce3a7d5e1a438b435b7d2 Author: Kathy Brade brade@pearlcrescent.com Date: Tue Apr 12 11:27:10 2016 -0400
Bug 10534: Let's not advertise help desk emails directly
Do not display the help@rt.torproject.org email address (currently, no one is responding to help desk email).
In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - - Copyright (c) 2014, The Tor Project, Inc. + - Copyright (c) 2016, The Tor Project, Inc. - See LICENSE for licensing information. - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> @@ -118,10 +118,12 @@ html:div&torsettings.bridgeHelp3.emailDesc;</html:div> html:div&torsettings.bridgeHelp3.emailList;</html:div> </html:li> +<!-- As of April 2016, no one is responding to help desk email. Hopefully this will change soon. <html:li> <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div> </html:li> +--> </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f4ed746..2736f08 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type";
-const kSupportAddr = "help@rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help@rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support";
const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -79,7 +81,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); }
var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done
torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S
torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.