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

Fix statically allocated message string in _() (didn't translate!)

Browse Source
This commit is contained in:
Paul Licameli 2017-09-08 13:11:54 -04:00
parent adc2695688
commit 42f8945812
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Project.cpp
View File

@ -2906,18 +2906,20 @@ void AudacityProject::OpenFiles(AudacityProject *proj)
// Most of this string was duplicated 3 places. Made the warning consistent in this global. // Most of this string was duplicated 3 places. Made the warning consistent in this global.
// The %s is to be filled with the version string. // The %s is to be filled with the version string.
static wxString gsLegacyFileWarning = // PRL: Do not statically allocate a string in _() !
static wxString gsLegacyFileWarning() { return
_("This file was saved by Audacity version %s. The format has changed. \ _("This file was saved by Audacity version %s. The format has changed. \
\n\nAudacity can try to open and save this file, but saving it in this \ \n\nAudacity can try to open and save this file, but saving it in this \
\nversion will then prevent any 1.2 or earlier version opening it. \ \nversion will then prevent any 1.2 or earlier version opening it. \
\n\nAudacity might corrupt the file in opening it, so you should \ \n\nAudacity might corrupt the file in opening it, so you should \
back it up first. \ back it up first. \
\n\nOpen this file now?"); \n\nOpen this file now?");
}
bool AudacityProject::WarnOfLegacyFile( ) bool AudacityProject::WarnOfLegacyFile( )
{ {
wxString msg; wxString msg;
msg.Printf(gsLegacyFileWarning, _("1.0 or earlier")); msg.Printf(gsLegacyFileWarning(), _("1.0 or earlier"));
// Stop icon, and choose 'NO' by default. // Stop icon, and choose 'NO' by default.
int action = int action =
@ -3523,7 +3525,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
// Specifically detect older versions of Audacity // Specifically detect older versions of Audacity
if ( bIsOld | bIsVeryOld ) { if ( bIsOld | bIsVeryOld ) {
wxString msg; wxString msg;
msg.Printf(gsLegacyFileWarning, audacityVersion.c_str()); msg.Printf(gsLegacyFileWarning(), audacityVersion.c_str());
int icon_choice = wxICON_EXCLAMATION; int icon_choice = wxICON_EXCLAMATION;
if( bIsVeryOld ) if( bIsVeryOld )