From 8991fe752177614e670933121bc4e18713482af9 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Mon, 26 Feb 2018 14:09:07 +0000
Subject: [PATCH] Fix incorrect https and translation markings.

- DarkAudacity website does not support https, so don't specify https in strings.
- Don't translate text about DarkAudacity.
---
 src/AboutDialog.cpp        | 2 +-
 src/HelpText.cpp           | 9 +++++----
 src/widgets/HelpSystem.cpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index 0db71048a..f5578e3bd 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -369,7 +369,7 @@ visit our [[https://forum.audacityteam.org/|forum]].");
 
 // DA: Link for DA url too
 #ifdef EXPERIMENTAL_DA
-      wxT("<br>DarkAudacity website: [[https://www.darkaudacity.com/|https://www.darkaudacity.com/]]") +
+      wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|https://www.darkaudacity.com/]]") +
 #else
       _("<p><br>&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright &copy; 1999-2018 Audacity Team.<br>")
 
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index e8180869a..5a09b694a 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -228,11 +228,12 @@ static wxString HelpTextBuiltIn( const wxString & Key )
 
 // DA: Support methods text.
 #ifdef EXPERIMENTAL_DA
+         // Deliberately not translated.
          wxT("<center><h3>DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("</h3></center>") +
-         _("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") +
-         _(" [[https://www.darkaudacity.com|www.darkaudacity.com]] - for differences between them.") + wxT("</li><li>") +
-         _(" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkAudacity.") + wxT("</li><li>") +
-         _(" [[https://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("</li></ul>") +
+         wxT("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") +
+         wxT(" [[http://www.darkaudacity.com|www.darkaudacity.com]] - for differences between them.") + wxT("</li><li>") +
+         wxT(" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkAudacity.") + wxT("</li><li>") +
+         wxT(" [[http://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("</li></ul>") +
 
          wxT("<br><br>Audacity has these support methods:") + wxT("<ul><li>") +
          wxT(" [[https://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") +
diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp
index 83ec6aa15..b8424b538 100644
--- a/src/widgets/HelpSystem.cpp
+++ b/src/widgets/HelpSystem.cpp
@@ -308,7 +308,7 @@ void HelpSystem::ShowHelp(wxWindow *parent,
 #ifdef EXPERIMENTAL_DA
       releasePageName = wxT("video") + HelpSystem::ReleaseSuffix + anchor;
       localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();
-      webHelpPath = wxT("https://www.darkaudacity.com/");
+      webHelpPath = wxT("http://www.darkaudacity.com/");
 #else
       releasePageName = wxT("quick_help") + HelpSystem::ReleaseSuffix + anchor;
       localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();