Merge branch 'compose-to-fmt-take2'

This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index e5d8b0a90..23ecdc9df 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -253,7 +253,7 @@ public:
 #else
 		string const colour = gui_is_dark() ? "white" : "black";
 		wxBitmap bitmap (
-			bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
+			bitmap_path(fmt::format("dcpomatic_small_{}.png", colour)),
 			wxBITMAP_TYPE_PNG
 			);
 		wxIcon icon;