From 05ef58753a53f3f87501dce36c012dfead68e8bf Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 24 Mar 2018 15:22:50 -0400 Subject: [PATCH] Substitute, don't concatenate in internationalized strings --- src/effects/Equalization.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 8204305bc..cc13a1a33 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -3349,7 +3349,8 @@ void EditCurvesDialog::OnRename(wxCommandEvent & WXUNUSED(event)) mEffect->Effect::MessageBox( _("Name is the same as the original one"), wxOK, _("Same name") ); break; } - int answer = mEffect->Effect::MessageBox( _("Overwrite existing curve '") + name +_("'?"), + int answer = mEffect->Effect::MessageBox( + wxString::Format( _("Overwrite existing curve '%s'?"), name ), wxYES_NO, _("Curve exists") ); if (answer == wxYES) { @@ -3428,7 +3429,8 @@ void EditCurvesDialog::OnDelete(wxCommandEvent & WXUNUSED(event)) { // Create the prompt wxString quest; - quest = wxString(_("Delete '")) + mEditCurves[ item-deleted ].Name + _("'?"); + quest = wxString::Format(_("Delete '%s'?"), + mEditCurves[ item-deleted ].Name); // Ask for confirmation before removal int ans = mEffect->Effect::MessageBox( quest, wxYES_NO | wxCENTRE, _("Confirm Deletion") ); @@ -3454,10 +3456,10 @@ void EditCurvesDialog::OnDelete(wxCommandEvent & WXUNUSED(event)) // Create the prompt wxString quest; if( count > 1 ) - quest.Printf(_("Delete ") + wxString(wxT("%d ")) + _("items?"), count); + quest = wxString::Format(_("Delete %d items?"), count); else if( count == 1 ) - quest = wxString(_("Delete '")) + mEditCurves[ item ].Name + _("'?"); + quest = wxString::Format(_("Delete '%s'?"), mEditCurves[ item ].Name); else return; // Ask for confirmation before removal