Localization fixes.

This commit is contained in:
bubnikv 2020-04-29 14:42:43 +02:00
parent b91c3d26e3
commit 8a82e3d5be
2 changed files with 21 additions and 23 deletions

View file

@ -18,10 +18,10 @@
#include <openssl/x509.h>
#endif
#define L(s) s
#include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp"
#include <libslic3r/libslic3r.h>
#include <libslic3r/Utils.hpp>
#include <slic3r/GUI/I18N.hpp>
#include <slic3r/GUI/format.hpp>
namespace fs = boost::filesystem;
@ -70,26 +70,26 @@ struct CurlGlobalInit
}
if (!bundle)
message = L("Could not detect system SSL certificate store. "
"PrusaSlicer will be unable to establish secure "
"network connections.");
message = _u8L("Could not detect system SSL certificate store. "
"PrusaSlicer will be unable to establish secure "
"network connections.");
else
message = string_printf(
L("PrusaSlicer detected system SSL certificate store in: %s"),
message = Slic3r::format(
_L("PrusaSlicer detected system SSL certificate store in: %1%"),
bundle);
message += string_printf(
L("\nTo specify the system certificate store manually, please "
"set the %s environment variable to the correct CA bundle "
"and restart the application."),
message += "\n" + Slic3r::format(
_L("To specify the system certificate store manually, please "
"set the %1% environment variable to the correct CA bundle "
"and restart the application."),
SSL_CA_FILE);
}
#endif // OPENSSL_CERT_OVERRIDE
if (CURLcode ec = ::curl_global_init(CURL_GLOBAL_DEFAULT)) {
message = L("CURL init has failed. PrusaSlicer will be unable to establish "
"network connections. See logs for additional details.");
message += _u8L("CURL init has failed. PrusaSlicer will be unable to establish "
"network connections. See logs for additional details.");
BOOST_LOG_TRIVIAL(error) << ::curl_easy_strerror(ec);
}