1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-15 09:01:12 +01:00

Fix all remaining misuses of macro _ in static initializers...

... I found them using a rewritten macro _ that dynamically checked
that translations have been initialized.  But I do not commit that changed
macro.
This commit is contained in:
Paul Licameli
2017-09-29 20:14:37 -04:00
parent c94222ff54
commit 6a8bba0a99
8 changed files with 188 additions and 109 deletions

View File

@@ -310,20 +310,26 @@ DependencyDialog::DependencyDialog(wxWindow *parent,
PopulateOrExchange(S);
}
const wxString kStdMsg =
static const wxString kStdMsg()
{
return
_("Copying these files into your project will remove this dependency.\
\nThis is safer, but needs more disk space.");
}
const wxString kExtraMsgForMissingFiles =
static const wxString kExtraMsgForMissingFiles()
{
return
_("\n\nFiles shown as MISSING have been moved or deleted and cannot be copied.\
\nRestore them to their original location to be able to copy into project.");
}
void DependencyDialog::PopulateOrExchange(ShuttleGui& S)
{
S.SetBorder(5);
S.StartVerticalLay();
{
mMessageStaticText = S.AddVariableText(kStdMsg, false);
mMessageStaticText = S.AddVariableText(kStdMsg(), false);
S.StartStatic(_("Project Dependencies"));
{
@@ -422,9 +428,9 @@ void DependencyDialog::PopulateList()
++i;
}
wxString msg = kStdMsg;
wxString msg = kStdMsg();
if (mHasMissingFiles)
msg += kExtraMsgForMissingFiles;
msg += kExtraMsgForMissingFiles();
mMessageStaticText->SetLabel(msg);
if (mCopyAllFilesButton)