diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/tools/dcpomatic_batch.cc | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/tools/dcpomatic_batch.cc')
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index c6a58f741..ee35034f4 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -29,7 +29,6 @@ #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/wx_variant.h" -#include "lib/compose.hpp" #include "lib/config.h" #include "lib/dcpomatic_socket.h" #include "lib/film.h" @@ -493,7 +492,7 @@ class App : public wxApp } catch (exception& e) { error_dialog ( 0, - std_to_wx(String::compose(wx_to_std(_("Could not load film %1")), i.string())), + std_to_wx(fmt::format(wx_to_std(_("Could not load film {}")), i.string())), std_to_wx(e.what()) ); } |