Substitute, don't concatenate in internationalized strings

This commit is contained in:
Paul Licameli 2018-03-24 15:22:50 -04:00
parent d978abba35
commit 05ef58753a
1 changed files with 6 additions and 4 deletions

View File

@ -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