viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

i18n(fr): fix untranslated UI strings, extract hardcoded ones, complete French catalog (#14164)

Browse Source
This commit is contained in:
foXaCe
2026-06-11 22:10:31 +02:00
committed by GitHub
parent 15f330641c
commit d641ca598a
23 changed files with 1028 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
localization/i18n/OrcaSlicer.pot
View File

@@ -20064,3 +20064,246 @@ msgstr ""
#: resources/data/hints.ini: [hint:Avoid warping]
msgid "Avoid warping\nDid you know that when printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping?"
msgstr ""
msgid "Entering Paint-on supports"
msgstr ""
msgid "Leaving Paint-on supports"
msgstr ""
msgid "Paint-on supports editing"
msgstr ""
msgid "Entering Brim Ears"
msgstr ""
msgid "Leaving Brim Ears"
msgstr ""
msgid "Entering color painting"
msgstr ""
msgid "Leaving color painting"
msgstr ""
msgid "Color painting editing"
msgstr ""
msgid "Entering Paint-on fuzzy skin"
msgstr ""
msgid "Leaving Paint-on fuzzy skin"
msgstr ""
msgid "Paint-on fuzzy skin editing"
msgstr ""
msgid "Entering Cut gizmo"
msgstr ""
msgid "Leaving Cut gizmo"
msgstr ""
msgid "Cut gizmo editing"
msgstr ""
msgid "Entering Measure gizmo"
msgstr ""
msgid "Leaving Measure gizmo"
msgstr ""
msgid "Entering Assembly gizmo"
msgstr ""
msgid "Leaving Assembly gizmo"
msgstr ""
msgid "Simple settings"
msgstr ""
msgid "Expert settings"
msgstr ""
msgid "Type to filter..."
msgstr ""
msgid "No selected items..."
msgstr ""
msgid "All items selected..."
msgstr ""
msgid "No matching items..."
msgstr ""
msgid "Select visible"
msgstr ""
msgid "Deselect visible"
msgstr ""
msgid "Filter selected"
msgstr ""
msgid "Filter nonSelected"
msgstr ""
msgid "An unexpected error occurred"
msgstr ""
msgid "The download has failed"
msgstr ""
msgid "Can't create file at %1%"
msgstr ""
msgid "Archive preview"
msgstr ""
msgid "Open File"
msgstr ""
msgid "Desktop Integration"
msgstr ""
msgid "Performing desktop integration failed - Could not find executable."
msgstr ""
msgid "Beta"
msgstr ""
msgid "Sending failed, please try again!"
msgstr ""
msgid "Failed to create the temporary folder."
msgstr ""
msgid "PresetBundle"
msgstr ""
msgid "ExportPresetBundle"
msgstr ""
msgid "Save preset bundle"
msgstr ""
msgid "Bundle folder does not exist."
msgstr ""
msgid "Failed to open folder."
msgstr ""
msgid "Delete selected bundle from folder and all presets loaded from it?"
msgstr ""
msgid "Delete Bundle"
msgstr ""
msgid "Failed to remove bundle."
msgstr ""
msgid "Remove Bundle"
msgstr ""
msgid "Unsubscribe bundle?"
msgstr ""
msgid "UnsubscribeBundle"
msgstr ""
msgid "Failed to unsubscribe bundle."
msgstr ""
msgid "Unsubscribe Bundle"
msgstr ""
msgid "The Hostname/IP/URL could not be parsed, please check it and try again."
msgstr ""
msgid "Could not parse server response."
msgstr ""
msgid "Connected to CrealityPrint successfully!"
msgstr ""
msgid "Could not connect to CrealityPrint"
msgstr ""
msgid "Connection to ElegooLink is working correctly."
msgstr ""
msgid "Could not connect to ElegooLink"
msgstr ""
msgid "ElegooLink not detected"
msgstr ""
msgid "Invalid access code"
msgstr ""
msgid "CC2 device not detected"
msgstr ""
msgid "CC2 upload failed"
msgstr ""
msgid "Upload failed"
msgstr ""
msgid "Printer returned an error"
msgstr ""
msgid "Missing system_info in response"
msgstr ""
msgid "Missing printer serial number in response"
msgstr ""
msgid "Error parsing response"
msgstr ""
msgid "Error code: %1%"
msgstr ""
msgid "Error code not found"
msgstr ""
msgid "Failed to open file for upload."
msgstr ""
msgid "Failed to read file chunk for upload."
msgstr ""
msgid "The file is empty or could not be read."
msgstr ""
msgid "Failed to calculate file checksum."
msgstr ""
msgid "The file is lost, please check and try again."
msgstr ""
msgid "The file is corrupted, please check and try again."
msgstr ""
msgid "Transmission abnormality, please check and try again."
msgstr ""
msgid "The file does not match the printer, please check and try again."
msgstr ""
msgid "Start print timeout"
msgstr ""
msgid "Start print failed"
msgstr ""
msgid "Error. Can't get api token for authorization"
msgstr ""
msgid "Error saving session to file"
msgstr ""
msgid "Error during file upload"
msgstr ""

882
localization/i18n/fr/OrcaSlicer_fr.po
View File

File diff suppressed because it is too large Load Diff

21
localization/i18n/list.txt
View File

@@ -48,9 +48,12 @@ src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -58,6 +61,7 @@ src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
src/slic3r/GUI/Gizmos/GLGizmoFaceDetector.cpp
src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -67,7 +71,9 @@ src/slic3r/GUI/Gizmos/GLGizmoText.hpp
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
src/slic3r/GUI/GUI.cpp
src/slic3r/GUI/GUI_App.cpp
src/slic3r/GUI/GUI_AuxiliaryList.cpp
@@ -89,6 +95,8 @@ src/slic3r/GUI/Widgets/AMSControl.cpp
src/slic3r/GUI/Widgets/FanControl.cpp
src/slic3r/GUI/Widgets/FilamentLoad.cpp
src/slic3r/GUI/Widgets/TempInput.cpp
src/slic3r/GUI/Widgets/CheckList.cpp
src/slic3r/GUI/Widgets/SwitchButton.cpp
src/slic3r/GUI/ImGuiWrapper.cpp
src/slic3r/GUI/Jobs/ArrangeJob.cpp
src/slic3r/GUI/Jobs/OrientJob.cpp
@@ -98,6 +106,7 @@ src/slic3r/GUI/Jobs/BindJob.cpp
src/slic3r/GUI/Jobs/PrintJob.cpp
src/slic3r/GUI/Jobs/SendJob.cpp
src/slic3r/GUI/Jobs/EmbossJob.cpp
src/slic3r/GUI/Jobs/PlaterWorker.hpp
src/slic3r/GUI/ThermalPreconditioningDialog.cpp
src/slic3r/GUI/ThermalPreconditioningDialog.hpp
src/slic3r/GUI/Jobs/SLAImportJob.cpp
@@ -237,8 +246,12 @@ src/slic3r/GUI/FilamentMapPanel.cpp
src/slic3r/Utils/Obico.cpp
src/slic3r/Utils/SimplyPrint.cpp
src/slic3r/Utils/Flashforge.cpp
src/slic3r/Utils/ElegooLink.cpp
src/slic3r/Utils/CrealityPrint.cpp
src/slic3r/Utils/PrintHost.cpp
src/slic3r/GUI/Jobs/OAuthJob.cpp
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
src/slic3r/GUI/PartSkipDialog.cpp
src/slic3r/GUI/PartSkipDialog.hpp
src/slic3r/GUI/SkipPartCanvas.cpp
@@ -250,4 +263,12 @@ src/slic3r/GUI/NetworkPluginDialog.cpp
src/slic3r/GUI/RammingChart.cpp
src/slic3r/GUI/StepMeshDialog.cpp
src/slic3r/GUI/FilamentPickerDialog.hpp
src/slic3r/GUI/PresetBundleDialog.cpp
src/slic3r/GUI/ExportPresetBundleDialog.cpp
src/slic3r/GUI/DesktopIntegrationDialog.cpp
src/slic3r/GUI/Downloader.cpp
src/slic3r/GUI/DownloaderFileGet.cpp
src/slic3r/GUI/FileArchiveDialog.cpp
src/slic3r/GUI/PrinterCloudAuthDialog.cpp
src/slic3r/GUI/PrinterWebViewHandler.cpp
src/libslic3r/PresetBundle.cpp

5
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
View File

@@ -3,6 +3,7 @@
#include "GLGizmoBase.hpp"
#include "slic3r/GUI/GLSelectionRectangle.hpp"
#include "slic3r/GUI/I18N.hpp"
#include "libslic3r/BrimEarsPoint.hpp"
#include "libslic3r/ObjectID.hpp"
@@ -87,8 +88,8 @@ public:
bool is_selection_rectangle_dragging() const { return m_selection_rectangle.is_dragging(); }
bool wants_enter_leave_snapshots() const override { return true; }
std::string get_gizmo_entering_text() const override { return "Entering Brim Ears"; }
std::string get_gizmo_leaving_text() const override { return "Leaving Brim Ears"; }
std::string get_gizmo_entering_text() const override { return _u8L("Entering Brim Ears"); }
std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Brim Ears"); }
private:
bool on_init() override;

7
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
View File

@@ -6,6 +6,7 @@
#include "libslic3r/Print.hpp"
#include "libslic3r/ObjectID.hpp"
#include "slic3r/GUI/3DScene.hpp"
#include "slic3r/GUI/I18N.hpp"
#include <boost/thread.hpp>
@@ -36,9 +37,9 @@ protected:
void render_tooltip_button(float x, float y);
wxString handle_snapshot_action_name(bool shift_down, Button button_down) const override;
std::string get_gizmo_entering_text() const override { return "Entering Paint-on supports"; }
std::string get_gizmo_leaving_text() const override { return "Leaving Paint-on supports"; }
std::string get_action_snapshot_name() const override { return "Paint-on supports editing"; }
std::string get_gizmo_entering_text() const override { return _u8L("Entering Paint-on supports"); }
std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Paint-on supports"); }
std::string get_action_snapshot_name() const override { return _u8L("Paint-on supports editing"); }
// BBS
wchar_t m_current_tool = 0;

7
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
View File

@@ -2,6 +2,7 @@
#define slic3r_GLGizmoMmuSegmentation_hpp_
#include "GLGizmoPainterBase.hpp"
#include "slic3r/GUI/I18N.hpp"
namespace Slic3r::GUI {
@@ -100,9 +101,9 @@ protected:
wxString handle_snapshot_action_name(bool shift_down, Button button_down) const override;
std::string get_gizmo_entering_text() const override { return "Entering color painting"; }
std::string get_gizmo_leaving_text() const override { return "Leaving color painting"; }
std::string get_action_snapshot_name() const override { return "Color painting editing"; }
std::string get_gizmo_entering_text() const override { return _u8L("Entering color painting"); }
std::string get_gizmo_leaving_text() const override { return _u8L("Leaving color painting"); }
std::string get_action_snapshot_name() const override { return _u8L("Color painting editing"); }
// BBS
size_t m_selected_extruder_idx = 0;

2
src/slic3r/GUI/PartSkipDialog.cpp
View File

@@ -367,7 +367,7 @@ std::string PartSkipDialog::create_tmp_path()
}
std::string tmp_path = (parent_path / buf.str()).string();
if (!std::filesystem::exists(tmp_path + "Metadata/") && !fs::create_directories(tmp_path + "Metadata/")) { wxMessageBox("create file failed."); }
if (!std::filesystem::exists(tmp_path + "Metadata/") && !fs::create_directories(tmp_path + "Metadata/")) { wxMessageBox(_L("Failed to create the temporary folder.")); }
return tmp_path;
}

