From d415d8e728f9930b29c0a0ec2d1325cf805a6d2e Mon Sep 17 00:00:00 2001 From: "zorro.zhang" Date: Fri, 14 Mar 2025 20:30:34 +0800 Subject: [PATCH] ENH: Login Language use Bambu Config JIRA: none Change-Id: I3c12441af0daad6a92843226886b0f15c60aa16a --- src/slic3r/GUI/WebUserLoginDialog.cpp | 11 +++++++++-- src/slic3r/GUI/WebUserLoginDialog.hpp | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index af2161034..ebef41f7b 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -79,9 +79,8 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN TargetUrl = host_url + "/sign-in"; m_networkOk = false; - wxString strlang = wxGetApp().current_language_code_safe(); + wxString strlang = wxString::FromUTF8(GetStudioLanguage()).BeforeFirst('_'); if (strlang != "") { - strlang.Replace("_", "-"); TargetUrl = host_url + "/" + strlang + "/sign-in"; } @@ -411,4 +410,12 @@ bool ZUserLogin::ShowErrorPage() } +std::string ZUserLogin::GetStudioLanguage() +{ + std::string strLanguage = wxGetApp().app_config->get("language"); + if (strLanguage.empty()) strLanguage = "en"; + + return strLanguage; +} + }} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/WebUserLoginDialog.hpp b/src/slic3r/GUI/WebUserLoginDialog.hpp index b0dca3511..7bfacf61b 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.hpp +++ b/src/slic3r/GUI/WebUserLoginDialog.hpp @@ -61,6 +61,8 @@ public: bool run(); + std::string GetStudioLanguage(); + static int web_sequence_id; private: wxTimer *m_timer { nullptr };