diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/lib/config.cc | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 5f3f2f6fe..9b5bd34be 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" @@ -276,7 +275,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; @@ -438,7 +437,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")) { @@ -1241,14 +1240,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" |