4
src/slic3r/GUI/Plater.cpp
View File

@@ -6225,12 +6225,12 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " " << boost::format("%1%: %2%")%it->first %it->second;
//
NotificationManager *notify_manager = q->get_notification_manager();
std::string error_message = L("Invalid values found in the 3MF:");
std::string error_message = _u8L("Invalid values found in the 3MF:");
error_message += "\n";
for (std::map<std::string, std::string>::iterator it=validity.begin(); it!=validity.end(); ++it)
error_message += "-" + it->first + ": " + it->second + "\n";
error_message += "\n";
error_message += L("Please correct them in the param tabs");
error_message += _u8L("Please correct them in the param tabs");
notify_manager->bbl_show_3mf_warn_notification(error_message);
}
}

2
src/slic3r/GUI/PrintHostDialogs.cpp
View File

@@ -562,7 +562,7 @@ void PrintHostSendDialog::init()
// });
// }
add_button(wxID_CANCEL,false, L("Cancel"));
add_button(wxID_CANCEL,false, _L("Cancel"));
finalize();
#ifdef __linux__

2
src/slic3r/GUI/PrinterCloudAuthDialog.cpp
View File

@@ -23,7 +23,7 @@
namespace Slic3r { namespace GUI {
PrinterCloudAuthDialog::PrinterCloudAuthDialog(wxWindow* parent, PrintHost* host)
: wxDialog((wxWindow*) (wxGetApp().mainframe), wxID_ANY, "Login")
: wxDialog((wxWindow*) (wxGetApp().mainframe), wxID_ANY, _L("Login"))
{
SetBackgroundColour(*wxWHITE);
// Url

2
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -607,7 +607,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
auto completedimg = new wxStaticBitmap(m_panel_finish, wxID_ANY, create_scaled_bitmap("completed", m_panel_finish, 25), wxDefaultPosition, wxSize(imgsize, imgsize), 0);
m_sizer_finish_h->Add(completedimg, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, _L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
m_statictext_finish->Wrap(-1);
m_statictext_finish->SetForegroundColour(wxColour(0, 150, 136));
m_sizer_finish_h->Add(m_statictext_finish, 0, wxALIGN_CENTER | wxALL, FromDIP(5));

8
src/slic3r/GUI/SendToPrinter.cpp
View File

@@ -61,10 +61,10 @@ static const std::map<int, std::string> error_messages = {
{SendToPrinterDialog::SEND_ERR, L("File upload failed, please try again.")}
};
static std::string ParseErrorCode(int errorcde)
static wxString ParseErrorCode(int errorcde)
{
auto it = error_messages.find(errorcde);
if (it != error_messages.end()) { return it->second; }
if (it != error_messages.end()) { return _L(it->second); }
return "";
}
@@ -367,7 +367,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
auto completedimg = new wxStaticBitmap(m_panel_finish, wxID_ANY, create_scaled_bitmap("completed", m_panel_finish, 25), wxDefaultPosition, wxSize(imgsize, imgsize), 0);
m_sizer_finish_h->Add(completedimg, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, _L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
m_statictext_finish->Wrap(-1);
m_statictext_finish->SetForegroundColour(wxColour(0, 150, 136));
m_sizer_finish_h->Add(m_statictext_finish, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
@@ -1982,7 +1982,7 @@ void SendToPrinterDialog::UploadFileRessultCallback(int res, int resp_ec, std::s
if (ParseErrorCode(resp_ec) != "")
update_print_status_msg(ParseErrorCode(resp_ec), false, true);
else
update_print_status_msg("Sending failed, please try again!", false, true);
update_print_status_msg(_L("Sending failed, please try again!"), false, true);
m_filetransfer_uploadfile_job.reset();
m_filetransfer_uploadfile_job = nullptr;
}

4
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -685,7 +685,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
#endif
m_staticText_progress_left = new wxStaticText(penel_text, wxID_ANY, L("N/A"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_left = new wxStaticText(penel_text, wxID_ANY, _L("N/A"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_left->Wrap(-1);
m_staticText_progress_left->SetFont(wxFont(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("HarmonyOS Sans SC")));
m_staticText_progress_left->SetForegroundColour(wxColour(146, 146, 146));
@@ -787,7 +787,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
m_printing_stage_panel->SetSizer(printingstage_vertical_sizer);
// Orca: display the end time of the print
m_staticText_progress_end = new wxStaticText(penel_finish_time, wxID_ANY, L("N/A"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_end = new wxStaticText(penel_finish_time, wxID_ANY, _L("N/A"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_end->Wrap(-1);
m_staticText_progress_end->SetFont(
wxFont(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("HarmonyOS Sans SC")));

4
src/slic3r/GUI/UpgradePanel.cpp
View File

@@ -109,7 +109,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
m_staticText_ver_val->Wrap(-1);
m_staticText_beta_version = new wxStaticText(this, wxID_ANY, "Beta", wxDefaultPosition, wxDefaultSize, 0);
m_staticText_beta_version = new wxStaticText(this, wxID_ANY, _L("Beta"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_beta_version->SetForegroundColour("#778899");
m_staticText_beta_version->Wrap(-1);
m_staticText_beta_version->Hide();
@@ -1571,7 +1571,7 @@ bool UpgradePanel::Show(bool show)
m_staticText_ams_ver_val->SetForegroundColour("#262E30");
m_staticText_ams_ver_val->Wrap(-1);
m_staticText_beta_version = new wxStaticText(this, wxID_ANY, "Beta", wxDefaultPosition, wxDefaultSize, 0);
m_staticText_beta_version = new wxStaticText(this, wxID_ANY, _L("Beta"), wxDefaultPosition, wxDefaultSize, 0);
m_staticText_beta_version->SetForegroundColour("#778899");
m_staticText_beta_version->Wrap(-1);
m_staticText_beta_version->Hide();

16
src/slic3r/Utils/3DPrinterOS.cpp
View File

@@ -323,7 +323,7 @@ bool C3DPrinterOS::login(wxString& msg) const
msg.clear();
std::string token = get_api_auth_token(msg);
if (token.empty()) {
msg = "Error. Can't get api token for authorization";
msg = _L("Error. Can't get api token for authorization");
return false;
}
@@ -341,12 +341,12 @@ bool C3DPrinterOS::login(wxString& msg) const
return false;
}
} catch (const std::exception&) {
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
return false;
}
bool res = save_api_session(session, email);
if (!res) {
msg = "Error saving session to file";
msg = _L("Error saving session to file");
}
return res;
}
@@ -395,7 +395,7 @@ bool C3DPrinterOS::upload(
}
}
} catch (const std::exception &) {
error_fn("Could not parse server response");
error_fn(_L("Could not parse server response."));
return false;
}
@@ -404,7 +404,7 @@ bool C3DPrinterOS::upload(
UploadOptionsDialog dlg(GUI::wxGetApp().GetTopWindow(), cloud_projects_list, cloud_printer_types_list, m_preset_name);
if (dlg.ShowModal() != wxID_OK) {
error_fn("Canceled");
error_fn(_L("Canceled"));
return false;
}
@@ -483,7 +483,7 @@ bool C3DPrinterOS::upload(
}
} catch (const std::exception &) {
res = false;
error_fn("Error during file upload");
error_fn(_L("Error during file upload"));
}
// set printer type for uploaded gcode
if (res) {
@@ -542,7 +542,7 @@ std::string C3DPrinterOS::get_api_auth_token(wxString &err) const
err = wxString(resp.get<std::string>("message").c_str());
}
} catch (const std::exception &) {
err = "Could not parse server response";
err = _L("Could not parse server response.");
}
return result;
}
@@ -566,7 +566,7 @@ bool C3DPrinterOS::check_session(wxString &msg) const {
}
} catch (const std::exception &) {
msg = wxString("Could not parse server response");
msg = _L("Could not parse server response.");
return false;
}
return false;

2
src/slic3r/Utils/AstroBox.cpp
View File

@@ -71,7 +71,7 @@ bool AstroBox::test(wxString &msg) const
}
catch (const std::exception &) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})
.perform_sync();

8
src/slic3r/Utils/Duet.cpp
View File

@@ -85,7 +85,7 @@ bool Duet::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn e
int err_code = dsf ? (status == 201 ? 0 : 1) : get_err_code_from_body(body);
if (err_code != 0) {
BOOST_LOG_TRIVIAL(error) << boost::format("Duet: Request completed but error code was received: %1%") % err_code;
error_fn(format_error(body, L("Unknown error occurred"), 0));
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
res = false;
} else if (upload_data.post_action == PrintHostPostUploadAction::StartPrint) {
wxString errormsg;
@@ -148,13 +148,13 @@ Duet::ConnectionType Duet::connect(wxString &msg) const
res = ConnectionType::rrf;
break;
case 1:
msg = format_error(body, L("Wrong password"), 0);
msg = format_error(body, _u8L("Wrong password"), 0);
break;
case 2:
msg = format_error(body, L("Could not get resources to create a new connection"), 0);
msg = format_error(body, _u8L("Could not get resources to create a new connection"), 0);
break;
default:
msg = format_error(body, L("Unknown error occurred"), 0);
msg = format_error(body, _u8L("Unknown error occurred"), 0);
break;
}

38
src/slic3r/Utils/ElegooLink.cpp
View File

@@ -141,9 +141,9 @@ namespace Slic3r {
const int error_code = root.get<int>("error_code", -1);
if (error_code != 0) {
error_message = root.get<std::string>("message", "Printer returned an error");
error_message = root.get<std::string>("message", _u8L("Printer returned an error"));
if (error_message.empty())
error_message = "Printer returned an error";
error_message = _u8L("Printer returned an error");
error_message += " (" + std::to_string(error_code) + ")";
return false;
}
@@ -151,13 +151,13 @@ namespace Slic3r {
if (serial_number != nullptr) {
const auto system_info = root.get_child_optional("system_info");
if (!system_info) {
error_message = "Missing system_info in response";
error_message = _u8L("Missing system_info in response");
return false;
}
const auto sn = system_info->get_optional<std::string>("sn");
if (!sn || sn->empty()) {
error_message = "Missing printer serial number in response";
error_message = _u8L("Missing printer serial number in response");
return false;
}
*serial_number = *sn;
@@ -165,7 +165,7 @@ namespace Slic3r {
return true;
} catch (const std::exception&) {
error_message = "Error parsing response";
error_message = _u8L("Error parsing response");
return false;
}
}
@@ -431,7 +431,7 @@ namespace Slic3r {
if (std::regex_search(body, match, re)) {
res = true;
} else {
msg = format_error(body, "ElegooLink not detected", 0);
msg = format_error(body, _u8L("ElegooLink not detected"), 0);
res = false;
}
})
@@ -472,9 +472,9 @@ namespace Slic3r {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error getting CC2 device info: %2%, HTTP %3%, body: `%4%`") % name % error % status % body;
res = false;
if (status == 401 || status == 403)
msg = format_error(body, "Invalid access code", status);
msg = format_error(body, _u8L("Invalid access code"), status);
else
msg = format_error(body, error.empty() ? "CC2 device not detected" : error, status);
msg = format_error(body, error.empty() ? _u8L("CC2 device not detected") : error, status);
})
.on_complete([&](std::string body, unsigned status) {
BOOST_LOG_TRIVIAL(debug) << boost::format("%1%: Got CC2 device info: %2%") % name % body;
@@ -482,7 +482,7 @@ namespace Slic3r {
std::string serial_number;
if (!parse_cc2_response(body, error_message, &serial_number)) {
res = false;
msg = format_error(body, error_message.empty() ? "CC2 device not detected" : error_message, status);
msg = format_error(body, error_message.empty() ? _u8L("CC2 device not detected") : error_message, status);
return;
}
persist_sn(Http::get_host_header_value(m_host), token, serial_number);
@@ -531,7 +531,7 @@ namespace Slic3r {
if (std::regex_search(body, match, re)) {
res = true;
} else {
msg = format_error(body, "ElegooLink not detected", 0);
msg = format_error(body, _u8L("ElegooLink not detected"), 0);
res = false;
}
})
@@ -570,16 +570,16 @@ namespace Slic3r {
error % status % body;
res = false;
if (status == 401 || status == 403)
msg = format_error(body, "Invalid access code", status);
msg = format_error(body, _u8L("Invalid access code"), status);
else
msg = format_error(body, error.empty() ? "CC2 device not detected" : error, status);
msg = format_error(body, error.empty() ? _u8L("CC2 device not detected") : error, status);
})
.on_complete([&](std::string body, unsigned status) {
std::string error_message;
std::string serial_number;
if (!parse_cc2_response(body, error_message, &serial_number)) {
res = false;
msg = format_error(body, error_message.empty() ? "CC2 device not detected" : error_message, status);
msg = format_error(body, error_message.empty() ? _u8L("CC2 device not detected") : error_message, status);
return;
}
res = true;
@@ -735,7 +735,7 @@ namespace Slic3r {
} else {
// get error messages
pt::ptree messages = root.get_child("messages");
std::string error_message = "ErrorCode : " + code + "\n";
std::string error_message = (boost::format(_u8L("Error code: %1%")) % code).str() + "\n";
for (pt::ptree::value_type& message : messages) {
std::string field = message.second.get<std::string>("field");
std::string msg = message.second.get<std::string>("message");
@@ -745,10 +745,10 @@ namespace Slic3r {
}
} catch (...) {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error parsing response: %2%") % name % body;
error_fn(wxString::FromUTF8("Error parsing response"));
error_fn(_L("Error parsing response"));
}
} else {
error_fn(format_error(body, "upload failed", status));
error_fn(format_error(body, _u8L("Upload failed"), status));
}
})
.on_error([&](std::string body, std::string error, unsigned status) {
@@ -921,7 +921,7 @@ namespace Slic3r {
BOOST_LOG_TRIVIAL(debug) << boost::format("%1%: CC2 chunk uploaded: HTTP %2%: %3%") % name % status % body;
std::string error_message;
if (!parse_cc2_response(body, error_message)) {
error_fn(format_error(body, error_message.empty() ? "CC2 upload failed" : error_message, status));
error_fn(format_error(body, error_message.empty() ? _u8L("CC2 upload failed") : error_message, status));
return;
}
result = true;
@@ -929,9 +929,9 @@ namespace Slic3r {
.on_error([&](std::string body, std::string error, unsigned status) {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error uploading CC2 chunk: %2%, HTTP %3%, body: `%4%`") % name % error % status % body;
if (status == 401 || status == 403)
error_fn(format_error(body, "Invalid access code", status));
error_fn(format_error(body, _u8L("Invalid access code"), status));
else
error_fn(format_error(body, error.empty() ? "CC2 upload failed" : error, status));
error_fn(format_error(body, error.empty() ? _u8L("CC2 upload failed") : error, status));
})
.on_progress([&](Http::Progress progress, bool& cancel) {
if (progress.ultotal == progress.ulnow)

16
src/slic3r/Utils/FixModelByCgal.cpp
View File

@@ -85,7 +85,7 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
size_t ivolume = 0;
// Orca: Lambda for updating progress from worker thread.
auto on_progress = [&mtx, &condition, &ivolume, &model_object, &progress](const char *msg, unsigned prcnt) {
auto on_progress = [&mtx, &condition, &ivolume, &model_object, &progress](const std::string &msg, unsigned prcnt) {
std::unique_lock<std::mutex> lock(mtx);
progress.message = msg;
const size_t total = std::max<size_t>(1, model_object.volumes.size());
@@ -108,7 +108,7 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
if (canceled)
throw RepairCanceledException();
on_progress(L("Repairing model object"), 10);
on_progress(_u8L("Repairing model object"), 10);
ModelVolume *volume = model_object.volumes[ivolume];
@@ -118,7 +118,7 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
parts_count = volume->split(1, keep_painting);
if (parts_count > 1) {
const std::string msg = Slic3r::format(L("Split into %1% parts"), parts_count);
on_progress(msg.c_str(), 10);
on_progress(msg, 10);
}
}
@@ -145,7 +145,7 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
if (removed_parts >= parts_count) {
ivolume = part_end;
on_progress(L("Repair finished"), 100);
on_progress(_u8L("Repair finished"), 100);
continue;
}
@@ -161,7 +161,7 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
std::string error;
if (!MeshBoolean::cgal::repair(mesh, nullptr, &error))
throw Slic3r::RuntimeError(error.empty() ? L("Repair failed") : error.c_str());
throw Slic3r::RuntimeError(error.empty() ? _u8L("Repair failed") : error);
part_volume->set_mesh(std::move(mesh));
part_volume->calculate_convex_hull();
@@ -175,20 +175,20 @@ bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::Pro
ivolume = part_end;
on_progress(L("Repair finished"), 100);
on_progress(_u8L("Repair finished"), 100);
}
model_object.invalidate_bounding_box();
if (ivolume > 0)
--ivolume;
on_progress(L("Repair finished"), 100);
on_progress(_u8L("Repair finished"), 100);
success = true;
finished = true;
} catch (RepairCanceledException &) {
canceled = true;
finished = true;
on_progress(L("Repair canceled"), 100);
on_progress(_u8L("Repair canceled"), 100);
} catch (std::exception &ex) {
success = false;
finished = true;

6
src/slic3r/Utils/FlashAir.cpp
View File

@@ -119,7 +119,7 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
res = boost::icontains(body, "SUCCESS");
if (! res) {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Request completed but no SUCCESS message was received.") % name;
error_fn(format_error(body, L("Unknown error occurred"), 0));
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
}
})
.perform_sync();
@@ -140,7 +140,7 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
res = boost::icontains(body, "SUCCESS");
if (! res) {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Request completed but no SUCCESS message was received.") % name;
error_fn(format_error(body, L("Unknown error occurred"), 0));
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
}
})
.perform_sync();
@@ -156,7 +156,7 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
res = boost::icontains(body, "SUCCESS");
if (! res) {
BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Request completed but no SUCCESS message was received.") % name;
error_fn(format_error(body, L("Unknown error occurred"), 0));
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
}
})
.on_error([&](std::string body, std::string error, unsigned status) {

2
src/slic3r/Utils/MKS.cpp
View File

@@ -84,7 +84,7 @@ bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn er
int err_code = get_err_code_from_body(body);
if (err_code != 0) {
BOOST_LOG_TRIVIAL(error) << boost::format("MKS: Request completed but error code was received: %1%") % err_code;
error_fn(format_error(body, L("Unknown error occurred"), 0));
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
res = false;
}
else if (upload_data.post_action == PrintHostPostUploadAction::StartPrint) {

10
src/slic3r/Utils/OctoPrint.cpp
View File

@@ -183,7 +183,7 @@ bool OctoPrint::test_with_resolved_ip(wxString &msg) const
}
catch (const std::exception&) {
res = false;
msg = "Could not parse server response.";
msg = _L("Could not parse server response.");
}
})
.ssl_revoke_best_effort(m_ssl_revoke_best_effort)
@@ -232,7 +232,7 @@ bool OctoPrint::test(wxString& msg) const
}
catch (const std::exception &) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})
#ifdef WIN32
@@ -635,7 +635,7 @@ bool PrusaLink::test(wxString& msg) const
}
catch (const std::exception&) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})
#ifdef WIN32
@@ -811,7 +811,7 @@ bool PrusaLink::test_with_method_check(wxString& msg, bool& use_put) const
}
catch (const std::exception&) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})
#ifdef WIN32
@@ -891,7 +891,7 @@ bool PrusaLink::test_with_resolved_ip_and_method_check(wxString& msg, bool& use_
}
catch (const std::exception&) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})

2
src/slic3r/Utils/Repetier.cpp
View File

@@ -90,7 +90,7 @@ bool Repetier::test(wxString &msg) const
}
catch (const std::exception &) {
res = false;
msg = "Could not parse server response";
msg = _L("Could not parse server response.");
}
})
.perform_sync();