From 007fa9eca293ad64b4e1145d4a2edfaf47382477 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 5 Feb 2018 07:47:05 -0500 Subject: [PATCH] http -> https in user-visible strings... ... Some in wxT can be edited directly, some in _() are not really used now so they can be edited directly, others require a post-translation substitution. Not all links to libraries from Credits work with https: so update only those that do. --- src/AboutDialog.cpp | 44 +++++++++++++++++++------------------- src/HelpText.cpp | 32 +++++++++++++++------------ src/widgets/HelpSystem.cpp | 2 +- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 6a03d0e52..ee738b199 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -62,7 +62,7 @@ hold information about one contributor to Audacity. #endif #ifdef REV_LONG -#define REV_IDENT wxString( "[[http://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME +#define REV_IDENT wxString( "[[https://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME #else #define REV_IDENT wxT("No revision identifier was provided") #endif @@ -83,7 +83,7 @@ const wxString VerCheckArgs(){ // Url with Version check args attached. const wxString VerCheckUrl(){ //The version we intend to use for live Audacity. -#define VER_CHECK_URL "http://www.audacityteam.org/download/?" +#define VER_CHECK_URL "https://www.audacityteam.org/download/?" //For testing of our scriptlet. //#define VER_CHECK_URL "http://www.audacityteam.org/slug/?" //For testing locally @@ -185,23 +185,23 @@ void AboutDialog::CreateCreditsList() // Libraries - AddCredit(wxT("[[http://libexpat.github.io/|expat]]"), roleLibrary); - AddCredit(wxT("[[http://xiph.org/flac/|FLAC]]"), roleLibrary); + AddCredit(wxT("[[https://libexpat.github.io/|expat]]"), roleLibrary); + AddCredit(wxT("[[https://xiph.org/flac/|FLAC]]"), roleLibrary); AddCredit(wxT("[[http://lame.sourceforge.net/|LAME]]"), roleLibrary); - AddCredit(wxT("[[http://www.underbit.com/products/mad/|libmad]]"), roleLibrary); + AddCredit(wxT("[[https://www.underbit.com/products/mad/|libmad]]"), roleLibrary); AddCredit(wxT("[[http://www.mega-nerd.com/libsndfile/|libsndfile]]"), roleLibrary); - AddCredit(wxT("[[http://sourceforge.net/p/soxr/wiki/Home/|libsoxr]]"), roleLibrary); + AddCredit(wxT("[[https://sourceforge.net/p/soxr/wiki/Home/|libsoxr]]"), roleLibrary); AddCredit(wxT("[[http://lv2plug.in/|lv2]] (") + _("incorporating") + wxT(" lilv, msinttypes, serd, sord and sratom)"), roleLibrary); - AddCredit(wxT("[[http://www.cs.cmu.edu/~music/nyquist/|Nyquist]]"), roleLibrary); + AddCredit(wxT("[[https://www.cs.cmu.edu/~music/nyquist/|Nyquist]]"), roleLibrary); AddCredit(wxT("[[http://vorbis.com/|Ogg Vorbis]]"), roleLibrary); AddCredit(wxT("[[http://www.portaudio.com/|PortAudio]]"), roleLibrary); AddCredit(wxT("[[http://www.portmedia.sourceforge.net/portmidi/|PortMidi]]"), roleLibrary); - AddCredit(wxT("[[http://sourceforge.net/p/portmedia/wiki/portsmf/|portsmf]]"), roleLibrary); + AddCredit(wxT("[[https://sourceforge.net/p/portmedia/wiki/portsmf/|portsmf]]"), roleLibrary); AddCredit(wxT("[[http://sbsms.sourceforge.net/|sbsms]]"), roleLibrary); - AddCredit(wxT("[[http://www.surina.net/soundtouch/|SoundTouch]]"), roleLibrary); + AddCredit(wxT("[[https://www.surina.net/soundtouch/|SoundTouch]]"), roleLibrary); AddCredit(wxT("[[http://www.twolame.org/|TwoLAME]]"), roleLibrary); AddCredit(wxT("[[http://www.vamp-plugins.org/|Vamp]]"), roleLibrary); - AddCredit(wxT("[[http://wxwidgets.org/|wxWidgets]]"), roleLibrary); + AddCredit(wxT("[[https://wxwidgets.org/|wxWidgets]]"), roleLibrary); // Thanks @@ -283,24 +283,24 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) // DA: Says that it is a customised version. #ifdef EXPERIMENTAL_DA wxT( -"Audacity, which this is a customised version of, is a free program written by a worldwide team of [[http://www.audacityteam.org/about/credits|volunteers]]. \ -Audacity is [[http://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); +"Audacity, which this is a customised version of, is a free program written by a worldwide team of [[https://www.audacityteam.org/about/credits|volunteers]]. \ +Audacity is [[https://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); #else _( -"Audacity is a free program written by a worldwide team of [[http://www.audacityteam.org/about/credits|volunteers]]. \ -Audacity is [[http://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); +"Audacity is a free program written by a worldwide team of [[https://www.audacityteam.org/about/credits|volunteers]]. \ +Audacity is [[https://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); #endif // This trick here means that the English language version won't mention using // English, whereas all translated versions will. wxString par2StrUntranslated = wxT( -"If you find a bug or have a suggestion for us, please write, in English, to our [[http://forum.audacityteam.org/|forum]]. \ -For help, view the tips and tricks on our [[http://wiki.audacityteam.org/|wiki]] or \ -visit our [[http://forum.audacityteam.org/|forum]]."); +"If you find a bug or have a suggestion for us, please write, in English, to our [[https://forum.audacityteam.org/|forum]]. \ +For help, view the tips and tricks on our [[https://wiki.audacityteam.org/|wiki]] or \ +visit our [[https://forum.audacityteam.org/|forum]]."); wxString par2Str = _( -"If you find a bug or have a suggestion for us, please write, in English, to our [[http://forum.audacityteam.org/|forum]]. \ -For help, view the tips and tricks on our [[http://wiki.audacityteam.org/|wiki]] or \ -visit our [[http://forum.audacityteam.org/|forum]]."); +"If you find a bug or have a suggestion for us, please write, in English, to our [[https://forum.audacityteam.org/|forum]]. \ +For help, view the tips and tricks on our [[https://wiki.audacityteam.org/|wiki]] or \ +visit our [[https://forum.audacityteam.org/|forum]]."); if( par2Str == par2StrUntranslated ) par2Str.Replace( wxT(", in English,"), wxT("") ); @@ -365,11 +365,11 @@ visit our [[http://forum.audacityteam.org/|forum]]."); wxT("

