diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-23 21:53:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-26 00:27:08 +0100 |
| commit | 8caf013a9b8d709ed7c3d5e9febee0067e6fcf1f (patch) | |
| tree | 40da87cb357e8b1c54a1464bdbac2d014640e30c /src/lib/config.cc | |
| parent | cec6ff92aef45c687085ecfc1059004407c18c57 (diff) | |
Replace String::compose with fmt::format().
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 1c6e50a28..e4b01b872 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -21,7 +21,6 @@ #include "cinema_list.h" #include "colour_conversion.h" -#include "compose.hpp" #include "config.h" #include "constants.h" #include "cross.h" @@ -41,6 +40,7 @@ #include <libcxml/cxml.h> #include <glib.h> #include <libxml++/libxml++.h> +#include <fmt/format.h> #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> #include <boost/thread.hpp> @@ -273,7 +273,7 @@ Config::backup () auto copy_adding_number = [](path const& path_to_copy) { auto add_number = [](path const& path, int number) { - return String::compose("%1.%2", path, number); + return fmt::format("{}.{}", path.string(), number); }; int n = 1; @@ -435,7 +435,7 @@ try _kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); - _notification_subject = f.optional_string_child("NotificationSubject").get_value_or(variant::insert_dcpomatic(_("%1 notification"))); + _notification_subject = f.optional_string_child("NotificationSubject").get_value_or(variant::insert_dcpomatic(_("{} notification"))); _notification_from = f.optional_string_child("NotificationFrom").get_value_or(""); _notification_to = f.optional_string_child("NotificationTo").get_value_or(""); for (auto i: f.node_children("NotificationCC")) { @@ -1244,14 +1244,14 @@ Config::set_kdm_email_to_default () "Cinema: $CINEMA_NAME\n" "Screen(s): $SCREENS\n\n" "The KDMs are valid from $START_TIME until $END_TIME.\n\n" - "Best regards,\n%1" + "Best regards,\n{}" )); } void Config::set_notification_email_to_default () { - _notification_subject = variant::insert_dcpomatic(_("%1 notification")); + _notification_subject = variant::insert_dcpomatic(_("{} notification")); _notification_email = _( "$JOB_NAME: $JOB_STATUS" |