juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: translation problem

Browse Source 
1. add regroup link

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia90c80f5ff86e785e00fb0c38360eb33424a5ddd
(cherry picked from commit 01be3a51e646a9ca4277c490396417c95d983648)
This commit is contained in:
xun.zhang
2025-03-20 21:17:11 +08:00
committed by Noisyfox
parent 7f6d45ecfd
commit cd16bd83a3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode/ToolOrdering.cpp
View File

@@ -1176,7 +1176,7 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first
if (nozzle_nums > 1 && !check_tpu_group(used_filaments, filament_maps, print_config)) { if (nozzle_nums > 1 && !check_tpu_group(used_filaments, filament_maps, print_config)) {
int master_extruder_id = print_config->master_extruder_id.value - 1; // to 0 based int master_extruder_id = print_config->master_extruder_id.value - 1; // to 0 based
std::string nozzle_name = master_extruder_id == 0 ? L("left") : L("right"); std::string nozzle_name = master_extruder_id == 0 ? _L("left") : _L("right");
std::string exception_str = _L("TPU is incompatible with AMS and must be printed seperately in the ") + nozzle_name + _L(" nozzle.\nPlease adjust the filament group accordingly."); std::string exception_str = _L("TPU is incompatible with AMS and must be printed seperately in the ") + nozzle_name + _L(" nozzle.\nPlease adjust the filament group accordingly.");
throw Slic3r::RuntimeError(exception_str); throw Slic3r::RuntimeError(exception_str);
} }

20
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -31,6 +31,7 @@
#include "NotificationManager.hpp" #include "NotificationManager.hpp"
#include "format.hpp" #include "format.hpp"
#include "DailyTips.hpp" #include "DailyTips.hpp"
#include "FilamentMapDialog.hpp"
#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" #include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
#include "slic3r/Utils/UndoRedo.hpp" #include "slic3r/Utils/UndoRedo.hpp"
@@ -10207,16 +10208,15 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
} }
} }
if (warning == EWarning::FilamentPrintableError) { if (warning == EWarning::FilamentPrintableError) {
if (state) if (state){
notification_manager.push_slicing_customize_error_notification(NotificationType::BBLFilamentPrintableError, NotificationLevel::ErrorNotificationLevel, text, _u8L("Click Wiki for help."), auto callback = [](wxEvtHandler*) {
[](wxEvtHandler*) { auto plater = wxGetApp().plater();
std::string language = wxGetApp().app_config->get("language"); auto partplate = plater->get_partplate_list().get_curr_plate();
wxString region = L"en"; try_pop_up_before_slice(false, plater, partplate, true); // ignore the return value
if (language.find("zh") == 0) return false;
region = L"zh"; };
wxGetApp().open_browser_with_warning_dialog(wxString::Format(L"https://wiki.bambulab.com/%s/filament-acc/filament/h2d-filament-config-limit", region)); notification_manager.push_slicing_customize_error_notification(NotificationType::BBLFilamentPrintableError, NotificationLevel::ErrorNotificationLevel, text, _u8L("Click here to regroup"), callback);
return false; }
});
else else
notification_manager.close_slicing_customize_error_notification(NotificationType::BBLFilamentPrintableError, NotificationLevel::ErrorNotificationLevel); notification_manager.close_slicing_customize_error_notification(NotificationType::BBLFilamentPrintableError, NotificationLevel::ErrorNotificationLevel);
} }