From 37ef3aa3f0173703568fc1d5da21a39030928c60 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Oct 2018 23:31:02 +0100 Subject: [PATCH 1/1] Improve Windows bad-chars error. --- src/tools/dcpomatic.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 63a5143e8..181ac83c4 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -488,11 +488,12 @@ private: found_bad_chars += bad_chars[i]; } } - error_dialog ( - this, - String::compose(_("Could not create folder to store film. Try removing the %1 characters from your folder name.", found_bad_chars)), - std_to_wx(e.what()) - ); + wxString message = _("Could not create folder to store film."); + if (!found_bad_chars.empty()) { + message += " "; + message += wxString::Format (_("Try removing the %s characters from your folder name.", std_to_wx(found_bad_chars).data())); + } + error_dialog (this, message, std_to_wx(e.what())); #else error_dialog (this, _("Could not create folder to store film."), std_to_wx(e.what())); #endif -- 2.30.2