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, 3 insertions, 4 deletions

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index c3741df03..215325248 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -20,7 +20,6 @@
 
 
 #include "cross.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
 #include <dcp/warnings.h>
@@ -104,7 +103,7 @@ Drive::description() const
 		name = _("Unknown");
 	}
 
-	return String::compose(_("%1 (%2 GB) [%3]"), name, gb, _device);
+	return fmt::format(_("{} ({} GB) [{}]"), name, gb, _device);
 }
 
 
@@ -130,8 +129,8 @@ Drive::log_summary() const
 	}
 #endif
 
-	return String::compose(
-		"Device %1 mounted on %2 size %3 vendor %4 model %5",
+	return fmt::format(
+		"Device {} mounted on {} size {} vendor {} model {}",
 		_device, mp, _size, _vendor.get_value_or("[none]"), _model.get_value_or("[none]")
 			);
 }