") + _("Special thanks:") + wxT("
") + GetCreditsByRole(roleThanks) + - wxT("


") + _("Audacity website: ") + wxT("[[http://www.audacityteam.org/|http://www.audacityteam.org/]]") + + wxT("


") + _("Audacity website: ") + wxT("[[https://www.audacityteam.org/|https://www.audacityteam.org/]]") + // DA: Link for DA url too #ifdef EXPERIMENTAL_DA - wxT("
DarkAudacity website: [[http://www.darkaudacity.com/|http://www.darkaudacity.com/]]") + + wxT("
DarkAudacity website: [[https://www.darkaudacity.com/|https://www.darkaudacity.com/]]") + #else []{ // Will this post-translation substitution work in all locales? diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 1585a1ff2..c273718a7 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -215,6 +215,10 @@ namespace { return target; } + wxString EditLink( const wxString &str ) + { + return Substitute( str, wxT("http:"), wxT("https:") ); + } } static wxString HelpTextBuiltIn( const wxString & Key ) @@ -240,16 +244,16 @@ static wxString HelpTextBuiltIn( const wxString & Key ) #endif + " " + _("We strongly recommend that you use our latest stable released version, which has full documentation and support.

") + - _("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].



")+ -#endif + EditLink (_("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].


") )+ +#endif // DA: Support methods text. #ifdef EXPERIMENTAL_DA wxT("

DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("

") + _("

DarkAudacity is based on Audacity:") + wxT("") + + EditLink( _(" [[http://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("") ) + wxT("

Audacity has these support methods:") + wxT("

") + wxT("") + + EditLink( _("More: Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") ) + wxT("

"); #endif #ifdef USE_ALPHA_MANUAL @@ -275,18 +279,18 @@ static wxString HelpTextBuiltIn( const wxString & Key ) { return WrapText( wxString(wxT("

"))+ - _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ + EditLink( _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ compressed WAV files from portable recorders and audio from video files) if you download and install \ the optional [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign| \ -FFmpeg library]] to your computer.") + wxT("

") + -Substitute( +FFmpeg library]] to your computer.") ) + wxT("

") + +EditLink( Substitute( _("You can also read our help on importing \ [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#midi|MIDI files]] \ and tracks from [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#fromcd| \ audio CDs]]."), wxT("faq_opening_and_saving_files.html#midi"), wxT("playing_and_recording.html#midi") -) + wxT("

") +) ) + wxT("

") ); } @@ -303,12 +307,12 @@ Please [[*URL*|view the Manual online]].

\ To always view the Manual online, change \"Location of Manual\" in \ Interface Preferences to \"From Internet\".")); #else - return WrapText(_("The Manual does not appear to be installed. \ + return WrapText( EditLink( _("The Manual does not appear to be installed. \ Please [[*URL*|view the Manual online]] or \ [[http://manual.audacityteam.org/man/unzipping_the_manual.html| \ download the Manual]].

\ To always view the Manual online, change \"Location of Manual\" in \ -Interface Preferences to \"From Internet\".")); +Interface Preferences to \"From Internet\"."))); #endif } return wxT(""); diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index b8424b538..83ec6aa15 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("http://www.darkaudacity.com/"); + webHelpPath = wxT("https://www.darkaudacity.com/"); #else releasePageName = wxT("quick_help") + HelpSystem::ReleaseSuffix + anchor; localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();