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/text_content.cc b/src/lib/text_content.cc
index f1691e0e0..726b95f02 100644
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -226,9 +226,9 @@ TextContent::TextContent(Content* parent, cxml::ConstNodePtr node, int version,
 			 */
 			if (version <= 37) {
 				if (!lang->content().empty()) {
-					notes.push_back(String::compose(
-						_("A subtitle or closed caption file in this project is marked with the language '%1', "
-						  "which %2 does not recognise.  The file's language has been cleared."), lang->content(), variant::dcpomatic()));
+					notes.push_back(fmt::format(
+						_("A subtitle or closed caption file in this project is marked with the language '{}', "
+						  "which {} does not recognise.  The file's language has been cleared."), lang->content(), variant::dcpomatic()));
 				}
 			} else {
 				throw;