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

diff --git a/test/ffmpeg_properties_test.cc b/test/ffmpeg_properties_test.cc
index 1e0cdc42f..c0c55542f 100644
--- a/test/ffmpeg_properties_test.cc
+++ b/test/ffmpeg_properties_test.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "lib/compose.hpp"
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/user_property.h"
@@ -37,7 +36,7 @@ colour_range_test(string name, boost::filesystem::path file, string ref)
 {
 	auto content = content_factory(file);
 	BOOST_REQUIRE(!content.empty());
-	auto film = new_test_film(String::compose("ffmpeg_properties_test_%1", name), { content.front() });
+	auto film = new_test_film(fmt::format("ffmpeg_properties_test_{}", name), { content.front() });
 
 	auto properties = content.front()->user_properties(film);
 	auto iter = std::find_if(properties.begin(), properties.end(), [](UserProperty const& property) { return property.key == "Colour range"; });