3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

Browse Source
This commit is contained in:
bubnikv 2020-04-30 12:04:03 +02:00
commit 18d08cc5cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/format.hpp
View File

@ -29,7 +29,7 @@ inline wxString format_wxstr(const wxString& fmt, TArgs&&... args) {
}
template<typename... TArgs>
inline std::string format(const wxString& fmt, TArgs&&... args) {
return format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
return Slic3r::format(fmt.ToUTF8().data(), std::forward<TArgs>(args)...);
}
} // namespace GUI

4
src/slic3r/Utils/Http.cpp
View File

@ -74,11 +74,11 @@ struct CurlGlobalInit
"PrusaSlicer will be unable to establish secure "
"network connections.");
else
message = Slic3r::format(
message = Slic3r::GUI::format(
_L("PrusaSlicer detected system SSL certificate store in: %1%"),
bundle);
message += "\n" + Slic3r::format(
message += "\n" + Slic3r::GUI::format(
_L("To specify the system certificate store manually, please "
"set the %1% environment variable to the correct CA bundle "
"and restart the application."),