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/uploader.cc b/src/lib/uploader.cc
index f2a47f50e..1e879804a 100644
--- a/src/lib/uploader.cc
+++ b/src/lib/uploader.cc
@@ -21,14 +21,14 @@
 
 #include "uploader.h"
 #include "dcpomatic_assert.h"
-#include "compose.hpp"
+#include <memory>
 
 #include "i18n.h"
 
 
-using std::string;
-using std::shared_ptr;
 using std::function;
+using std::shared_ptr;
+using std::string;
 
 
 Uploader::Uploader (function<void (string)> set_status, function<void (float)> set_progress)
@@ -76,7 +76,7 @@ Uploader::upload_directory (boost::filesystem::path base, boost::filesystem::pat
 		if (is_directory(i.path())) {
 			upload_directory (base, i.path(), transferred, total_size);
 		} else {
-			_set_status(String::compose(_("copying %1"), i.path().filename()));
+			_set_status(fmt::format(_("copying {}"), i.path().filename().string()));
 			upload_file (i.path(), remove_prefix (base, i.path()), transferred, total_size);
 		}
 	}