Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 08:39:46 +02:00
Code Issues Releases Wiki Activity

Move Privacy Policy URL to a different tab to improve it's visibility

Browse Source
This commit is contained in:
Dmitry Vedenko 2021-07-09 19:07:40 +03:00 committed by Dmitry Vedenko
parent e8b1820ea2
commit 01da348c8a
1 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/AboutDialog.cpp
View File

@ -74,6 +74,10 @@ hold information about one contributor to Audacity.
#define REV_IDENT (XO("No revision identifier was provided").Translation())
#endif
#if defined(HAS_SENTRY_REPORTING) || defined(HAVE_UPDATES_CHECK) || defined(USE_BREAKPAD)
#define HAS_PRIVACY_POLICY
#endif
// To substitute into many other translatable strings
static const auto ProgramName =
//XO("Audacity");
@ -487,11 +491,6 @@ visit our %s.")
<< XO("%s website: ").Format( ProgramName )
<< wxT("[[https://www.audacityteam.org/|https://www.audacityteam.org/]]")
#if defined(HAS_SENTRY_REPORTING) || defined(HAVE_UPDATES_CHECK) || defined(USE_BREAKPAD)
<< XO("<br/>Privacy policy: ")
<< wxT("[[https://www.audacityteam.org/about/desktop-privacy-notice/|https://www.audacityteam.org/about/desktop-privacy-notice/]]")
#endif
// DA: Link for DA url too
#ifdef EXPERIMENTAL_DA
<< wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|https://www.darkaudacity.com/]]")
@ -834,7 +833,11 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
void AboutDialog::PopulateLicensePage( ShuttleGui & S )
{
S.StartNotebookPage( XO("GPL License") );
#if defined(HAS_PRIVACY_POLICY)
S.StartNotebookPage(XC("Legal", "about dialog"));
#else
S.StartNotebookPage(XO("GPL License"));
#endif
S.StartVerticalLay(1);
HtmlWindow *html = safenew LinkingHtmlWindow(S.GetParent(), -1,
wxDefaultPosition,
@ -847,7 +850,9 @@ void AboutDialog::PopulateLicensePage( ShuttleGui & S )
// better proportionally spaced.
//
// The GPL is not to be translated....
wxString PageText= FormatHtmlText(
constexpr auto GPL_TEXT =
wxT(" <center>GNU GENERAL PUBLIC LICENSE\n</center>")
wxT(" <center>Version 2, June 1991\n</center>")
wxT("<p><p>")
@ -1129,7 +1134,37 @@ wxT("OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n
wxT("TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n")
wxT("YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n")
wxT("PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n")
wxT("POSSIBILITY OF SUCH DAMAGES.\n"));
wxT("POSSIBILITY OF SUCH DAMAGES.\n");
#if defined(HAS_PRIVACY_POLICY)
/* i18n-hint: For "About Audacity...": Title for Privacy Policy section */
const auto privacyPolicyTitle = XC("PRIVACY POLICY", "about dialog");
/* i18n-hint: For "About Audacity...": Title of hyperlink to the privacy policy. This is an object of "See". */
const auto privacyPolicyURLText = XO("our Privacy Policy");
/* i18n-hint: %s will be replaced with "our Privacy Policy" */
const auto privacyPolicyText = XO(
"App update checking and error reporting require network access. "
"These features are optional. See %s "
"for more information.")
.Format(
Verbatim(
"[[https://www.audacityteam.org/about/desktop-privacy-notice/|%s]]")
.Format(privacyPolicyURLText));
const wxString privacyPolicyHTML = wxString(
wxT("<center>") +
privacyPolicyTitle.Translation() +
wxT("</center><p>") +
privacyPolicyText.Translation() +
wxT("</p><br/><br/>")
);
wxString PageText = FormatHtmlText(privacyPolicyHTML + GPL_TEXT);
#else
wxString PageText = FormatHtmlText(GPL_TEXT);
#endif
html->SetPage( PageText );