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/internet.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/internet.cc')
| -rw-r--r-- | src/lib/internet.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 8c5b99e61..92ab4c854 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -19,7 +19,6 @@ */ -#include "compose.hpp" #include "cross.h" #include "exceptions.h" #include "scoped_temporary.h" @@ -121,7 +120,7 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp) f.close(); curl_easy_cleanup (curl); if (cr != CURLE_OK) { - return String::compose (_("Download failed (%1 error %2)"), url, (int) cr); + return fmt::format(_("Download failed ({} error {})"), url, (int) cr); } return {}; @@ -176,7 +175,7 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio zip_error_init (&error); auto zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error); if (!zip) { - return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : ""); + return fmt::format(_("Could not open downloaded ZIP file ({}:{}: {})"), error.zip_err, error.sys_err, error.str ? error.str : ""); } #else |