mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Make a few strings into format strings for translations. Closes #1093.

Browse source 
Originally committed to SVN as r5908.
This commit is contained in:
Thomas Goyne 2011-11-25 19:26:48 +00:00
parent 7b46ce6380
commit 6152716003
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/dialog_style_editor.cpp
View file

@ -88,7 +88,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con
if (copy_style) { if (copy_style) {
is_new = true; is_new = true;
style = this->style = new AssStyle(*style); style = this->style = new AssStyle(*style);
style->name += _(" - Copy"); style->name = wxString::Format(_("%s - Copy"), style->name);
} }
else if (!style) { else if (!style) {
is_new = true; is_new = true;

24
aegisub/src/dialog_style_manager.cpp
View file

@ -740,19 +740,14 @@ void DialogStyleManager::OnStorageDelete (wxCommandEvent &) {
wxArrayInt selections; wxArrayInt selections;
int n = StorageList->GetSelections(selections); int n = StorageList->GetSelections(selections);
wxString message; wxString message = n == 1 ?
if (n!=1) { _("Are you sure you want to delete this style?") :
message = _("Are you sure you want to delete these "); wxString::Format(_("Are you sure you want to delete these %d styles?"), n);
message += wxString::Format("%i",n);
message += _(" styles?");
}
else message = _("Are you sure you want to delete this style?");
int option = wxMessageBox(message, _("Confirm delete from storage"), wxYES_NO | wxICON_EXCLAMATION , this); int option = wxMessageBox(message, _("Confirm delete from storage"), wxYES_NO | wxICON_EXCLAMATION , this);
if (option == wxYES) { if (option == wxYES) {
AssStyle *temp;
for (int i=0;i<n;i++) { for (int i=0;i<n;i++) {
temp = styleStorageMap.at(selections[i]); AssStyle *temp = styleStorageMap.at(selections[i]);
Store.style.remove(temp); Store.style.remove(temp);
delete temp; delete temp;
} }
@ -773,17 +768,14 @@ void DialogStyleManager::OnCurrentDelete (wxCommandEvent &) {
wxArrayInt selections; wxArrayInt selections;
int n = CurrentList->GetSelections(selections); int n = CurrentList->GetSelections(selections);
wxString message; wxString message = n == 1 ?
if (n != 1) _("Are you sure you want to delete this style?") :
message = wxString::Format(_("Are you sure you want to delete these %d styles?"), n); wxString::Format(_("Are you sure you want to delete these %d styles?"), n);
else
message = _("Are you sure you want to delete this style?");
int option = wxMessageBox(message, _("Confirm delete from current"), wxYES_NO | wxICON_EXCLAMATION , this); int option = wxMessageBox(message, _("Confirm delete from current"), wxYES_NO | wxICON_EXCLAMATION , this);
if (option == wxYES) { if (option == wxYES) {
AssStyle *temp;
for (int i=0;i<n;i++) { for (int i=0;i<n;i++) {
temp = styleMap.at(selections[i]); AssStyle *temp = styleMap.at(selections[i]);
c->ass->Line.remove(temp); c->ass->Line.remove(temp);
delete temp; delete temp;
} }

2
aegisub/src/dialog_video_details.cpp
View file

@ -86,7 +86,7 @@ DialogVideoDetails::DialogVideoDetails(agi::Context *c)
make_field(this, fg, _("File name:"), c->videoController->videoName); make_field(this, fg, _("File name:"), c->videoController->videoName);
make_field(this, fg, _("FPS:"), wxString::Format("%.3f", fps)); make_field(this, fg, _("FPS:"), wxString::Format("%.3f", fps));
make_field(this, fg, _("Resolution:"), wxString::Format("%dx%d (%s)", width, height, pretty_ar(width, height))); make_field(this, fg, _("Resolution:"), wxString::Format("%dx%d (%s)", width, height, pretty_ar(width, height)));
make_field(this, fg, _("Length:"), wxString::Format("%d frames (%s)", framecount, pretty_time_stamp(framecount, fps))); make_field(this, fg, _("Length:"), wxString::Format(_("%d frames (%s)"), framecount, pretty_time_stamp(framecount, fps)));
make_field(this, fg, _("Decoder:"), c->videoController->GetProvider()->GetDecoderName()); make_field(this, fg, _("Decoder:"), c->videoController->GetProvider()->GetDecoderName());
wxStaticBoxSizer *video_sizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Video")); wxStaticBoxSizer *video_sizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Video"));