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

diff --git a/src/lib/grok_j2k_encoder_thread.cc b/src/lib/grok_j2k_encoder_thread.cc
index d6825113c..17f1ae89b 100644
--- a/src/lib/grok_j2k_encoder_thread.cc
+++ b/src/lib/grok_j2k_encoder_thread.cc
@@ -51,16 +51,16 @@ try
 {
 	while (true)
 	{
-		LOG_TIMING("encoder-sleep thread=%1", thread_id());
+		LOG_TIMING("encoder-sleep thread={}", thread_id());
 		auto frame = _encoder.pop();
 
 		dcp::ScopeGuard frame_guard([this, &frame]() {
-			LOG_ERROR("Failed to schedule encode of %1 using grok", frame.index());
+			LOG_ERROR("Failed to schedule encode of {} using grok", frame.index());
 			_errors++;
 			_encoder.retry(frame);
 		});
 
-		LOG_TIMING("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), frame.index(), static_cast<int>(frame.eyes()));
+		LOG_TIMING("encoder-pop thread={} frame={} eyes={}", thread_id(), frame.index(), static_cast<int>(frame.eyes()));
 
 		auto grok = Config::instance()->grok();