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

Localization: Fixed localization of some 3d-Scene notifications

Browse Source 
+ Move a call of the load_language() before SplashScreen creation
This commit is contained in:
YuSanka 2021-02-03 17:29:26 +01:00
parent 65766c24f6
commit 6846ba0b59
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,12 +631,12 @@ void GLCanvas3D::WarningTexture::activate(WarningTexture::Warning warning, bool
std::string text; std::string text;
bool error = false; bool error = false;
switch (warning) { switch (warning) {
case ObjectOutside: text = L("An object outside the print area was detected."); break; case ObjectOutside: text = _u8L("An object outside the print area was detected."); break;
case ToolpathOutside: text = L("A toolpath outside the print area was detected."); error = true; break; case ToolpathOutside: text = _u8L("A toolpath outside the print area was detected."); error = true; break;
case SlaSupportsOutside: text = L("SLA supports outside the print area were detected."); error = true; break; case SlaSupportsOutside: text = _u8L("SLA supports outside the print area were detected."); error = true; break;
case SomethingNotShown: text = L("Some objects are not visible."); break; case SomethingNotShown: text = _u8L("Some objects are not visible."); break;
case ObjectClashed: case ObjectClashed:
text = L( "An object outside the print area was detected.\n" text = _u8L( "An object outside the print area was detected.\n"
"Resolve the current problem to continue slicing."); "Resolve the current problem to continue slicing.");
error = true; error = true;
break; break;

6
src/slic3r/GUI/GUI_App.cpp
View File

@ -799,6 +799,9 @@ bool GUI_App::on_init_inner()
app_config->set("version", SLIC3R_VERSION); app_config->set("version", SLIC3R_VERSION);
app_config->save(); app_config->save();
// If load_language() fails, the application closes.
load_language(wxString(), true);
wxInitAllImageHandlers(); wxInitAllImageHandlers();
SplashScreen* scrn = nullptr; SplashScreen* scrn = nullptr;
@ -866,9 +869,6 @@ bool GUI_App::on_init_inner()
init_label_colours(); init_label_colours();
init_fonts(); init_fonts();
// If load_language() fails, the application closes.
load_language(wxString(), true);
// Suppress the '- default -' presets. // Suppress the '- default -' presets.
preset_bundle->set_default_suppressed(app_config->get("no_defaults") == "1"); preset_bundle->set_default_suppressed(app_config->get("no_defaults") == "1");
try { try {

10
src/slic3r/GUI/NotificationManager.cpp
View File

@ -740,11 +740,11 @@ void NotificationManager::PopNotification::update(const NotificationData& n)
} }
bool NotificationManager::PopNotification::compare_text(const std::string& text) bool NotificationManager::PopNotification::compare_text(const std::string& text)
{ {
std::string t1(m_text1); std::wstring wt1 = boost::nowide::widen(m_text1);
std::string t2(text); std::wstring wt2 = boost::nowide::widen(text);
t1.erase(std::remove_if(t1.begin(), t1.end(), ::isspace), t1.end()); wt1.erase(std::remove_if(wt1.begin(), wt1.end(), ::iswspace), wt1.end());
t2.erase(std::remove_if(t2.begin(), t2.end(), ::isspace), t2.end()); wt2.erase(std::remove_if(wt2.begin(), wt2.end(), ::iswspace), wt2.end());
if (t1.compare(t2) == 0) if (wt1.compare(wt2) == 0)
return true; return true;
return false; return false;
} }