3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: some info is not translated

Browse source 
Change-Id: I6065a478138426c0695e66d15ce8d4bb18a1aa97
This commit is contained in:
zhimin.zeng 2023-09-18 17:45:21 +08:00 • committed by Lane.Wei
parent cb45ffc73a
commit 52a52ffc08
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -169,14 +169,14 @@ void CalibrationWizard::set_cali_method(CalibrationMethod method)
bool CalibrationWizard::save_preset(const std::string &old_preset_name, const std::string &new_preset_name, const std::map<std::string, ConfigOption *> &key_values, std::string& message) bool CalibrationWizard::save_preset(const std::string &old_preset_name, const std::string &new_preset_name, const std::map<std::string, ConfigOption *> &key_values, std::string& message)
{ {
if (new_preset_name.empty()) { if (new_preset_name.empty()) {
message = L("The name cannot be empty."); message = _u8L("The name cannot be empty.");
return false; return false;
} }
PresetCollection *filament_presets = &wxGetApp().preset_bundle->filaments; PresetCollection *filament_presets = &wxGetApp().preset_bundle->filaments;
Preset* preset = filament_presets->find_preset(old_preset_name); Preset* preset = filament_presets->find_preset(old_preset_name);
if (!preset) { if (!preset) {
message = (boost::format(L("The selected preset: %1% is not found.")) % old_preset_name).str(); message = (boost::format(_u8L("The selected preset: %1% is not found.")) % old_preset_name).str();
return false; return false;
} }
@ -188,12 +188,12 @@ bool CalibrationWizard::save_preset(const std::string &old_preset_name, const st
Preset *new_preset = filament_presets->find_preset(new_name); Preset *new_preset = filament_presets->find_preset(new_name);
if (new_preset) { if (new_preset) {
if (new_preset->is_system) { if (new_preset->is_system) {
message = L("The name cannot be the same as the system preset name."); message = _u8L("The name cannot be the same as the system preset name.");
return false; return false;
} }
if (new_preset != preset) { if (new_preset != preset) {
message = L("The name is the same as another existing preset name"); message = _u8L("The name is the same as another existing preset name");
return false; return false;
} }
if (new_preset != &filament_presets->get_edited_preset()) new_preset = &temp_preset; if (new_preset != &filament_presets->get_edited_preset()) new_preset = &temp_preset;
@ -214,7 +214,7 @@ bool CalibrationWizard::save_preset(const std::string &old_preset_name, const st
// Preset* preset = &m_presets.preset(it - m_presets.begin(), true); // Preset* preset = &m_presets.preset(it - m_presets.begin(), true);
if (!new_preset) { if (!new_preset) {
BOOST_LOG_TRIVIAL(info) << "create new preset failed"; BOOST_LOG_TRIVIAL(info) << "create new preset failed";
message = L("create new preset failed."); message = _u8L("create new preset failed.");
return false; return false;
} }
@ -1079,7 +1079,7 @@ void FlowRateWizard::on_cali_save()
std::string message; std::string message;
if (!save_preset(old_preset_name, into_u8(new_preset_name), key_value_map, message)) { if (!save_preset(old_preset_name, into_u8(new_preset_name), key_value_map, message)) {
MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog error_msg_dlg(nullptr, from_u8(message), wxEmptyString, wxICON_WARNING | wxOK);
error_msg_dlg.ShowModal(); error_msg_dlg.ShowModal();
return; return;
} }
@ -1358,7 +1358,7 @@ void MaxVolumetricSpeedWizard::on_cali_save()
std::string message; std::string message;
if (!save_preset(old_preset_name, new_preset_name, key_value_map, message)) { if (!save_preset(old_preset_name, new_preset_name, key_value_map, message)) {
MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog error_msg_dlg(nullptr, from_u8(message), wxEmptyString, wxICON_WARNING | wxOK);
error_msg_dlg.ShowModal(); error_msg_dlg.ShowModal();
return; return;
} }