From 42c659a57c00a71746275139ef59d4c4aeb24b47 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Jul 2025 21:38:13 +0200 Subject: Replace compose with fmt::format and add copy_to_drive_job.cc to the i18n list. --- src/lib/copy_to_drive_job.cc | 5 ++--- src/lib/wscript | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/copy_to_drive_job.cc b/src/lib/copy_to_drive_job.cc index 504a3ae9e..d937e42b2 100644 --- a/src/lib/copy_to_drive_job.cc +++ b/src/lib/copy_to_drive_job.cc @@ -19,7 +19,6 @@ */ -#include "compose.hpp" #include "copy_to_drive_job.h" #include "dcpomatic_log.h" #include "disk_writer_messages.h" @@ -56,10 +55,10 @@ string CopyToDriveJob::name () const { if (_dcps.size() == 1) { - return String::compose(_("Copying %1\nto %2"), _dcps[0].filename().string(), _drive.description()); + return fmt::format(_("Copying {}\nto {}"), _dcps[0].filename().string(), _drive.description()); } - return String::compose(_("Copying DCPs to %1"), _drive.description()); + return fmt::format(_("Copying DCPs to {}"), _drive.description()); } diff --git a/src/lib/wscript b/src/lib/wscript index ea6994eb1..e5ae1a5e2 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -285,7 +285,7 @@ def build(bld): i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld) def pot(bld): - i18n.pot(os.path.join('src', 'lib'), sources + " util.h", 'libdcpomatic') + i18n.pot(os.path.join('src', 'lib'), sources + " copy_to_drive_job.cc util.h", 'libdcpomatic') def pot_merge(bld): i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic') -- cgit v1.2.3