Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-17 16:50:26 +02:00
Code Issues Releases Wiki Activity

http -> https in user-visible strings...

Browse Source 
... 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.
This commit is contained in:
Paul Licameli 2018-02-05 07:47:05 -05:00
parent ff3b052bc7
commit 007fa9eca2
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/AboutDialog.cpp
View File

@ -62,7 +62,7 @@ hold information about one contributor to Audacity.
#endif #endif
#ifdef REV_LONG #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 #else
#define REV_IDENT wxT("No revision identifier was provided") #define REV_IDENT wxT("No revision identifier was provided")
#endif #endif
@ -83,7 +83,7 @@ const wxString VerCheckArgs(){
// Url with Version check args attached. // Url with Version check args attached.
const wxString VerCheckUrl(){ const wxString VerCheckUrl(){
//The version we intend to use for live Audacity. //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. //For testing of our scriptlet.
//#define VER_CHECK_URL "http://www.audacityteam.org/slug/?" //#define VER_CHECK_URL "http://www.audacityteam.org/slug/?"
//For testing locally //For testing locally
@ -185,23 +185,23 @@ void AboutDialog::CreateCreditsList()
// Libraries // Libraries
AddCredit(wxT("[[http://libexpat.github.io/|expat]]"), roleLibrary); AddCredit(wxT("[[https://libexpat.github.io/|expat]]"), roleLibrary);
AddCredit(wxT("[[http://xiph.org/flac/|FLAC]]"), roleLibrary); AddCredit(wxT("[[https://xiph.org/flac/|FLAC]]"), roleLibrary);
AddCredit(wxT("[[http://lame.sourceforge.net/|LAME]]"), 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://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://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://vorbis.com/|Ogg Vorbis]]"), roleLibrary);
AddCredit(wxT("[[http://www.portaudio.com/|PortAudio]]"), roleLibrary); AddCredit(wxT("[[http://www.portaudio.com/|PortAudio]]"), roleLibrary);
AddCredit(wxT("[[http://www.portmedia.sourceforge.net/portmidi/|PortMidi]]"), 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://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.twolame.org/|TwoLAME]]"), roleLibrary);
AddCredit(wxT("[[http://www.vamp-plugins.org/|Vamp]]"), 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 // Thanks
@ -283,24 +283,24 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
// DA: Says that it is a customised version. // DA: Says that it is a customised version.
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA
wxT( 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, 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 [[http://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); Audacity is [[https://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).");
#else #else
_( _(
"Audacity is a free program written by a worldwide team of [[http://www.audacityteam.org/about/credits|volunteers]]. \ "Audacity is a free program written by a worldwide team of [[https://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 [[https://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).");
#endif #endif
// This trick here means that the English language version won't mention using // This trick here means that the English language version won't mention using
// English, whereas all translated versions will. // English, whereas all translated versions will.
wxString par2StrUntranslated = wxT( 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]]. \ "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 [[http://wiki.audacityteam.org/|wiki]] or \ For help, view the tips and tricks on our [[https://wiki.audacityteam.org/|wiki]] or \
visit our [[http://forum.audacityteam.org/|forum]]."); visit our [[https://forum.audacityteam.org/|forum]].");
wxString par2Str = _( wxString par2Str = _(
"If you find a bug or have a suggestion for us, please write, in English, to 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 [[http://wiki.audacityteam.org/|wiki]] or \ For help, view the tips and tricks on our [[https://wiki.audacityteam.org/|wiki]] or \
visit our [[http://forum.audacityteam.org/|forum]]."); visit our [[https://forum.audacityteam.org/|forum]].");
if( par2Str == par2StrUntranslated ) if( par2Str == par2StrUntranslated )
par2Str.Replace( wxT(", in English,"), wxT("") ); par2Str.Replace( wxT(", in English,"), wxT("") );
@ -365,11 +365,11 @@ visit our [[http://forum.audacityteam.org/|forum]].");
wxT("<p><b>") + _("Special thanks:") + wxT("</b><br>") + wxT("<p><b>") + _("Special thanks:") + wxT("</b><br>") +
GetCreditsByRole(roleThanks) + GetCreditsByRole(roleThanks) +
wxT("<p><br>") + _("Audacity website: ") + wxT("[[http://www.audacityteam.org/|http://www.audacityteam.org/]]") + wxT("<p><br>") + _("Audacity website: ") + wxT("[[https://www.audacityteam.org/|https://www.audacityteam.org/]]") +
// DA: Link for DA url too // DA: Link for DA url too
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA
wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|http://www.darkaudacity.com/]]") + wxT("<br>DarkAudacity website: [[https://www.darkaudacity.com/|https://www.darkaudacity.com/]]") +
#else #else
[]{ []{
// Will this post-translation substitution work in all locales? // Will this post-translation substitution work in all locales?

30
src/HelpText.cpp
View File

@ -215,6 +215,10 @@ namespace {
return target; return target;
} }
wxString EditLink( const wxString &str )
{
return Substitute( str, wxT("http:"), wxT("https:") );
}
} }
static wxString HelpTextBuiltIn( const wxString & Key ) static wxString HelpTextBuiltIn( const wxString & Key )
@ -240,16 +244,16 @@ static wxString HelpTextBuiltIn( const wxString & Key )
#endif #endif
+ " " + + " " +
_("We strongly recommend that you use our latest stable released version, which has full documentation and support.<br><br>") + _("We strongly recommend that you use our latest stable released version, which has full documentation and support.<br><br>") +
_("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].<hr><br><br>")+ EditLink (_("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].<hr><br><br>") )+
#endif #endif
// DA: Support methods text. // DA: Support methods text.
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA
wxT("<center><h3>DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("</h3></center>") + wxT("<center><h3>DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("</h3></center>") +
_("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") + _("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") +
_(" [[http://www.darkaudacity.com|www.darkaudacity.com]] - for differences between them.") + wxT("</li><li>") + EditLink( _(" [[http://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>") + _(" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkAudacity.") + wxT("</li><li>") +
_(" [[http://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("</li></ul>") + EditLink( _(" [[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("<br><br>Audacity has these support methods:") + wxT("<ul><li>") +
wxT(" [[https://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") + wxT(" [[https://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") +
@ -258,10 +262,10 @@ static wxString HelpTextBuiltIn( const wxString & Key )
wxT("<center><h3>Audacity ") + AUDACITY_VERSION_STRING + wxT("</h3><h3>") + wxT("<center><h3>Audacity ") + AUDACITY_VERSION_STRING + wxT("</h3><h3>") +
_("How to get help") + wxT("</h3></center>") + _("How to get help") + wxT("</h3></center>") +
_("These are our support methods:") + wxT("<p><ul><li>") + _("These are our support methods:") + wxT("<p><ul><li>") +
_(" [[file:quick_help.html|Quick Help]] - if not installed locally, [[http://manual.audacityteam.org/quick_help.html|view online]]") + wxT("</li><li>") + EditLink( _(" [[file:quick_help.html|Quick Help]] - if not installed locally, [[http://manual.audacityteam.org/quick_help.html|view online]]") ) + wxT("</li><li>") +
_(" [[file:index.html|Manual]] - if not installed locally, [[http://manual.audacityteam.org/|view online]]") + wxT("</li><li>") + EditLink( _(" [[file:index.html|Manual]] - if not installed locally, [[http://manual.audacityteam.org/|view online]]") ) + wxT("</li><li>") +
_(" [[http://forum.audacityteam.org/|Forum]] - ask your question directly, online.") + wxT("</li></ul></p><p>") + wxT("<b>") + EditLink( _(" [[http://forum.audacityteam.org/|Forum]] - ask your question directly, online.") ) + wxT("</li></ul></p><p>") + wxT("<b>") +
_("More:</b> Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + wxT("</p>"); EditLink( _("More:</b> Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") ) + wxT("</p>");
#endif #endif
#ifdef USE_ALPHA_MANUAL #ifdef USE_ALPHA_MANUAL
@ -275,18 +279,18 @@ static wxString HelpTextBuiltIn( const wxString & Key )
{ {
return WrapText( return WrapText(
wxString(wxT("<p>"))+ wxString(wxT("<p>"))+
_("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 \ 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| \ the optional [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign| \
FFmpeg library]] to your computer.") + wxT("</p><p>") + FFmpeg library]] to your computer.") ) + wxT("</p><p>") +
Substitute( EditLink( Substitute(
_("You can also read our help on importing \ _("You can also read our help on importing \
[[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#midi|MIDI files]] \ [[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| \ and tracks from [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#fromcd| \
audio CDs]]."), audio CDs]]."),
wxT("faq_opening_and_saving_files.html#midi"), wxT("faq_opening_and_saving_files.html#midi"),
wxT("playing_and_recording.html#midi") wxT("playing_and_recording.html#midi")
) + wxT("</p>") ) ) + wxT("</p>")
); );
} }
@ -303,12 +307,12 @@ Please [[*URL*|view the Manual online]].<br><br>\
To always view the Manual online, change \"Location of Manual\" in \ To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")); Interface Preferences to \"From Internet\"."));
#else #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 \ Please [[*URL*|view the Manual online]] or \
[[http://manual.audacityteam.org/man/unzipping_the_manual.html| \ [[http://manual.audacityteam.org/man/unzipping_the_manual.html| \
download the Manual]].<br><br>\ download the Manual]].<br><br>\
To always view the Manual online, change \"Location of Manual\" in \ To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")); Interface Preferences to \"From Internet\".")));
#endif #endif
} }
return wxT(""); return wxT("");

2
src/widgets/HelpSystem.cpp
View File

@ -308,7 +308,7 @@ void HelpSystem::ShowHelp(wxWindow *parent,
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA
releasePageName = wxT("video") + HelpSystem::ReleaseSuffix + anchor; releasePageName = wxT("video") + HelpSystem::ReleaseSuffix + anchor;
localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath(); localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();
webHelpPath = wxT("http://www.darkaudacity.com/"); webHelpPath = wxT("https://www.darkaudacity.com/");
#else #else
releasePageName = wxT("quick_help") + HelpSystem::ReleaseSuffix + anchor; releasePageName = wxT("quick_help") + HelpSystem::ReleaseSuffix + anchor;
localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath(); localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();