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

diff --git a/src/lib/remote_j2k_encoder_thread.cc b/src/lib/remote_j2k_encoder_thread.cc
index 2abaf94ba..313c7e34d 100644
--- a/src/lib/remote_j2k_encoder_thread.cc
+++ b/src/lib/remote_j2k_encoder_thread.cc
@@ -44,7 +44,7 @@ void
 RemoteJ2KEncoderThread::log_thread_start() const
 {
 	start_of_thread("RemoteJ2KEncoder");
-	LOG_TIMING("start-encoder-thread thread=%1 server=%2", thread_id(), _server.host_name());
+	LOG_TIMING("start-encoder-thread thread={} server={}", thread_id(), _server.host_name());
 }
 
 
@@ -56,17 +56,17 @@ RemoteJ2KEncoderThread::encode(DCPVideo const& frame)
 	try {
 		encoded = make_shared<dcp::ArrayData>(frame.encode_remotely(_server));
 		if (_remote_backoff > 0) {
-			LOG_GENERAL("%1 was lost, but now she is found; removing backoff", _server.host_name());
+			LOG_GENERAL("{} was lost, but now she is found; removing backoff", _server.host_name());
 			_remote_backoff = 0;
 		}
 	} catch (std::exception& e) {
 		LOG_ERROR(
-			N_("Remote encode of %1 on %2 failed (%3)"),
+			N_("Remote encode of {} on {} failed ({})"),
 			frame.index(), _server.host_name(), e.what(), _remote_backoff
 		);
 	} catch (...) {
 		LOG_ERROR(
-			N_("Remote encode of %1 on %2 failed"),
+			N_("Remote encode of {} on {} failed"),
 			frame.index(), _server.host_name(), _remote_backoff
 		);
 	}