From b9df1deb0e90015e903c81c396b83ad19e78bc48 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 8 Jun 2023 13:11:51 +0200 Subject: [PATCH] Fix for #9779 - PrusaSlicer2.6alpha4 Cannot set locale to language "Chinese (Simplified, China)". (Related to #9476 PrusaSlicer2.6alpha2 Switching PrusaSlicer to language zh_TW failed.) After fix from upstream wxWidgets (see https://github.com/wxWidgets/wxWidgets/commit/a3e925df0a35f1080ce92d421ab6518645cca921#diff-1e3658a254af33d4cb78b07040114b18d8a0642fe928f65fdfbd4746d8cc0f4a) issue is disappeared and workaround is no needed now. --- deps/wxWidgets/wxWidgets.cmake | 4 ++-- src/slic3r/GUI/GUI_App.cpp | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 661ea766c..4bf644a39 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -13,8 +13,8 @@ if (UNIX AND NOT APPLE) # wxWidgets will not use char as the underlying type for endif() prusaslicer_add_cmake_project(wxWidgets - URL https://github.com/prusa3d/wxWidgets/archive/0b49beaacce17d90f0c370ecd73221abd089667a.zip - URL_HASH SHA256=8fa978a76d6bd811b30eecc5124186b9ad54290b820f3a354e85bfa9dae6a5ce + URL https://github.com/prusa3d/wxWidgets/archive/c71b02d8efc2c73e9d3c7fc3c597e01c99953eaa.zip + URL_HASH SHA256=541363297fe6b120c788ae58b11622c899ea497a09445b74a283cb5b2546d027 DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG CMAKE_ARGS -DwxBUILD_PRECOMP=ON diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index a38069237..ec7f43ae1 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2281,14 +2281,7 @@ bool GUI_App::load_language(wxString language, bool initial) } #endif -#ifdef __APPLE__ - // ysFIXME after fix for wxWidgets issue (https://github.com/wxWidgets/wxWidgets/issues/23209) - // Workaround for wxLANGUAGE_CHINESE(...) languages => Allow to continue even if wxLocale is not available. - // Because of translation will works fine, just locales will set to EN - if (! wxLocale::IsAvailable(language_info->Language) && language_info->CanonicalName.BeforeFirst('_') != "zh" ) { -#else if (! wxLocale::IsAvailable(language_info->Language)) { -#endif // Loading the language dictionary failed. wxString message = "Switching PrusaSlicer to language " + language_info->CanonicalName + " failed."; #if !defined(_WIN32) && !defined(__APPLE__)