From 5d4ddbc42412b72f13baac2defb6aeea35aa0692 Mon Sep 17 00:00:00 2001 From: Paul Licameli <paul.licameli@gmail.com> Date: Fri, 1 Sep 2017 21:42:19 -0400 Subject: [PATCH] Make the (en) welcome window say it's a Beta test version, not alpha... ... This gets in too late for the translation files, but very few of them included a translation for this message. So, it will appear English for all. --- locale/audacity.pot | 2 +- src/HelpText.cpp | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/locale/audacity.pot b/locale/audacity.pot index ee84856ed8..dabe4fde81 100644 --- a/locale/audacity.pot +++ b/locale/audacity.pot @@ -549,7 +549,7 @@ msgstr "" msgid "Contributors" msgstr "" -#: src/AboutDialog.cpp:406 +#: src/AboutDialog.cpp:406 msgid "Translators" msgstr "" diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 57ba1b9570..afb258d570 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -201,7 +201,11 @@ wxString TitleText( const wxString & Key ) static wxString HelpTextBuiltIn( const wxString & Key ) { - if(Key==wxT("welcome")) + // PRL: Is it necessary to define these outside of conditional compilation so that both get into the .pot file? + auto alphamsg = _("<br><br>The version of Audacity you are using is an <b>Alpha test version</b>."); + auto betamsg = _("<br><br>The version of Audacity you are using is a <b>Beta test version</b>."); + + if (Key == wxT("welcome")) { /// TO-DO: Make the links to help here use the widgets/HelpSystem mechanism /// so that they are consistent @@ -211,8 +215,13 @@ static wxString HelpTextBuiltIn( const wxString & Key ) #if IS_ALPHA wxT("<hr><center><h3>") + _("Get the Official Released Version of Audacity") + wxT("</h3></center>") + VerCheckHtml() + - _("<br><br>The version of Audacity you are using is an <b>Alpha test version</b>.") + " " + - _("We strongly recommend that you use our latest stable released version, which has full documentation and support.<br><br>")+ +#if IS_ALPHA == 1 + alphamsg +#else + betamsg +#endif + + " " + + _("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>")+ #endif -- GitLab